From f57f07df7cedd359adb3b740eede0f838cacf314 Mon Sep 17 00:00:00 2001
From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>
Date: Sun, 6 Jan 2019 20:31:14 +0100
Subject: [PATCH] Pin pytest<4.1 to unbreak CI tests

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 50f752a2e47d..ff907a5920b9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -65,7 +65,7 @@ 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,<4.1" "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 3f5811b1b778..758d8d53f8c1 100644
--- a/requirements/testing/travis_all.txt
+++ b/requirements/testing/travis_all.txt
@@ -6,7 +6,7 @@ cycler
 numpy
 pillow
 pyparsing
-pytest
+pytest<4.1
 pytest-cov
 pytest-faulthandler
 pytest-rerunfailures