Skip to content

Commit

Permalink
Merge pull request #111 from developmentseed/upgrade
Browse files Browse the repository at this point in the history
upgrade all requirements
  • Loading branch information
Scisco committed Sep 22, 2015
2 parents 5a92e7f + 5321a0a commit d8baa24
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 41 deletions.
57 changes: 40 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,41 @@
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

addons:
apt:
packages:
- libgdal1h
- gdal-bin
- libgdal-dev
- libatlas-dev
- libatlas-base-dev
- gfortran

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 install scipy"
- "pip wheel -r requirements/dev.txt"
- "pip install -r requirements/dev.txt"

script:
- nosetests

deploy:
provider: pypi
user: devseed
Expand All @@ -31,3 +45,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
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``::
Expand Down
2 changes: 1 addition & 1 deletion landsat/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.7.0'
__version__ = '0.8.0'
10 changes: 5 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
requests==2.5.3
requests==2.7.0
python-dateutil>=2.4.2
termcolor>=1.1.0
numpy>=1.9.2
rasterio>=0.21.0
numpy>=1.9.3
rasterio>=0.26.0
six==1.9.0
scipy>=0.16.0
scikit-image>=0.11.3
homura>=0.1.1
scipy>=0.15.1
homura>=0.1.2
boto>=2.38.0
8 changes: 4 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-r base.txt
pdoc>=0.3.1
nose>=1.3.6
coverage>=3.7.1
nose>=1.3.7
coverage>=4.0
Sphinx>=1.3.1
wheel>=0.24.0
mock>=1.0.1
wheel>=0.26.0
mock>=1.3.0
6 changes: 0 additions & 6 deletions requirements/travis.txt

This file was deleted.

14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def readme():
return f.read()

test_requirements = [
'nose>=1.3.6',
'mock>=1.0.1'
'nose>=1.3.7',
'mock>=1.3.0'
]

setup(
Expand All @@ -35,15 +35,15 @@ def readme():
license='CCO',
platforms='Posix; MacOS X; Windows',
install_requires=[
'requests==2.5.3',
'requests==2.7.0',
'python-dateutil>=2.4.2',
'numpy>=1.9.2',
'numpy>=1.9.3',
'termcolor>=1.1.0',
'rasterio>=0.21.0',
'rasterio>=0.26.0',
'six==1.9.0',
'scipy>=0.15.1',
'scipy>=0.16.0',
'scikit-image>=0.11.3',
'homura>=0.1.1',
'homura>=0.1.2',
'boto>=2.38.0'
],
test_suite='nose.collector',
Expand Down

0 comments on commit d8baa24

Please sign in to comment.