From d0c22631462fb50e76dede8aa562d11fb24f966c Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2019 16:15:33 +0100 Subject: [PATCH 1/5] Try to fix 2.2.x travis building --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 70e130caf038..72a7f1024f10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: false services: - xvfb - + branches: except: - /^auto-backport-of-pr-\d*/ @@ -184,7 +184,7 @@ install: $PYTEST_PEP8 \ $PYTEST_RERUNFAILURES \ $PYTEST_TIMEOUT \ - pytest-xdist + 'pytest-xdist<1.28' # Use the special local version of freetype for testing cp ci/travis/setup.cfg . From 7b24252c8686e4a7d740126ac24d96464c75b07f Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2019 16:23:45 +0100 Subject: [PATCH 2/5] Pin pytest-faulthandler --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72a7f1024f10..36c4a760a362 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,7 +180,7 @@ install: pip install $PRE \ $PYTEST \ $PYTEST_COV \ - pytest-faulthandler \ + 'pytest-faulthandler<1.6' \ $PYTEST_PEP8 \ $PYTEST_RERUNFAILURES \ $PYTEST_TIMEOUT \ From ccded5f4c91f51e2c66f24302f1f75fe2834a58c Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2019 16:43:18 +0100 Subject: [PATCH 3/5] Pin sphinx-gallery --- doc-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-requirements.txt b/doc-requirements.txt index 446ed9d980da..f562f65a36de 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -13,4 +13,4 @@ ipywidgets mock numpydoc>=0.4 pillow -sphinx-gallery>=0.1.12 +sphinx-gallery>=0.1.12,<0.3 From ef1954adf50d57b8756b82ea4198b1051ec745ba Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2019 16:47:54 +0100 Subject: [PATCH 4/5] Pin pytest-rerunfailures --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36c4a760a362..2638f30ad27f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,7 +89,9 @@ matrix: - PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4. - SPHINX=sphinx==1.3 - python: 3.4 - env: PYTHON_ARGS=-OO + env: + - PYTHON_ARGS=-OO + - PYTEST_RERUNFAILURES='pytest-rerunfailures<7' - python: 3.6 env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8 - python: 3.7 From 503ac34c0e8cbdd63b20e454e0f54dc0744b8055 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2019 16:56:55 +0100 Subject: [PATCH 5/5] Pin numpydoc --- doc-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc-requirements.txt b/doc-requirements.txt index f562f65a36de..7de9a6df005f 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -11,6 +11,6 @@ colorspacious ipython ipywidgets mock -numpydoc>=0.4 +numpydoc>=0.4,<0.9 pillow -sphinx-gallery>=0.1.12,<0.3 +sphinx-gallery>=0.1.12