Merge pull request #112 from developmentseed/develop

version 0.8.0 release

.travis.yml

@@ -1,27 +1,45 @@
 language: python
+
+sudo: false
+
+cache:
+  directories:
+    - ~/.cache/pip
+
+env:
+  global:
+    - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels
+    - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels
+
+virtualenv:
+  system_site_packages: true
+
+addons:
+  apt:
+    packages:
+    - libgdal1h
+    - gdal-bin
+    - libgdal-dev
+    - libatlas-dev
+    - libatlas-base-dev
+    - gfortran
+    - python-numpy
+    - python-scipy
+
 python:
 - '2.7'
+
 before_install:
-- sudo add-apt-repository -y ppa:ubuntugis/ppa
-- sudo apt-get update -qq
-- sudo apt-get install libgdal1h gdal-bin libgdal-dev libcurl4-gnutls-dev
-- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-- chmod +x miniconda.sh
-- "./miniconda.sh -b"
-- export PATH=/home/travis/miniconda/bin:$PATH
-- conda update --yes conda
-- sudo rm -rf /dev/shm
-- sudo ln -s /run/shm /dev/shm
+  - pip install -U pip
+  - pip install wheel
+
 install:
-- conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib scikit-image
-  six nose dateutil
-- conda install --yes -c https://conda.binstar.org/osgeo gdal
-- pip install --install-option="--no-cython-compile" cython
-- pip uninstall requests --yes
-- pip install requests==2.5.3
-- pip install -r requirements/travis.txt
+  - "pip wheel -r requirements/dev.txt"
+  - "pip install -r requirements/dev.txt"
+
 script:
 - nosetests
+
 deploy:
   provider: pypi
   user: devseed
@@ -31,3 +49,12 @@ deploy:
     tags: true
     repo: developmentseed/landsat-util
     branch: master
+
+after_deploy:
+  if [ "$TRAVIS_BRANCH" == "master" ]; then
+    echo "Start Docker Hub Push"
+    VER=$(python -c "import landsat; print landsat.__version__")
+    docker build . -t developmentseed/landsat-util:$VER
+    docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
+    docker push developmentseed/landsat-util:$VER
+  fi

CHANGES.txt

@@ -1,6 +1,14 @@
 Changes
 =======
 
+0.8.0 (2015-09-22)
+------------------
+- Improved docs
+- Add `--ndvi` flag
+- Handle downloading new bands (10, 11, QA)
+- Improved color correction
+- Remove noise in pansharpened image processing
+
 0.7.0 (2015-05-29)
 ------------------
 - New documentation

README.rst

@@ -25,6 +25,7 @@ For full documentation visit: http://landsat-util.readthedocs.org/
 
 To run the documentation locally::
 
+    $ pip install -r requirements/dev.txt
     $ cd docs
     $ make html
 
@@ -39,5 +40,3 @@ Change Log
 +++++++++
 
 See `CHANGES.txt <CHANGES.rst>`_.
-
-

docs/installation.rst

@@ -8,7 +8,7 @@ Mac OSX
 
     $: pip install landsat-util
 
-Ubuntu 14.10
+Ubuntu 14.04
 ++++++++++++
 
 Use pip to install landsat-util. If you are not using virtualenv, you might have to run ``pip`` as ``sudo``::

docs/notes.rst

@@ -8,3 +8,5 @@ Important Notes
 - Image processing is a very heavy and resource consuming task. Each process takes about 5-10 mins. We recommend that you run the processes in smaller badges. Pansharpening, while increasing image resolution 2x, substantially increases processing time.
 
 - Landsat-util requires at least 2GB of Memory (RAM).
+
+- Make sure to read over the `section on returned products <overview.html#a-note-on-returned-products>`_ as it is different depending on scene acquisition date.

docs/overview.rst

@@ -80,3 +80,8 @@ Specify bands 3, 5 and 1::
 Process *and* pansharpen a downloaded image::
 
     $: landsat process path/to/LC80090452014008LGN00.tar.bz --pansharpen
+
+A note on returned products
+++++++++++++++++
+
+Scenes acquired after 2015 will be downloaded from `AWS Public Data Sets <http://aws.amazon.com/public-data-sets/landsat/>`_ while scenes acquired before 2015 will be downloaded from `Google Earth Engine <https://earthengine.google.org/>`_. AWS provides the bands separately and so landsat-util will also pass along the bands individually if requested. In the case of Google Earth Engine, only the full, compressed image bundle is available (including all bands and metadata) and will be downloaded no matter what bands are requested.

landsat/__init__.py

@@ -1 +1 @@
-__version__ = '0.7.0'
+__version__ = '0.8.0'

landsat/decorators.py

@@ -0,0 +1,12 @@
+import warnings
+import rasterio
+
+
+def rasterio_decorator(func):
+    def wrapped_f(*args, **kwargs):
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            with rasterio.drivers():
+                return func(*args, **kwargs)
+
+    return wrapped_f