Skip to content

Commit

Permalink
Merge pull request #163 from nismod/fix/ci
Browse files Browse the repository at this point in the history
Working on Travis passing
  • Loading branch information
sveneggimann committed Mar 18, 2019
2 parents ed25180 + aa1916c commit 8b0d5d0
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions tests/travis_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,14 @@ if [[ "$DISTRIB" == "conda" ]]; then
conda create -n testenv \
python=$PYTHON_VERSION \
fiona \
haversine \
imageio \
matplotlib \
numpy \
palettable \
pytest \
pytest-cov \
scipy
# skip geopandas, pyproj from conda install (add fiona) in order to work on defaults
# channel for python 3.5
# skip geopandas, pyproj, palettable and haversine from conda install (add fiona) in order
# to work on defaults channel for python 3.5

source activate testenv

Expand Down

0 comments on commit 8b0d5d0

Please sign in to comment.