Merge pull request #236 from Juanlu001/loosen-requirements

Loosen requirement versions

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 .

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
 +++++++++++++

landsat/__init__.py

@@ -1 +1 @@
-__version__ = '0.13.1'
+__version__ = '0.14.dev0'

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
-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.*