Merge pull request #141 from developmentseed/develop

release v0.10.0

.travis.yml

@@ -1,44 +1,27 @@
-language: python
+sudo: required
 
-sudo: false
-
-cache:
-  directories:
-    - ~/.cache/pip
+services:
+- docker
 
 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:
-  - pip install -U pip
-  - pip install wheel
+  - secure: QsF7ignSAbH/WCyO6v9bw1exmCWDQR0DqmHkwJ5swc9N44OOOzbWGsaMSYB5y9h+d70fz4arbxQDhsk2KvX4Zd1/2YIMOrIsbgDYeegpkhVPgyQNPKmVqiX+Tb47t1C/TgkC7A07tiPpuefYcLNMZ8gzz7oKhh1UKapYftqzZ+g=
+  - secure: HxjeKWSROBQYy9NuNkgQeaK1ubTF8vH5FcR8nUTSAYxxw/qOzKpqkiq4BcJSRcIwTbkvaBf4MshLGVOxPjMeyJFe06UD/6LvTUGS3bwdya+m0RFjHe5/3wzS8/MxLbTlvgzmuGLLKOsJjXCi9eQQchKfHv+QuhGxhYVLQpnbU9E=
+  - secure: Zq0Z2UA2A7/ieXX8XoMweClJTp8hiVBxoQ1ylJYNd7qsRSk0QvZhn62db5/x48L9S1kELk0sG64q5Pf96/RPLpdjkBUAdEkS7qF+QOvRvAv2woNEHutjlMUvP6jwYGbug+AORg76btZ57OwMOi3aTkagQMMKnokfo7KGbffy0Jo=
+
 
 install:
-  - "pip wheel -r requirements/dev.txt"
-  - "pip install -r requirements/dev.txt"
+- pip install --user twine
+
+before_script:
+- docker build --file="travis-dockerfile" -t "developmentseed/landsat-util:travis" .
 
 script:
-- nosetests
+- 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
 
 deploy:
   provider: pypi
@@ -47,13 +30,14 @@ deploy:
     secure: WtawFW/999XYszmZfj1Qk82l00OSyP2JBVOOGCERrW1gVO7MYtYsgP31HKRSzNTCTHJNVDpdK4WZWY6zPQqC3l2UfWYYsvRn0hCoI8AJxE5VCUEg6Ccpe6fMJuhp1pq6Zy7yrfBSZcOB9aqSHLBJsunD2o3mNlTC8WV8vNK74ck=
   on:
     repo: developmentseed/landsat-util
-    branch: master
+    branch:
+      - master
+      - develop
 
 after_deploy:
   if [ "$TRAVIS_BRANCH" == "master" ]; then
     echo "Start Docker Hub Push"
-    VER=$(python -c "import landsat; print landsat.__version__")
+    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 login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
     docker push developmentseed/landsat-util:$VER
   fi

AUTHORS.txt

@@ -5,7 +5,5 @@ Scisco https://github.com/scisco
 Marc Farra https://github.com/kamicut
 Drew Bollinger https://github.com/drewbo
 Alex Kappel https://twitter.com/alex_kappel
-Eric Miller https://github.com/millerEric
-Yuriy Czoli https://github.com/YKCzoli
 
 See also https://github.com/developmentseed/landsat-util/graphs/contributors.

CHANGES.txt

@@ -1,6 +1,19 @@
 Changes
 =======
 
+0.10.0 (2016-01-05)
+------------------
+- add support for bare json output
+- faster travis tests
+- add street search
+- apply ndvigrey to process and download
+- fixes #127
+- update commands help file
+- apply pansharpen and ndvi only if -p is used
+- download zip if bands are not specified
+- better handle url joins to a fix error on Windows
+- other small bug fixes
+
 0.9.1 (2015-10-26)
 ------------------
 - Add missing package (polyline) to setup.py

Dockerfile

@@ -5,4 +5,3 @@ 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
-

MANIFEST.in

@@ -7,4 +7,4 @@ recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 
 recursive-include docs *.rst conf.py Makefile make.bat
-recursive-include landsat/tests/samples *.tar.bz2
+recursive-include landsat/maps *.txt

README.rst

@@ -21,20 +21,32 @@ Landsat-util is a command line utility that makes it easy to search, download, a
 Docs
 +++++
 
