From 69b5f54ca3502d1a2b2ef42ed5daf4c0badb56f0 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 14:32:37 +0100 Subject: [PATCH 01/12] Remove travis after all trigger --- .travis.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2766b46b55e..96d19d03646 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,6 @@ matrix: before_install: - | # Install into our own pristine virtualenv - source ci/travis/travis_tools.sh virtualenv --python=python venv source venv/bin/activate export PATH=/usr/lib/ccache:$PATH @@ -177,21 +176,6 @@ after_success: else echo "Will only deploy docs build from matplotlib master branch" fi - if [[ $TRAVIS_PULL_REQUEST == false ]] && \ - [[ $TRAVIS_REPO_SLUG == 'matplotlib/matplotlib' ]] && \ - [[ $TRAVIS_BRANCH == 'master' ]]; then - cd $TRAVIS_BUILD_DIR - python ci/travis/travis_after_all.py - export $(cat .to_export_back) - if [ "$BUILD_LEADER" = "YES" ]; then - if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then - echo "All Succeeded! Triggering OSX build..." - ./ci/travis/build_children.sh - else - echo "Some Failed; no OSX build" - fi - fi - fi if [[ $NOSE_ARGS="--with-coverage" ]]; then coveralls fi From 6e82772d86a6a0055496e2e9f14fb94b74f4dcc5 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 14:37:46 +0100 Subject: [PATCH 02/12] Try running tests on OSX --- .travis.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96d19d03646..40a8988f88b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,15 +58,23 @@ matrix: env: BUILD_DOCS=true - python: "nightly" env: PRE=--pre + - os: OSX + osx_image: xcode7.3 + language: generic allow_failures: - python: "nightly" before_install: - | # Install into our own pristine virtualenv - virtualenv --python=python venv - source venv/bin/activate - export PATH=/usr/lib/ccache:$PATH + if [[ $TRAVIS_OS_NAME != 'osx' ]]; then + virtualenv --python=python venv + source venv/bin/activate + export PATH=/usr/lib/ccache:$PATH + else + brew update + brew install python libpng + fi install: - | @@ -122,7 +130,11 @@ script: echo The following args are passed to nose $NOSE_ARGS if [[ $BUILD_DOCS == false ]]; then export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples - gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS + if [[ $TRAVIS_OS_NAME != 'osx' ]]; then + python tests.py $NOSE_ARGS $TEST_ARGS + else + gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS + fi else cd doc python make.py html --small From c2fbf58640ae7ecc914e4560a7683da7d1e26a29 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 14:53:16 +0100 Subject: [PATCH 03/12] Correct case --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 40a8988f88b..065c5e0a3a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ matrix: env: BUILD_DOCS=true - python: "nightly" env: PRE=--pre - - os: OSX + - os: osx osx_image: xcode7.3 language: generic allow_failures: From b6523ca05391db3386f03ca5fa038a280493e12b Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 15:05:49 +0100 Subject: [PATCH 04/12] Correct bash logic : --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 065c5e0a3a1..c6c1575c62d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ cache: - $HOME/.ccache - $HOME/.cache/pip - $HOME/.cache/matplotlib + - $HOME/Library/Caches/pip addons: apt: @@ -79,7 +80,9 @@ before_install: install: - | # Setup environment - ccache -s + if [[ $TRAVIS_OS_NAME != 'osx' ]]; then + ccache -s + fi # Upgrade pip and setuptools and wheel to get as clean an install as possible pip install --upgrade pip pip install --upgrade wheel @@ -130,7 +133,7 @@ script: echo The following args are passed to nose $NOSE_ARGS if [[ $BUILD_DOCS == false ]]; then export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples - if [[ $TRAVIS_OS_NAME != 'osx' ]]; then + if [[ $TRAVIS_OS_NAME == 'osx' ]]; then python tests.py $NOSE_ARGS $TEST_ARGS else gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS From 40650539388d34cd665fde07f51c5e58acc5412c Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 15:18:27 +0100 Subject: [PATCH 05/12] Remember to install mock on osx 2.7 too --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c6c1575c62d..5291ae70bd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,6 +62,7 @@ matrix: - os: osx osx_image: xcode7.3 language: generic + env: MOCK=mock allow_failures: - python: "nightly" From d0534421f8e4aff9011eeac9edb1dc7d48f07991 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 15:40:18 +0100 Subject: [PATCH 06/12] install inkscape too --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5291ae70bd7..bc40fb1996a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,8 @@ before_install: export PATH=/usr/lib/ccache:$PATH else brew update - brew install python libpng + brew tap homebrew/gui + brew install python libpng inkscape fi install: From abc617f9ecfb8e30a6df0a2c0963e8e9e9d8b8ad Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 15:59:17 +0100 Subject: [PATCH 07/12] Build in verbose mode --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc40fb1996a..ed5146911e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -136,7 +136,7 @@ script: if [[ $BUILD_DOCS == false ]]; then export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - python tests.py $NOSE_ARGS $TEST_ARGS + python tests.py $NOSE_ARGS $TEST_ARGS -v else gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS fi From 0d3aad456bcc7c0caf595bc90d6d55b247ba33fe Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 16:33:10 +0100 Subject: [PATCH 08/12] Add more dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed5146911e3..523ef16027b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ before_install: else brew update brew tap homebrew/gui - brew install python libpng inkscape + brew install python libpng inkscape ffmpeg imagemagick mplayer ghostscript fi install: From 2daee948055a186bb6f6f3fd58b84b54b433c3e7 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 10 Jun 2016 17:24:27 +0100 Subject: [PATCH 09/12] Non verbose --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 523ef16027b..80cc92741b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -136,7 +136,7 @@ script: if [[ $BUILD_DOCS == false ]]; then export MPL_REPO_DIR=$PWD # needed for pep8-conformance test of the examples if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - python tests.py $NOSE_ARGS $TEST_ARGS -v + python tests.py $NOSE_ARGS $TEST_ARGS else gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS fi From d7ca8478b1bfd52d161f5d93326ced2c13d35aad Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 16 Jun 2016 15:12:51 +0100 Subject: [PATCH 10/12] Don't install ghostscript and inkscape on osx --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 80cc92741b1..f2d8c7f4eaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,10 @@ before_install: else brew update brew tap homebrew/gui - brew install python libpng inkscape ffmpeg imagemagick mplayer ghostscript + brew install python libpng ffmpeg imagemagick mplayer + # We could install ghostscript and inkscape here to test svg and pdf + # but this makes the test time really long. + # brew install ghostscript inkscape fi install: From 7a25978f10217f47065fcba2b3f73906dfffcad3 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 16 Jun 2016 15:21:18 +0100 Subject: [PATCH 11/12] Use ccache on OSX --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2d8c7f4eaa..5cf2d55860a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,18 +76,17 @@ before_install: else brew update brew tap homebrew/gui - brew install python libpng ffmpeg imagemagick mplayer + brew install python libpng ffmpeg imagemagick mplayer ccache # We could install ghostscript and inkscape here to test svg and pdf # but this makes the test time really long. # brew install ghostscript inkscape + export PATH=/usr/local/opt/ccache/libexec:$PATH fi install: - | # Setup environment - if [[ $TRAVIS_OS_NAME != 'osx' ]]; then - ccache -s - fi + ccache -s # Upgrade pip and setuptools and wheel to get as clean an install as possible pip install --upgrade pip pip install --upgrade wheel From 5bc35b1ae6792485e4d5616b1a49aa6efe0daba9 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 16 Jun 2016 16:54:23 +0100 Subject: [PATCH 12/12] OSX boxes are only 1 core --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5cf2d55860a..4f912c0fa2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ matrix: - os: osx osx_image: xcode7.3 language: generic - env: MOCK=mock + env: MOCK=mock NOSE_ARGS= allow_failures: - python: "nightly"