From c1fba63a05d62abcdcadca629abec70b879d56bd Mon Sep 17 00:00:00 2001 From: Nelle Varoquaux Date: Mon, 6 Jan 2020 13:51:02 +0100 Subject: [PATCH 1/9] Merge pull request #16112 from Kojoley/ci-travis-fail-when-dep-install-fails CI: Fail when failed to install dependencies --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cbfe8341c555..e425cedc4201 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,8 +125,10 @@ before_install: export PATH=$PATH:/tmp/λ export PATH=/usr/lib/ccache:$PATH else + set -e brew update brew tap homebrew/gui + set +e # 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. @@ -159,6 +161,8 @@ install: $PYPARSING \ $DATEUTIL \ $SPHINX + - | + # Install optional dependencies from PyPI. # GUI toolkits are pip-installable only for some versions of Python so # don't fail if we can't install them. Make it easier to check whether the # install was successful by trying to import the toolkit (sometimes, the From c9e2a063e851995cf6bd278a2357829cb2a3f42e Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Fri, 17 Jan 2020 17:17:05 -0500 Subject: [PATCH 2/9] CI: backport osx on travis changes en-mass This will move testing on travis to python3 (from python2), however I am not sure it is worth the effort of moving brew on travis back to python2 so that we can in very short order delete this branch and close out the 2.2.x series (now that python2 is EOL). --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e425cedc4201..51b41b6689f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -126,14 +126,19 @@ before_install: export PATH=/usr/lib/ccache:$PATH else set -e - brew update - brew tap homebrew/gui + ci/silence brew update + brew uninstall numpy gdal postgis + brew unlink python@2 + brew upgrade python + brew install ffmpeg imagemagick mplayer ccache + hash -r + which python + python --version set +e - # 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 + export PATH=/usr/local/opt/python/libexec/bin:/usr/local/opt/ccache/libexec:$PATH fi install: From 261ae83ffd4ceeb18b84a289711674b256fd602b Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Fri, 17 Jan 2020 17:40:45 -0500 Subject: [PATCH 3/9] CI: accept that brew will be verbose --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51b41b6689f1..4c02dfe70be7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -126,7 +126,7 @@ before_install: export PATH=/usr/lib/ccache:$PATH else set -e - ci/silence brew update + brew update brew uninstall numpy gdal postgis brew unlink python@2 brew upgrade python From 7b019ec8b24ec9dd77faf7dfc02f145942ea85b2 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 19 Jan 2020 18:42:03 -0500 Subject: [PATCH 4/9] CI: bump sphinx version to pick up support for newer docutils --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c02dfe70be7..388692b9908d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ matrix: - PYTEST_COV=pytest-cov==2.3.1 - PYTEST_RERUNFAILURES='pytest-rerunfailures<6' # 6 needs pytest >=3.8 - PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4. - - SPHINX=sphinx==1.3 + - SPHINX=sphinx==1.3.3 - python: 3.4 env: - PYTHON_ARGS=-OO From 4da7fa1c1966c0ebfe4e4b54c00193b6abc0d951 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 19 Jan 2020 18:43:05 -0500 Subject: [PATCH 5/9] CI: remove mac builds on travis The brew configuration has bit-rotted --- .travis.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 388692b9908d..a79de71b52c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,22 +98,7 @@ matrix: sudo: true - python: "nightly" env: PRE=--pre - - os: osx - osx_image: xcode7.3 - language: generic # https://github.com/travis-ci/travis-ci/issues/2312 - env: - - MOCK=mock - - PILLOW='pillow!=5.1.0' - only: master - cache: - # As for now travis caches only "$HOME/.cache/pip" - # https://docs.travis-ci.com/user/caching/#pip-cache - pip: false - directories: - - $HOME/Library/Caches/pip - # `cache` does not support `env`-like `global` so copy-paste from top - - $HOME/.ccache # https://github.com/travis-ci/travis-ci/issues/5853 - - $HOME/.cache/matplotlib + allow_failures: - python: "nightly" From c85c7591e60aef425b3c9c7d8c131e977b202ae4 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 19 Jan 2020 18:43:42 -0500 Subject: [PATCH 6/9] CI: remove the nightly build from travis --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a79de71b52c6..4a229b89b581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,11 +96,6 @@ matrix: env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8 - python: 3.7 sudo: true - - python: "nightly" - env: PRE=--pre - - allow_failures: - - python: "nightly" before_install: - | From a1bf33e9b78d0c5811903563da22af576a86e2ed Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 19 Jan 2020 18:44:20 -0500 Subject: [PATCH 7/9] CI: add py38 to build matrix --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4a229b89b581..bd923fdd6c94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,6 +96,8 @@ matrix: env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8 - python: 3.7 sudo: true + - python: 3.8 + before_install: - | From a14c3c4f5dc55af4fbbf9576ec7a81b9e292b96d Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 19 Jan 2020 19:59:43 -0800 Subject: [PATCH 8/9] Revert "CI: remove mac builds on travis" This reverts commit 4da7fa1c1966c0ebfe4e4b54c00193b6abc0d951. --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index bd923fdd6c94..d6a6d93c3647 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,6 +97,22 @@ matrix: - python: 3.7 sudo: true - python: 3.8 + - os: osx + osx_image: xcode7.3 + language: generic # https://github.com/travis-ci/travis-ci/issues/2312 + env: + - MOCK=mock + - PILLOW='pillow!=5.1.0' + only: master + cache: + # As for now travis caches only "$HOME/.cache/pip" + # https://docs.travis-ci.com/user/caching/#pip-cache + pip: false + directories: + - $HOME/Library/Caches/pip + # `cache` does not support `env`-like `global` so copy-paste from top + - $HOME/.ccache # https://github.com/travis-ci/travis-ci/issues/5853 + - $HOME/.cache/matplotlib before_install: From ee395f5c5cf68c338fa8979da58d29e1c3cb3b71 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 19 Jan 2020 19:59:59 -0800 Subject: [PATCH 9/9] CI: try removing the osx_image specification --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6a6d93c3647..fdddf230ee70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,7 +98,6 @@ matrix: sudo: true - python: 3.8 - os: osx - osx_image: xcode7.3 language: generic # https://github.com/travis-ci/travis-ci/issues/2312 env: - MOCK=mock pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy