diff --git a/tools/travis/docker_run.sh b/tools/travis/docker_run.sh index 7a0f4a301..6044ea2c5 100755 --- a/tools/travis/docker_run.sh +++ b/tools/travis/docker_run.sh @@ -14,6 +14,9 @@ eval "$(pyenv init -)" pyenv global ${PYVER} pyenv local ${PYVER} +PYMAJ=$(python -c "import sys; print(sys.version_info[0])") +PYMIN=$(python -c "import sys; print(sys.version_info[1])") + if (( PYMAJ == 3 )) && (( PYMIN == 7 )); then echo "Skipping installing only needed for doctest which are not run on Python 3.7 (see bellow)" else diff --git a/tools/travis/osx_install.sh b/tools/travis/osx_install.sh index ab5224093..a439aec5c 100755 --- a/tools/travis/osx_install.sh +++ b/tools/travis/osx_install.sh @@ -53,7 +53,7 @@ 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 +# 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.2.0rel.tar.gz pyenv rehash diff --git a/tools/travis/osx_run.sh b/tools/travis/osx_run.sh index 8c8a06f8a..de2d3f3a1 100755 --- a/tools/travis/osx_run.sh +++ b/tools/travis/osx_run.sh @@ -2,6 +2,10 @@ set -e -x +CWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $CWD/../.. +ROOT=$PWD +cd $CWD shell_session_update() { :; } eval "$(pyenv init -)" @@ -25,9 +29,10 @@ set -e python setup.py build_ext --inplace cpptest pytest export PYTHONPATH=${PYTHONPATH}:`pwd` -for f in $(find examples -maxdepth 1 -type f -name "*.py"); do +cd $ROOT/examples +for f in $(find . -maxdepth 1 -type f -name "*.py"); do FILE=$(basename $f) FILE="${FILE%.*}" # skipping it takes too long [[ "plot_asynchronous_stochastic_solver" != "$FILE" ]] && \ - DISPLAY="-1" python -c "import tick.base; import examples.$FILE" + DISPLAY="-1" python -c "import tick.base; import $FILE" done