From bd37cd7e5a1e5b8bca6fa19c0f9b8cca6d022f2a Mon Sep 17 00:00:00 2001
From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>
Date: Sat, 24 Nov 2018 17:05:42 +0100
Subject: [PATCH] Pin pytest to <3.8

---
 .appveyor.yml                       | 3 ++-
 requirements/testing/travis_all.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index a04d3d14e3ad..10e5c83cedce 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -66,7 +66,8 @@ install:
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
-  - pip install -q "pytest>=3.4" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
+  - pip install -q "pytest>=3.4,<3.8" "pytest-cov>=2.3.1" pytest-rerunfailures
+    pytest-timeout pytest-xdist
 
   # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
   # https://github.com/matplotlib/matplotlib/issues/9176
diff --git a/requirements/testing/travis_all.txt b/requirements/testing/travis_all.txt
index 364e43fd8875..2d5ae8139bd0 100644
--- a/requirements/testing/travis_all.txt
+++ b/requirements/testing/travis_all.txt
@@ -8,7 +8,8 @@ pillow
 pyparsing
 # pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.4 is
 # still supported; this is tested by the first travis python 3.5 build
-pytest>=3.6
+# pytest>=3.8 throws RemovedInPytest4Warning (github #12825)
+pytest>=3.6,<3.8
 pytest-cov
 pytest-faulthandler
 pytest-rerunfailures