Skip to content

Commit 7b51001

Browse files
author
Martin Journois
committed
Fix test_image_overlay for py27
1 parent b471146 commit 7b51001

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ before_install:
1616
- conda update --yes --all
1717
- travis_retry conda create --yes -n test python=$PYTHON --file requirements.txt
1818
- source activate test
19-
- conda install --yes --file requirements-dev.txt
20-
- travis_retry conda install --yes pytest pandas vincent flake8 nbconvert jupyter_client ipykernel shapely fiona
21-
- pip install geopandas
22-
- conda update --yes --all
19+
- if [[ "$PYTHON" != "3.3" ]]; then
20+
conda install --yes --file requirements-dev.txt
21+
conda install -c ioos geopandas
22+
fi
2323
- if [[ "$PYTHON" != "3.5" ]]; then
2424
travis_retry conda install --yes mock ;
2525
fi

requirements-dev.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@ vincent
55
nbconvert
66
jupyter_client
77
ipykernel
8-
shapely
9-
fiona
10-
pyproj

0 commit comments

Comments
 (0)