-For full documentation visit: http://landsat-util.readthedocs.org/
+For full documentation visit: https://pythonhosted.org/landsat-util/
 
 To run the documentation locally::
 
     $ pip install -r requirements/dev.txt
     $ 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
 +++++++++++++++++++++++
 
-- Add longitude latitude search
-- Improve console output
-- Add more color options such as false color, true color, etc.
+- Improved pansharpening
+- Use BQA bands for cloud/snow coverage and use in color correction
+- Add support for different NDVI color maps (three included)
+- Add support for image clipping using the new `--clip` flag
 
 Change Log
 ++++++++++

docs/commands.rst

@@ -20,6 +20,8 @@ Commands
 
                     --lon               Longitude
 
+                    --address           Street address
+
                     -l LIMIT, --limit LIMIT
                                         Search return results limit default is 10
 
@@ -35,6 +37,8 @@ Commands
                     -c CLOUD, --cloud CLOUD
                                         Maximum cloud percentage. Default: 20 perct
 
+                    --json              Returns a bare JSON response
+
                     -h, --help          Show this help message and exit
 
             Download:
@@ -60,6 +64,8 @@ Commands
 
                     --ndvi              Calculates NDVI and produce a RGB GTiff with seperate colorbar.
 
+                    --ndvigrey          Calculates NDVI and produce a greyscale GTiff.
+
                     --clip              Clip the image with the bounding box provided. Values must be in WGS84 datum,
                                         and with longitude and latitude units of decimal degrees separated by comma.
                                         Example: --clip -346.06658935546875,49.93531194616915,-345.4595947265625,50.2682767372753

docs/overview.rst

@@ -36,6 +36,9 @@ Search by latitude and longitude::
 
     $: landsat search --lat 38.9004204 --lon -77.0237117
 
+Search by latitude and longitude with pure json output::
+
+    $: landsat search --lat 38.9004204 --lon -77.0237117 --json
 
 Download
 ++++++++
@@ -50,7 +53,7 @@ Download images by their custom sceneID, which you get from landsat search::
 
     $: landsat download LC80090452014008LGN00
 
-Download only band 4, 3 and 2 for a particular sceneID::
+By default landsat-util downloads the full zip file from Google Storage unless you specify the bands or run an image processing right after download. For example to download only band 4, 3 and 2 for a particular sceneID run::
 
     $: landsat download LC80090452014008LGN00 --bands 432
 

docs/todo.rst

@@ -1,9 +1,6 @@
 To Do List
 ++++++++++
 
-- Add Sphinx Documentation
-- Add capacity for NDVI output
 - Add alternative projections (currently only option is default web-mercator; EPSG: 3857)
-- Connect search to Google Address API
 - Include 16-bit image variant in output
 - Add support for color correct looping over multiple compressed inputs (currently just 1)

landsat/__init__.py

@@ -1 +1 @@
-__version__ = '0.9.1'
+__version__ = '0.10.0'

landsat/downloader.py

@@ -5,7 +5,7 @@
 from homura import download as fetch
 import requests
 
-from utils import check_create_folder
+from utils import check_create_folder, url_builder
 from mixins import VerbosityMixin
 import settings
 
@@ -192,7 +192,7 @@ def google_storage_url(self, sat):
             (String) The URL to a google storage file
         """
         filename = sat['scene'] + '.tar.bz'
-        return join(self.google, sat['sat'], sat['path'], sat['row'], filename)
+        return url_builder([self.google, sat['sat'], sat['path'], sat['row'], filename])
 
     def amazon_s3_url(self, sat, filename):
         """
@@ -210,7 +210,7 @@ def amazon_s3_url(self, sat, filename):
         :returns:
             (String) The URL to a S3 file
         """
-        return join(self.s3, sat['sat'], sat['path'], sat['row'], sat['scene'], filename)
+        return url_builder([self.s3, sat['sat'], sat['path'], sat['row'], sat['scene'], filename])
 
     def remote_file_exists(self, url):
         """ Checks whether the remote file exists.
@@ -284,4 +284,4 @@ def scene_interpreter(self, scene):
 
     d = Downloader()
 
-    # d.download(['LC81990242015046LGN00', 'LC80030172015001LGN00'])
+    # d.download(['LC81990242015046LGN00', 'LC80030172015001LGN00'])