Merge pull request #6 from austinorr/v0.1.2

update to 0.1.2

Author: austinorr

.travis.yml

@@ -42,7 +42,7 @@ before_install:
 install:
   - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION numpy pandas
   - source activate test
-  - conda install --yes --channel=conda-forge ${TESTERS} networkx=1.11
+  - conda install --yes --channel=conda-forge ${TESTERS} networkx>=1.11
   - pip install codecov
   - pip install git+https://github.com/lucashtnguyen/hymo.git
   - pip install .

environment.yml

@@ -3,7 +3,7 @@ channels:
 - conda-forge
 - defaults
 dependencies:
-- networkx=1.11=py35_0
+- networkx=2.0=py35_0
 - numpy=1.13.1=py35_0
 - pandas=0.20.3=py35_0
 - python=3.5.4=0

setup.py

@@ -2,27 +2,39 @@
 # -*- coding: utf-8 -*-
 
 """The setup script."""
-
+import io
+import os
 from setuptools import setup, find_packages
 
+
+def get_pkg_info(info_file, info):
+    val = ""
+    info_file.seek(0)
+    for line in info_file:
+        if line.startswith('__{}__'.format(info)):
+            val = line.split("=")[1].replace("'", "").replace('"', "").strip()
+    return val
+
+with open(os.path.join('swmmnetwork', '__init__.py')) as init_file:
+    author = get_pkg_info(init_file, 'author')
+    email = get_pkg_info(init_file, 'email')
+    version = get_pkg_info(init_file, 'version')
+
+
 with open('README.rst') as readme_file:
     readme = readme_file.read()
 
 with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
 requirements = [
-    # TODO: put package requirements here
-]
-
-setup_requirements = [
-    'pytest-runner',
-    # TODO(austinorr): put setup requirements (distutils extensions, etc.) here
+    'networkx>=1.11,<2',
+    'pandas',
+    'numpy',
 ]
 
 test_requirements = [
     'pytest',
-    # TODO: put package test requirements here
 ]
 
 package_data = {
@@ -31,19 +43,18 @@
 
 setup(
     name='swmmnetwork',
-    version='0.1.1',
+    author=author,
+    author_email=email,
+    version=version,
     description="SWMMNetwork helps users of EPA SWMM 5.1 perform water quality and load reduction calculations. ",
     long_description=readme + '\n\n' + history,
-    author="Austin Orr",
-    author_email='[email protected]',
     url='https://github.com/austinorr/swmmnetwork',
     packages=find_packages(),
     package_data=package_data,
     include_package_data=True,
     install_requires=requirements,
     license="BSD license",
     zip_safe=False,
-    py_modules=['swmmnetwork'],
     keywords='swmmnetwork',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
@@ -60,5 +71,4 @@
     ],
     test_suite='tests',
     tests_require=test_requirements,
-    setup_requires=setup_requirements,
 )

swmmnetwork/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = 'Austin Orr'
 __email__ = '[email protected]'
-__version__ = '0.1.1'
+__version__ = '0.1.2'
 
 from .swmmnetwork import SwmmNetwork, sum_edge_attr
 from .scenario import ScenarioHydro, ScenarioLoading