From c19b364f660e7dfbc8e581a7d3a3c41df3129cb6 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 11 Jan 2019 12:14:33 +0000 Subject: [PATCH] Revert "Pin pytest to <3.8 (for 3.0.x)" --- .appveyor.yml | 3 +-- requirements/testing/travis_all.txt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 10e5c83cedce..a04d3d14e3ad 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -66,8 +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,<3.8" "pytest-cov>=2.3.1" pytest-rerunfailures - pytest-timeout pytest-xdist + - pip install -q "pytest>=3.4" "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 2d5ae8139bd0..364e43fd8875 100644 --- a/requirements/testing/travis_all.txt +++ b/requirements/testing/travis_all.txt @@ -8,8 +8,7 @@ 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.8 throws RemovedInPytest4Warning (github #12825) -pytest>=3.6,<3.8 +pytest>=3.6 pytest-cov pytest-faulthandler pytest-rerunfailures