Merge pull request #11444 from anntzer/pin-pytest-timeout

phobson · web-flow · commit 4ea916ad049a · 2018-06-18T15:33:49.000-07:00
Pin pytest-timeout to fix the build.
diff --git a/.travis.yml b/.travis.yml
@@ -56,9 +56,12 @@ env:
     - PANDAS=
     - JUPYTER=
     - 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
@@ -87,6 +90,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:
@@ -180,7 +184,7 @@ install:
         pytest-faulthandler \
         $PYTEST_PEP8 \
         pytest-rerunfailures \
-        pytest-timeout \
+        $PYTEST_TIMEOUT \
         pytest-xdist
   - |
     # Install matplotlib
