From 10acbf4950c7afed16cdf18f85ddbdf757652a56 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 18 Feb 2016 00:53:45 -0500 Subject: [PATCH] take six to 1.8.0 because polyline requires it --- requirements/docker.txt | 2 +- setup.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/requirements/docker.txt b/requirements/docker.txt index d93043d..14dd3ee 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -2,7 +2,7 @@ requests==2.7.0 python-dateutil>=2.4.2 termcolor>=1.1.0 rasterio>=0.27.0 -six==1.9.0 +six==1.8.0 homura>=0.1.2 boto>=2.38.0 polyline==1.1 diff --git a/setup.py b/setup.py index 3d403b9..571d994 100644 --- a/setup.py +++ b/setup.py @@ -35,13 +35,13 @@ setup( license='CCO', platforms='Posix; MacOS X; Windows', install_requires=[ - 'git+git://github.com/developmentseed/usgs@develop', + 'usgs==0.1.9', 'requests==2.7.0', 'python-dateutil>=2.4.2', 'numpy>=1.9.3', 'termcolor>=1.1.0', 'rasterio>=0.26.0', - 'six==1.9.0', + 'six==1.8.0', 'scipy>=0.16.0', 'scikit-image>=0.11.3', 'homura>=0.1.2', @@ -49,6 +49,9 @@ setup( 'polyline==1.1', 'geocoder>=1.5.1' ], + dependency_links=[ + "git+https://github.com/developmentseed/usgs@develop#egg=usgs-0.1.9" + ], test_suite='nose.collector', tests_require=test_requirements )