diff --git a/tools/travis/docker_run.sh b/tools/travis/docker_run.sh index 578142a32..7a0f4a301 100755 --- a/tools/travis/docker_run.sh +++ b/tools/travis/docker_run.sh @@ -14,9 +14,13 @@ eval "$(pyenv init -)" pyenv global ${PYVER} pyenv local ${PYVER} -# needed for basemap see https://github.com/matplotlib/basemap/issues/414#issuecomment-436792915 -python -m pip install https://github.com/jswhit/pyproj/archive/v1.9.5.1rel.zip -python -m pip install https://github.com/matplotlib/basemap/archive/v1.1.0.tar.gz +if (( PYMAJ == 3 )) && (( PYMIN == 7 )); then + echo "Skipping installing only needed for doctest which are not run on Python 3.7 (see bellow)" +else + # needed for basemap see https://github.com/matplotlib/basemap/issues/414#issuecomment-436792915 + python -m pip install https://github.com/jswhit/pyproj/archive/v1.9.5.1rel.zip + python -m pip install https://github.com/matplotlib/basemap/archive/v1.1.0.tar.gz +fi ## disabled for the moment - re-enable later #python -m pip install yapf --upgrade diff --git a/tools/travis/osx_install.sh b/tools/travis/osx_install.sh index f2d0135ef..ab5224093 100755 --- a/tools/travis/osx_install.sh +++ b/tools/travis/osx_install.sh @@ -45,7 +45,13 @@ python -m pip install -r requirements.txt python -m pip install sphinx pillow python -m pip install cpplint [[ "${PYVER}" != "3.7.0" ]] && python -m pip install tensorflow # does not yet exist on python 3.7 -brew install geos + +# Check if not already installed +if brew ls --versions geos > /dev/null; then + echo "geos is already installed" +else + brew install geos +fi # needed for basemap see https://github.com/matplotlib/basemap/issues/414#issuecomment-436792915 python -m pip install https://github.com/jswhit/pyproj/archive/v1.9.5.1rel.zip python -m pip install https://github.com/matplotlib/basemap/archive/v1.1.0.tar.gz