Revert "Upgrade to pytest 5.4"

This reverts commit 738d0ab875.

Probably a bad idea before this is fixed:
https://github.com/pytest-dev/pytest-rerunfailures/issues/103
This commit is contained in:
Florian Bruhin 2020-03-12 22:42:18 +01:00
parent 31dacdd587
commit c7b0023dcd
3 changed files with 2 additions and 4 deletions

View File

@ -24,9 +24,8 @@ parse-type==0.5.2
pluggy==0.13.1
py==1.8.1
py-cpuinfo==5.0.0
Pygments==2.6.1
pyparsing==2.4.6
pytest==5.4.0
pytest==5.3.5
pytest-bdd==3.2.1
pytest-benchmark==3.2.3
pytest-cov==2.8.1

View File

@ -16,7 +16,6 @@ pytest-rerunfailures
pytest-travis-fold
pytest-xvfb
vulture
pygments
#@ markers: jaraco.functools python_version>="3.6"
#@ add: jaraco.functools==2.0; python_version<"3.6" # rq.filter: <= 2.0

View File

@ -1,6 +1,6 @@
[pytest]
log_level = NOTSET
addopts = --strict --instafail --benchmark-columns=Min,Max,Median
addopts = --strict -rfEw --instafail --benchmark-columns=Min,Max,Median
testpaths = tests
markers =
gui: Tests using the GUI (e.g. spawning widgets)