Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit bc85987

Browse filesBrowse files
authored
Merge pull request #14590 from dstansby/v2.2.x
CI: Try to fix 2.2.x travis building
2 parents d099603 + 503ac34 commit bc85987
Copy full SHA for bc85987

File tree

Expand file treeCollapse file tree

2 files changed

+7
-5
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+7
-5
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+6-4Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sudo: false
55

66
services:
77
- xvfb
8-
8+
99
branches:
1010
except:
1111
- /^auto-backport-of-pr-\d*/
@@ -89,7 +89,9 @@ matrix:
8989
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4.
9090
- SPHINX=sphinx==1.3
9191
- python: 3.4
92-
env: PYTHON_ARGS=-OO
92+
env:
93+
- PYTHON_ARGS=-OO
94+
- PYTEST_RERUNFAILURES='pytest-rerunfailures<7'
9395
- python: 3.6
9496
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
9597
- python: 3.7
@@ -180,11 +182,11 @@ install:
180182
pip install $PRE \
181183
$PYTEST \
182184
$PYTEST_COV \
183-
pytest-faulthandler \
185+
'pytest-faulthandler<1.6' \
184186
$PYTEST_PEP8 \
185187
$PYTEST_RERUNFAILURES \
186188
$PYTEST_TIMEOUT \
187-
pytest-xdist
189+
'pytest-xdist<1.28'
188190
189191
# Use the special local version of freetype for testing
190192
cp ci/travis/setup.cfg .

‎doc-requirements.txt

Copy file name to clipboardExpand all lines: doc-requirements.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ colorspacious
1111
ipython
1212
ipywidgets
1313
mock
14-
numpydoc>=0.4
14+
numpydoc>=0.4,<0.9
1515
pillow
1616
sphinx-gallery>=0.1.12

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.