Merge cf450a6 into 2d675cd

.travis.yml

@@ -2,26 +2,16 @@ language: python
 
 matrix:
   include:
-    - python: 2.7
-      env:
-        - COVERAGE=false
-        - NUMPY=1.7
-    - python: 2.7
-      env:
-        - COVERAGE=false
-        - NUMPY=1.8
-    - python: 2.7
+    - python: 3.4
       env:
         - COVERAGE=false
-        - NUMPY=1.9
-    - python: 3.4
+    - python: 3.5
       env:
         - COVERAGE=false
-        - NUMPY=1.8
-    - python: 3.4
+
+    - python: 3.6
       env:
         - COVERAGE=true
-        - NUMPY=1.9
 
 before_install:
 
@@ -38,11 +28,11 @@ install:
   # We just set up a conda environment with the right Python version. This
   # should not need changing.
 
-  - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION
+  - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION --channel=conda-forge
   - source activate test
   #- conda config --add channels phobson
-  - conda install --yes numpy=$NUMPY matplotlib scipy nose
-  - conda install --yes coverage docopt requests pyyaml
+  - conda install --yes numpy matplotlib scipy nose --channel=conda-forge
+  - conda install --yes coverage docopt requests pyyaml --channel=conda-forge
   - pip install coveralls
   - pip install .
 

setup.py

@@ -24,7 +24,7 @@ def getDataFiles(submodule, folder):
 DOWNLOAD_URL = "https://github.com/Geosyntec/watershed/archive/master.zip"
 LICENSE = "BSD 3-clause"
 PACKAGES = find_packages()
-PLATFORMS = "Python 2.7, 3.3 and later."
+PLATFORMS = "Python 3.4 and later."
 CLASSIFIERS = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
@@ -33,11 +33,11 @@ def getDataFiles(submodule, folder):
     "Topic :: Formats and Protocols :: Data Formats",
     "Topic :: Scientific/Engineering :: Earth Sciences",
     "Topic :: Software Development :: Libraries :: Python Modules",
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
 ]
-INSTALL_REQUIRES = ['numpy']
+INSTALL_REQUIRES = ['numpy', 'scipy', 'matplotlib']
 PACKAGE_DATA = {}
 DATA_FILES = [
     ('watershed_data/testing', getDataFiles('testing', 'data')),

watershed/algo.py

@@ -327,7 +327,8 @@ def _trace_upstream(flow_dir, blocks, is_upstream, row, col):
     watershed.algo.trace_upstream
 
     """
-
+    row = int(row)
+    col = int(col)
     if is_upstream[row, col] == 0:
 
         # we consider a cell to be upstream of itself

watershed/testing/data/pipelines.prj

@@ -0,0 +1 @@
+PROJCS["NAD_1927_UTM_Zone_10N",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-123],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]

watershed/testing/data/pipelines.qpj

@@ -0,0 +1 @@
+PROJCS["NAD27 / UTM zone 10N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982138982,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-123],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","26710"]]

watershed/testing/data/powell_butte.png.aux.xml

@@ -1,3 +1,21 @@
 <PAMDataset>
-  <SRS>PROJCS[&quot;NAD_1927_UTM_Zone_10N&quot;,GEOGCS[&quot;GCS_North_American_1927&quot;,DATUM[&quot;North_American_Datum_1927&quot;,SPHEROID[&quot;Clarke_1866&quot;,6378206.4,294.9786982]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433]],PROJECTION[&quot;Transverse_Mercator&quot;],PARAMETER[&quot;false_easting&quot;,500000.0],PARAMETER[&quot;false_northing&quot;,0.0],PARAMETER[&quot;central_meridian&quot;,-123.0],PARAMETER[&quot;scale_factor&quot;,0.9996],PARAMETER[&quot;latitude_of_origin&quot;,0.0],UNIT[&quot;Meter&quot;,1.0]]</SRS>
+  <SRS>PROJCS["NAD_1927_UTM_Zone_10N",GEOGCS["GCS_North_American_1927",DATUM["North_American_Datum_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["false_easting",500000.0],PARAMETER["false_northing",0.0],PARAMETER["central_meridian",-123.0],PARAMETER["scale_factor",0.9996],PARAMETER["latitude_of_origin",0.0],UNIT["Meter",1.0]]</SRS>
+  <PAMRasterBand band="1">
+    <Histograms>
+      <HistItem>
+        <HistMin>-0.4833333333333333</HistMin>
+        <HistMax>29.48333333333333</HistMax>
+        <BucketCount>30</BucketCount>
+        <IncludeOutOfRange>0</IncludeOutOfRange>
+        <Approximate>0</Approximate>
+        <HistCounts>19078|18960|24016|20152|30087|16728|8867|5474|3849|2973|2439|1956|1653|1576|1208|1172|954|845|734|589|483|256|212|178|131|118|93|92|54|25</HistCounts>
+      </HistItem>
+    </Histograms>
+    <Metadata>
+      <MDI key="STATISTICS_MAXIMUM">29</MDI>
+      <MDI key="STATISTICS_MEAN">4.1968936417867</MDI>
+      <MDI key="STATISTICS_MINIMUM">0</MDI>
+      <MDI key="STATISTICS_STDDEV">3.9966273613112</MDI>
+    </Metadata>
+  </PAMRasterBand>
 </PAMDataset>