Merge pull request #11478 from QuLogic/backport-11444

jklymak · web-flow · commit 6ee794090ea1 · 2018-06-22T08:10:24.000-07:00
Backport of #11444 to v2.2.2-doc.
diff --git a/.travis.yml b/.travis.yml
@@ -53,9 +53,12 @@ env:
     - PANDAS=
     - PILLOW=pillow
     - 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
@@ -78,6 +81,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
@@ -172,7 +176,7 @@ install:
         pytest-faulthandler \
         $PYTEST_PEP8 \
         pytest-rerunfailures \
-        pytest-timeout \
+        $PYTEST_TIMEOUT \
         pytest-xdist
 
     # Use the special local version of freetype for testing
