From 7f5998b40b6a48f01bd8a34140987d93ac61244f Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 11:49:08 -0400 Subject: [PATCH] update requirements order --- requirements-dev.txt | 20 ++++++++++++++++++++ requirements.txt | 16 ++++++++++++++-- requirements/base.txt | 5 ----- requirements/dev.txt | 7 ------- requirements/docker.txt | 11 ----------- setup.py | 27 +++++++-------------------- 6 files changed, 41 insertions(+), 45 deletions(-) create mode 100644 requirements-dev.txt delete mode 100644 requirements/base.txt delete mode 100644 requirements/dev.txt delete mode 100644 requirements/docker.txt diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..567a991 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,20 @@ +usgs==0.1.9 +requests==2.7.0 +python-dateutil==2.5.1 +numpy==1.10.4 +termcolor==1.1.0 +rasterio==0.32.0 +six==1.8.0 +scipy==0.17.0 +scikit-image==0.12.3 +homura==0.1.3 +boto==2.39.0 +polyline==1.1 +geocoder==1.9.0 +matplotlib==1.5.1 +pdoc>=0.3.1 +nose>=1.3.7 +coverage>=4.0 +Sphinx>=1.3.1 +wheel>=0.26.0 +mock>=1.3.0 diff --git a/requirements.txt b/requirements.txt index 10385ce..9aadb0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,14 @@ --r requirements/base.txt - +usgs==0.1.9 +requests==2.7.0 +python-dateutil==2.5.1 +numpy==1.10.4 +termcolor==1.1.0 +rasterio==0.32.0 +six==1.8.0 +scipy==0.17.0 +scikit-image==0.12.3 +homura==0.1.3 +boto==2.39.0 +polyline==1.1 +geocoder==1.9.0 +matplotlib==1.5.1 diff --git a/requirements/base.txt b/requirements/base.txt deleted file mode 100644 index b51f35f..0000000 --- a/requirements/base.txt +++ /dev/null @@ -1,5 +0,0 @@ --r docker.txt - -numpy>=1.9.3 -scipy>=0.16.0 -scikit-image>=0.11.3 diff --git a/requirements/dev.txt b/requirements/dev.txt deleted file mode 100644 index 034bd45..0000000 --- a/requirements/dev.txt +++ /dev/null @@ -1,7 +0,0 @@ --r base.txt -pdoc>=0.3.1 -nose>=1.3.7 -coverage>=4.0 -Sphinx>=1.3.1 -wheel>=0.26.0 -mock>=1.3.0 diff --git a/requirements/docker.txt b/requirements/docker.txt deleted file mode 100644 index 6939c1e..0000000 --- a/requirements/docker.txt +++ /dev/null @@ -1,11 +0,0 @@ -requests==2.7.0 -python-dateutil>=2.4.2 -termcolor>=1.1.0 -rasterio>=0.27.0 -six==1.8.0 -homura>=0.1.2 -boto>=2.38.0 -polyline==1.1 -geocoder>=1.5.1 -jsonschema==2.5.1 -usgs==0.1.9 diff --git a/setup.py b/setup.py index 2d28f84..e6d1219 100644 --- a/setup.py +++ b/setup.py @@ -15,10 +15,11 @@ def readme(): with open('README.rst') as f: return f.read() -test_requirements = [ - 'nose>=1.3.7', - 'mock>=1.3.0' -] +with open('requirements.txt') as fid: + INSTALL_REQUIRES = [l.strip() for l in fid.readlines() if l] + +with open('requirements-dev.txt') as fid: + TEST_REQUIRES = [l.strip() for l in fid.readlines() if l] setup( name='landsat-util', @@ -34,21 +35,7 @@ setup( include_package_data=True, license='CCO', platforms='Posix; MacOS X; Windows', - install_requires=[ - '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.8.0', - 'scipy>=0.16.0', - 'scikit-image>=0.11.3', - 'homura>=0.1.2', - 'boto>=2.38.0', - 'polyline==1.1', - 'geocoder>=1.5.1' - ], + install_requires=INSTALL_REQUIRES, test_suite='nose.collector', - tests_require=test_requirements + tests_require=TEST_REQUIRES )