From 7f5998b40b6a48f01bd8a34140987d93ac61244f Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 11:49:08 -0400 Subject: [PATCH 01/22] 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 ) From 1730439d943eee670f530a8289aae2cd3425f4a3 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 11:49:16 -0400 Subject: [PATCH 02/22] skip all tests for now --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f338ceb..625c47e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,15 +13,8 @@ env: install: - pip install --user twine -before_script: -- docker build --file="travis-dockerfile" -t "developmentseed/landsat-util:travis" . - script: -- docker run --rm -it -v "$(pwd)":/test -w /test developmentseed/landsat-util:travis nosetests - -after_success: -- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} -- docker push developmentseed/landsat-util:travis +- echo 'nothing' deploy: provider: pypi From 2dd5c10eb95af4863b0e49cde4ec9d732d4083d5 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 12:04:01 -0400 Subject: [PATCH 03/22] add jsonschema --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index 567a991..16e1034 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,3 +18,4 @@ coverage>=4.0 Sphinx>=1.3.1 wheel>=0.26.0 mock>=1.3.0 +jsonschema==2.5.1 From fa98f6020e70d0602382714303568b19cba3a8c1 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 12:04:07 -0400 Subject: [PATCH 04/22] updated travis --- .travis.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 625c47e..455bfe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ -sudo: required +language: python +sudo: false + +cache: + directories: + - ~/.cache/pip services: - docker @@ -8,13 +13,22 @@ env: - secure: QsF7ignSAbH/WCyO6v9bw1exmCWDQR0DqmHkwJ5swc9N44OOOzbWGsaMSYB5y9h+d70fz4arbxQDhsk2KvX4Zd1/2YIMOrIsbgDYeegpkhVPgyQNPKmVqiX+Tb47t1C/TgkC7A07tiPpuefYcLNMZ8gzz7oKhh1UKapYftqzZ+g= - secure: HxjeKWSROBQYy9NuNkgQeaK1ubTF8vH5FcR8nUTSAYxxw/qOzKpqkiq4BcJSRcIwTbkvaBf4MshLGVOxPjMeyJFe06UD/6LvTUGS3bwdya+m0RFjHe5/3wzS8/MxLbTlvgzmuGLLKOsJjXCi9eQQchKfHv+QuhGxhYVLQpnbU9E= - secure: Zq0Z2UA2A7/ieXX8XoMweClJTp8hiVBxoQ1ylJYNd7qsRSk0QvZhn62db5/x48L9S1kELk0sG64q5Pf96/RPLpdjkBUAdEkS7qF+QOvRvAv2woNEHutjlMUvP6jwYGbug+AORg76btZ57OwMOi3aTkagQMMKnokfo7KGbffy0Jo= + - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels + - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels + +before_install: + - pip install -U pip + - pip install wheel install: -- pip install --user twine + - pip wheel -r requirements-dev.txt + - pip install -r requirements-dev.txt + - pip install -e . + script: -- echo 'nothing' +- nosetests deploy: provider: pypi From 043ef5086b426066b85fb35dddc57a6cc034b109 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 12:17:20 -0400 Subject: [PATCH 05/22] add deps --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 455bfe9..6721da7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,15 @@ cache: directories: - ~/.cache/pip -services: -- docker +addons: + apt: + packages: + - libgdal1h + - gdal-bin + - libgdal-dev + - libatlas-dev + - libatlas-base-dev + - gfortran env: global: @@ -22,7 +29,6 @@ before_install: install: - - pip wheel -r requirements-dev.txt - pip install -r requirements-dev.txt - pip install -e . From 9a7c0e3836f4cb0da22a426da0d9ec3812ef893e Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 13:27:15 -0400 Subject: [PATCH 06/22] remove dockerfile for travis --- travis-dockerfile | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 travis-dockerfile diff --git a/travis-dockerfile b/travis-dockerfile deleted file mode 100644 index 94ffaee..0000000 --- a/travis-dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM developmentseed/landsat-util:dev -ADD . /test -RUN apt-get -y update -RUN apt-get install --yes git-core -RUN cd /test && pip install -r requirements/docker.txt -RUN pip install pdoc>=0.3.1 nose>=1.3.7 coverage>=4.0 Sphinx>=1.3.1 wheel>=0.26.0 mock>=1.3.0 From b8f2c39e89e9be3b93b5c1458526d70b92de40c5 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 13:27:30 -0400 Subject: [PATCH 07/22] limit dev requirements to tests related modules --- requirements-dev.txt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 16e1034..7f71cc4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,17 +1,3 @@ -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 From f44b72b18f4bd2c941ee6c32cc2767ca4b85ba75 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 13:27:41 -0400 Subject: [PATCH 08/22] new dockerfile --- Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fcbb705..c188b4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,13 @@ FROM ubuntu:14.04 RUN apt-get -y update RUN apt-get install --yes git-core python-pip python-skimage python-numpy python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev python-pycurl -ADD landsat /usr/local/lib/python2.7/dist-packages/landsat -ADD bin/landsat /usr/local/bin/ ADD . /landsat -RUN cd /landsat && pip install -r requirements/docker.txt +RUN pip install setuptools +RUN pip install -U pip +RUN pip install wheel +RUN cd /landsat && pip install -r requirements-dev.txt +RUN sed -i 's/numpy.*//g' /landsat/requirements.txt +RUN sed -i 's/scipy.*//g' /landsat/requirements.txt +RUN sed -i 's/scikit-image.*//g' /landsat/requirements.txt +RUN sed -i 's/matplotlib.*//g' /landsat/requirements.txt +RUN cd /landsat && pip install -e . From cd21dd7646aa06b994db6b108ea3b0b71cc7dca9 Mon Sep 17 00:00:00 2001 From: Scisco Date: Thu, 24 Mar 2016 13:28:06 -0400 Subject: [PATCH 09/22] use apt-get install --- .travis.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6721da7..2fc8e9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,9 @@ language: python -sudo: false cache: directories: - ~/.cache/pip -addons: - apt: - packages: - - libgdal1h - - gdal-bin - - libgdal-dev - - libatlas-dev - - libatlas-base-dev - - gfortran - env: global: - secure: QsF7ignSAbH/WCyO6v9bw1exmCWDQR0DqmHkwJ5swc9N44OOOzbWGsaMSYB5y9h+d70fz4arbxQDhsk2KvX4Zd1/2YIMOrIsbgDYeegpkhVPgyQNPKmVqiX+Tb47t1C/TgkC7A07tiPpuefYcLNMZ8gzz7oKhh1UKapYftqzZ+g= @@ -24,17 +13,22 @@ env: - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels before_install: + - sudo apt-get update -q + - sudo apt-get install --yes python-skimage python-numpy python-scipy libgdal1h gdal-bin libgdal-dev libatlas-dev libatlas-base-dev gfortran - pip install -U pip - pip install wheel + - sed -i 's/numpy.*//g' /landsat/requirements.txt + - sed -i 's/scipy.*//g' /landsat/requirements.txt + - sed -i 's/scikit-image.*//g' /landsat/requirements.txt + - sed -i 's/matplotlib.*//g' /landsat/requirements.txt install: - - pip install -r requirements-dev.txt - pip install -e . script: -- nosetests +- python setup.py test deploy: provider: pypi From 097ba27e5eebfe7bc613bf01a4377107a61f125d Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:27:05 -0400 Subject: [PATCH 10/22] updated docker --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c188b4e..b42bd00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,15 @@ FROM ubuntu:14.04 RUN apt-get -y update -RUN apt-get install --yes git-core python-pip python-skimage python-numpy python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev python-pycurl +RUN apt-get install --yes git-core python-pip python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev python-pycurl ADD . /landsat RUN pip install setuptools RUN pip install -U pip RUN pip install wheel +RUN pip install https://s3-us-west-2.amazonaws.com/ds-satellite-projects/landsat-util/numpy-1.10.4-cp27-cp27mu-linux_x86_64.whl +RUN pip install https://s3-us-west-2.amazonaws.com/ds-satellite-projects/landsat-util/Pillow-3.1.1-cp27-cp27mu-linux_x86_64.whl +RUN pip install https://s3-us-west-2.amazonaws.com/ds-satellite-projects/landsat-util/scikit_image-0.12.3-cp27-cp27mu-manylinux1_x86_64.whl RUN cd /landsat && pip install -r requirements-dev.txt RUN sed -i 's/numpy.*//g' /landsat/requirements.txt RUN sed -i 's/scipy.*//g' /landsat/requirements.txt RUN sed -i 's/scikit-image.*//g' /landsat/requirements.txt -RUN sed -i 's/matplotlib.*//g' /landsat/requirements.txt RUN cd /landsat && pip install -e . From 0628d323ba582fdc3d2915043f4b780d6aaf7044 Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:27:21 -0400 Subject: [PATCH 11/22] circle test --- circle.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..a93a968 --- /dev/null +++ b/circle.yml @@ -0,0 +1,18 @@ +machine: + python: + version: + - 2.7.10 + - 3.4.0 + - 3.5.0 + +dependencies: + pre: + - sudo apt-get -y update + - sudo apt-get install --yes git-core python-pip python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev python-pycurl + - pip install -r requirements-dev.txt + - pip install -e . + +test: + override: + - python setup.py test + From 3f469bb461fcad4a641be49bd3468fbbd50e7558 Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:31:48 -0400 Subject: [PATCH 12/22] version must be string --- circle.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index a93a968..b0491dc 100644 --- a/circle.yml +++ b/circle.yml @@ -1,9 +1,6 @@ machine: python: - version: - - 2.7.10 - - 3.4.0 - - 3.5.0 + version: 2.7.10 dependencies: pre: From e71ad3a2cef5903f445d94a874a818ee8e5aae8b Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:45:05 -0400 Subject: [PATCH 13/22] force install --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index b0491dc..0d0b87e 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: dependencies: pre: - sudo apt-get -y update - - sudo apt-get install --yes git-core python-pip python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev python-pycurl + - sudo apt-get install -f --yes git-core python-pip python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev python-pycurl - pip install -r requirements-dev.txt - pip install -e . From de28be508743dffe269b3dbb4c2994b9b0a9a5ee Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:49:14 -0400 Subject: [PATCH 14/22] relax dependencies --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 0d0b87e..60a16a6 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: dependencies: pre: - sudo apt-get -y update - - sudo apt-get install -f --yes git-core python-pip python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev python-pycurl + - sudo apt-get install -f --yes libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev - pip install -r requirements-dev.txt - pip install -e . From 502c98bc49fc6d41d5460bec1b3a4794aaef5beb Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:52:33 -0400 Subject: [PATCH 15/22] remoove freetype --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 60a16a6..9e15990 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: dependencies: pre: - sudo apt-get -y update - - sudo apt-get install -f --yes libgdal-dev libatlas-base-dev gfortran libfreetype6-dev libglib2.0-dev zlib1g-dev + - sudo apt-get install -f --yes libgdal-dev libatlas-base-dev gfortran libglib2.0-dev zlib1g-dev - pip install -r requirements-dev.txt - pip install -e . From a9189ef87553eae3ff1cbc8ee4b46bd34a7493ed Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:55:07 -0400 Subject: [PATCH 16/22] remove all apt-gets --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 9e15990..9b16266 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: dependencies: pre: - sudo apt-get -y update - - sudo apt-get install -f --yes libgdal-dev libatlas-base-dev gfortran libglib2.0-dev zlib1g-dev + - sudo apt-get install -f --yes libgdal-dev - pip install -r requirements-dev.txt - pip install -e . From 75d468280b1d30a8d76cc51541405257d414722e Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:56:42 -0400 Subject: [PATCH 17/22] install setuptools and wheel --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/circle.yml b/circle.yml index 9b16266..c142bbe 100644 --- a/circle.yml +++ b/circle.yml @@ -6,6 +6,9 @@ dependencies: pre: - sudo apt-get -y update - sudo apt-get install -f --yes libgdal-dev + - pip install setuptools + - pip install -U pip + - pip install wheel - pip install -r requirements-dev.txt - pip install -e . From e62623697b607e54beeb42f4d5bf05409ae7a5d3 Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 11:58:24 -0400 Subject: [PATCH 18/22] install numpy --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index c142bbe..fe3d59d 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,7 @@ dependencies: - pip install setuptools - pip install -U pip - pip install wheel + - pip install numpy==1.10.4 - pip install -r requirements-dev.txt - pip install -e . From 3e58bfc2d18b5a90a7039ba32adc8e7bc0a926c9 Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 12:36:14 -0400 Subject: [PATCH 19/22] install cython --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index fe3d59d..292a4d2 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,7 @@ dependencies: - pip install setuptools - pip install -U pip - pip install wheel + - pip install cython>=0.21 - pip install numpy==1.10.4 - pip install -r requirements-dev.txt - pip install -e . From a7cb482ed186ada1a6a13b3deab289fea3c898aa Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 13:09:47 -0400 Subject: [PATCH 20/22] remove travis --- .travis.yml | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2fc8e9b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,49 +0,0 @@ -language: python - -cache: - directories: - - ~/.cache/pip - -env: - global: - - secure: QsF7ignSAbH/WCyO6v9bw1exmCWDQR0DqmHkwJ5swc9N44OOOzbWGsaMSYB5y9h+d70fz4arbxQDhsk2KvX4Zd1/2YIMOrIsbgDYeegpkhVPgyQNPKmVqiX+Tb47t1C/TgkC7A07tiPpuefYcLNMZ8gzz7oKhh1UKapYftqzZ+g= - - secure: HxjeKWSROBQYy9NuNkgQeaK1ubTF8vH5FcR8nUTSAYxxw/qOzKpqkiq4BcJSRcIwTbkvaBf4MshLGVOxPjMeyJFe06UD/6LvTUGS3bwdya+m0RFjHe5/3wzS8/MxLbTlvgzmuGLLKOsJjXCi9eQQchKfHv+QuhGxhYVLQpnbU9E= - - secure: Zq0Z2UA2A7/ieXX8XoMweClJTp8hiVBxoQ1ylJYNd7qsRSk0QvZhn62db5/x48L9S1kELk0sG64q5Pf96/RPLpdjkBUAdEkS7qF+QOvRvAv2woNEHutjlMUvP6jwYGbug+AORg76btZ57OwMOi3aTkagQMMKnokfo7KGbffy0Jo= - - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels - - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels - -before_install: - - sudo apt-get update -q - - sudo apt-get install --yes python-skimage python-numpy python-scipy libgdal1h gdal-bin libgdal-dev libatlas-dev libatlas-base-dev gfortran - - pip install -U pip - - pip install wheel - - sed -i 's/numpy.*//g' /landsat/requirements.txt - - sed -i 's/scipy.*//g' /landsat/requirements.txt - - sed -i 's/scikit-image.*//g' /landsat/requirements.txt - - sed -i 's/matplotlib.*//g' /landsat/requirements.txt - - -install: - - pip install -e . - - -script: -- python setup.py test - -deploy: - provider: pypi - user: devseed - password: - secure: WtawFW/999XYszmZfj1Qk82l00OSyP2JBVOOGCERrW1gVO7MYtYsgP31HKRSzNTCTHJNVDpdK4WZWY6zPQqC3l2UfWYYsvRn0hCoI8AJxE5VCUEg6Ccpe6fMJuhp1pq6Zy7yrfBSZcOB9aqSHLBJsunD2o3mNlTC8WV8vNK74ck= - on: - repo: developmentseed/landsat-util - branch: - - master - -after_deploy: - if [ "$TRAVIS_BRANCH" == "master" ]; then - echo "Start Docker Hub Push" - VER=$(docker run --rm -it -v "$(pwd)":/test -w /test developmentseed/landsat-util:travis python landsat/landsat.py --version | sed s/[^0-9\.]//g) - docker build . -t developmentseed/landsat-util:$VER - docker push developmentseed/landsat-util:$VER - fi From d6d85945de6099954a70b8e5c8005aa2a3ef8c55 Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 14:08:23 -0400 Subject: [PATCH 21/22] add pypi deployment --- circle.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/circle.yml b/circle.yml index 292a4d2..71dc25e 100644 --- a/circle.yml +++ b/circle.yml @@ -18,3 +18,12 @@ test: override: - python setup.py test + +deployment: + production: + branch: master + commands: + - echo "[pypi]" > ~/.pypirc + - echo "username:" $PYPI_USERNAME >> ~/.pypirc + - echo "password:" $PYPI_PASSWORD >> ~/.pypirc + - make release From b0a51d50a8d5c8abe5eb4f66d4965d0ddd3d9c6d Mon Sep 17 00:00:00 2001 From: Scisco Date: Fri, 25 Mar 2016 14:14:12 -0400 Subject: [PATCH 22/22] add circle ci badge and update tests --- README.rst | 14 ++------------ docs/installation.rst | 7 ++----- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/README.rst b/README.rst index 150181c..702434d 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,8 @@ Landsat-util =============== -.. image:: https://travis-ci.org/developmentseed/landsat-util.svg?branch=v0.5 - :target: https://travis-ci.org/developmentseed/landsat-util +.. image:: https://circleci.com/gh/developmentseed/landsat-util.svg?style=svg + :target: https://circleci.com/gh/developmentseed/landsat-util .. image:: https://badge.fury.io/py/landsat-util.svg :target: http://badge.fury.io/py/landsat-util @@ -29,16 +29,6 @@ To run the documentation locally:: $ cd docs $ make html -Travis Tests -++++++++++++ - -To speed up testing on travis, we use a docker image. - -To test with docker image locally run: - -.. code:: - - $ docker run --rm -it -v "$(pwd)":/test developmentseed/landsat-util:travis nosetests Recently Added Features +++++++++++++++++++++++ diff --git a/docs/installation.rst b/docs/installation.rst index 62e00f0..30ba094 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -63,9 +63,6 @@ Running Tests :: - $: pip install -U requirements/dev.txt - $: nosetests - -Or:: - + $: pip install -r requirements-dev.txt $: python setup.py test +