Skip to content

Backport of #11444 to v2.2.2-doc. #11478

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

Backport of #11444 to v2.2.2-doc. #11478

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 @@ -52,9 +52,12 @@ env:
- NUMPY=numpy
- PANDAS=
- PYPARSING=pyparsing
- PYTEST='pytest!=3.3.0,>=3.2.0'
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.1 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
- OPENBLAS_NUM_THREADS=1
- NPROC=2
Expand All @@ -77,6 +80,7 @@ matrix:
- PYPARSING=pyparsing==2.0.1
- PYTEST=pytest==3.1.0
- 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.4
env: PYTHON_ARGS=-OO
Expand Down Expand Up @@ -169,7 +173,7 @@ install:
pytest-faulthandler \
$PYTEST_PEP8 \
pytest-rerunfailures \
pytest-timeout \
$PYTEST_TIMEOUT \
pytest-xdist

# Use the special local version of freetype for testing
Expand Down