Skip to content

Try to fix 2.2.x travis building #14590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 22, 2019
Merged

Try to fix 2.2.x travis building #14590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0c2263
Try to fix 2.2.x travis building
dstansby Jun 20, 2019
7b24252
Pin pytest-faulthandler
dstansby Jun 20, 2019
ccded5f
Pin sphinx-gallery
dstansby Jun 20, 2019
ef1954a
Pin pytest-rerunfailures
dstansby Jun 20, 2019
503ac34
Pin numpydoc
dstansby Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sudo: false

services:
- xvfb

branches:
except:
- /^auto-backport-of-pr-\d*/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -180,11 +182,11 @@ install:
pip install $PRE \
$PYTEST \
$PYTEST_COV \
pytest-faulthandler \
'pytest-faulthandler<1.6' \
$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 .
Expand Down
2 changes: 1 addition & 1 deletion doc-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ colorspacious
ipython
ipywidgets
mock
numpydoc>=0.4
numpydoc>=0.4,<0.9
pillow
sphinx-gallery>=0.1.12