0.2.2 (#24)

* increment version

* added some tests (#22)

* new traceback for missing nodes in rpt file. fixes #21. (#23)

* cleanup requirements

* cleanup requirements

* cruft cleanup

Author: austinorr

.travis.yml

@@ -43,15 +43,14 @@ before_install:
   - chmod +x miniconda.sh
   - ./miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
-  - conda update --yes conda
-  - conda install --yes nomkl
+  - conda update --yes --quiet conda
 
 # We just set up a conda environment with the right Python version.
 # This should not need changing.
 install:
-  - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION numpy pandas
+  - conda create --yes --quiet -n test python=$TRAVIS_PYTHON_VERSION nomkl numpy pandas
   - source activate test
-  - conda install --yes --channel=conda-forge ${TESTERS} ${NXVERSION}
+  - conda install --yes --quiet --channel conda-forge ${TESTERS} ${NXVERSION}
   - pip install codecov pint==0.8.1
   - pip install git+https://github.com/lucashtnguyen/hymo.git
   - pip install .

environment.yml

@@ -3,11 +3,12 @@ channels:
 - conda-forge
 - defaults
 dependencies:
-- networkx=2.0=py35_0
-- numpy=1.13.1=py35_0
-- pandas=0.20.3=py35_0
-- python=3.5.4=0
-- pydotplus=2.0.2=py35_0
-- matplotlib=2.0.2=np113py35_0
-- pytest=3.2.1=py35_0
-- pytest-cov=2.3.1=py35_0
+- networkx=2.1
+- numpy
+- pandas
+- python=3.5
+- pydot=1.2
+- matplotlib=2.1
+- pytest=3.2
+- pip:
+  - pint==0.8.1

requirements_dev.txt

@@ -1,11 +1,2 @@
-pip==8.1.2
-bumpversion==0.5.3
-wheel==0.29.0
-watchdog==0.8.3
-flake8==2.6.0
-tox==2.3.1
-coverage==4.1
-Sphinx==1.4.8
-
-pytest==2.9.2
-pytest-runner==2.11.1
+coverage
+pytest

setup.py

@@ -62,13 +62,9 @@ def get_pkg_info(info_file, info):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     test_suite='tests',
     tests_require=test_requirements,

swmmnetwork/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = 'Austin Orr'
 __email__ = '[email protected]'
-__version__ = '0.2.1'
+__version__ = '0.2.2'
 
 from .swmmnetwork import SwmmNetwork
 from .convert import (

swmmnetwork/core.py

@@ -50,15 +50,19 @@ def _sum_edge_attr(G, node, attr, method='edges', filter_key=None, split_on='-',
 
     includes = edges
     if include_filter_flags is not None:
-        includes = [edge for edge in edges
-                    if any([i in str(edge[2][filter_key]).split(split_on)
-                            for i in include_filter_flags])]
+        includes = [
+            edge for edge in edges
+            if any([
+                i in str(edge[2][filter_key]).split(split_on)
+                for i in include_filter_flags])]
 
     excludes = []
     if exclude_filter_flags is not None:
-        excludes = [edge for edge in edges
-                    if any([i in str(edge[2][filter_key]).split(split_on)
-                            for i in exclude_filter_flags])]
+        excludes = [
+            edge for edge in edges
+            if any([
+                i in str(edge[2][filter_key]).split(split_on)
+                for i in exclude_filter_flags])]
 
     edges = [i for i in includes if i not in excludes]
 
@@ -185,16 +189,13 @@ def solve_node(G, node_name, edge_name_col='id', split_on='-',
     node_obj[vol_eff_col] = vol_eff
 
     node_obj[vol_red_col] = vol_reduced
-    node_obj[pct_vol_red_col] = 100 * \
-        _safe_divide(vol_reduced, vol_in)
+    node_obj[pct_vol_red_col] = 100 * _safe_divide(vol_reduced, vol_in)
 
     node_obj[vol_tmnt_col] = vol_treated
-    node_obj[pct_vol_tmnt_col] = 100 * \
-        _safe_divide(vol_treated, vol_in)
+    node_obj[pct_vol_tmnt_col] = 100 * _safe_divide(vol_treated, vol_in)
 
     node_obj[vol_cap_col] = vol_captured
-    node_obj[pct_vol_cap_col] = 100 * \
-        _safe_divide(vol_captured, vol_in)
+    node_obj[pct_vol_cap_col] = 100 * _safe_divide(vol_captured, vol_in)
 
     #-----solve volume weighted loads-----#
     for load_col in load_cols: