From c421fd946d0463b667e1362334275b9ed4d1d4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Wed, 19 Jul 2017 10:10:31 +0200 Subject: [PATCH 1/5] Bump version --- landsat/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landsat/__init__.py b/landsat/__init__.py index deea98b..b5e195e 100644 --- a/landsat/__init__.py +++ b/landsat/__init__.py @@ -1 +1 @@ -__version__ = '0.13.1' +__version__ = '0.14.dev0' From d3a6f5d640d55d2a145d5ca13fff6e3f9755a20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Wed, 19 Jul 2017 10:56:48 +0200 Subject: [PATCH 2/5] Loosen up version requirements of all dependencies Tested in: * Python 3.5 and 3.6 conda environments with latest NumPy and GDAL * Official Python 3.4, 3.5 and 3.6 Docker images based on Debian Jessie using only pip --- requirements.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7a40899..de31a82 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ -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 +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,<1* six>=1.8.0 -scipy==0.17.0 -scikit-image==0.12.3 -homura==0.1.3 -boto==2.39.0 -polyline==1.3 -geocoder==1.9.0 -matplotlib==1.5.1 +scipy>=0.17.0 +scikit-image>=0.12.3 +homura>=0.1.3 +boto>=2.39.0 +polyline>=1.3 +geocoder>=1.9.0 +matplotlib>=1.5.1 From 3ac5c771d0d0c53cd0cbf30ba07939cdc22167a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Wed, 19 Jul 2017 11:54:58 +0200 Subject: [PATCH 3/5] Modernize Dockerfile, fix #226 --- Dockerfile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index b42bd00..f393901 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,9 @@ FROM ubuntu:14.04 RUN apt-get -y update -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 +RUN apt-get install --yes curl libgdal-dev python3-dev build-essential 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 curl -O https://bootstrap.pypa.io/get-pip.py +RUN python3 get-pip.py +RUN pip3 install numpy 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 cd /landsat && pip install -e . From 671d72e71f64cc0926a53e014d2b9f279ebce030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Wed, 19 Jul 2017 12:27:23 +0200 Subject: [PATCH 4/5] Update installation docs --- docs/installation.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 302f906..65224b3 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -11,11 +11,18 @@ Mac OSX Ubuntu 14.04 ++++++++++++ -Use pip to install landsat-util. If you are not using virtualenv, you might have to run ``pip`` as ``sudo``:: +Use pip to install landsat-util. Follow these instructions to `install pip on Ubuntu`_:: $: sudo apt-get update - $: sudo apt-get install python-pip python-numpy python-scipy libgdal-dev libatlas-base-dev gfortran libfreetype6-dev - $: pip install landsat-util + $: sudo apt-get install libgdal-dev python3-dev build-essential + $: pip3 install numpy + $: pip3 install landsat-util + +.. _`install pip on Ubuntu`: https://pip.pypa.io/en/stable/installing/#installing-with-get-pip-py + +If you are not using virtualenv, you might have to use the ``--user`` flag with ``pip`` (see `description of pip user installs`_). + +.. _`description of pip user installs`: https://pip.pypa.io/en/stable/user_guide/#user-installs Other systems +++++++++++++ From 12779aad2fe9b589de0d68395042542f685f862b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Fri, 21 Jul 2017 12:18:05 +0200 Subject: [PATCH 5/5] Refine version requirements with upper bounds --- requirements.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index de31a82..96e701e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ -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,<1* -six>=1.8.0 -scipy>=0.17.0 -scikit-image>=0.12.3 -homura>=0.1.3 -boto>=2.39.0 -polyline>=1.3 -geocoder>=1.9.0 -matplotlib>=1.5.1 +usgs>=0.1.9,<1.* +requests~=2.7 +python-dateutil>=2.5.1,<3.* +numpy>=1.10.4,<2.* +termcolor~=1.1 +rasterio~=0.32 +six~=1.8 +scipy~=0.17 +scikit-image>=0.12.3,<1.* +homura>=0.1.3,<1.* +boto~=2.39 +polyline~=1.3 +geocoder~=1.9 +matplotlib>=1.5.1,<2.*