Merge pull request #14420 from jkseppan/upgrade-pytest

timhoffm · web-flow · commit 005acc0dced6 · 2019-06-03T16:13:04.000+02:00
MAINT: Upgrade pytest again
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -66,7 +66,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,<4.6" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
+  - pip install -q "pytest>=3.4,!=4.6.0" "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
@@ -5,7 +5,7 @@ cycler
 numpy
 pillow
 pyparsing
-pytest>=4.5.0,<4.6.0
+pytest!=4.6.0
 pytest-cov
 pytest-faulthandler
 pytest-rerunfailures
