Skip to content

Pin pytest-timeout to fix the build. #11444

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
phobson merged 1 commit into from
Jun 18, 2018
Merged

Pin pytest-timeout to fix the build. #11444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ env:
- NUMPY=numpy
- PANDAS=
- PYPARSING=pyparsing
- PYTEST='pytest>=3.4'
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.4 is
# still supported; this is tested by the first matrix entry.
- PYTEST='pytest>=3.6'
- PYTEST_COV=pytest-cov
- PYTEST_PEP8=
- PYTEST_TIMEOUT=pytest-timeout
- SPHINX=sphinx
# Variables controlling the build.
- MPLLOCALFREETYPE=1
Expand Down Expand Up @@ -86,6 +89,7 @@ matrix:
- PYPARSING=pyparsing==2.0.1
- PYTEST=pytest==3.4
- PYTEST_COV=pytest-cov==2.3.1
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest 3.4.
- SPHINX=sphinx==1.3
- python: 3.5
env:
Expand Down Expand Up @@ -177,7 +181,7 @@ install:
pytest-faulthandler \
$PYTEST_PEP8 \
pytest-rerunfailures \
pytest-timeout \
$PYTEST_TIMEOUT \
pytest-xdist
- |
# Install matplotlib
Expand Down