diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-03-21 17:30:08 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-04-03 14:36:49 +0200 |
| commit | 50ed45d83900884e00906b580c62196ae65b2179 (patch) | |
| tree | 9924632a490ecc66e4aaf4f8ac09ab906e58e480 | |
| parent | bb3383dc0be464349d6c09bc7bbcff6957ea1a9d (diff) | |
| download | qutebrowser-50ed45d83900884e00906b580c62196ae65b2179.tar.gz qutebrowser-50ed45d83900884e00906b580c62196ae65b2179.zip | |
Upgrade to pytest 5.4
This reverts commit c7b0023dcd576f7e7d6223f94a4ced5f2932afc5.
There's a new pytest-rerunfailures version out now.
(cherry picked from commit b2f48b5839efbf33cb4896067ce6a934faabd8f0)
| -rw-r--r-- | misc/requirements/requirements-tests.txt | 5 | ||||
| -rw-r--r-- | misc/requirements/requirements-tests.txt-raw | 1 | ||||
| -rw-r--r-- | pytest.ini | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 64ab81f98..b46d7d7ee 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -24,8 +24,9 @@ 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.3.5 +pytest==5.4.1 pytest-bdd==3.2.1 pytest-benchmark==3.2.3 pytest-cov==2.8.1 @@ -33,7 +34,7 @@ pytest-instafail==0.4.1.post0 pytest-mock==2.0.0 pytest-qt==3.3.0 pytest-repeat==0.8.0 -pytest-rerunfailures==8.0 +pytest-rerunfailures==9.0 pytest-travis-fold==1.3.0 pytest-xvfb==1.2.0 PyVirtualDisplay==0.2.5 diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw index 33880416c..1b972ba18 100644 --- a/misc/requirements/requirements-tests.txt-raw +++ b/misc/requirements/requirements-tests.txt-raw @@ -16,6 +16,7 @@ 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 diff --git a/pytest.ini b/pytest.ini index 1b53cb559..be751d793 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,6 +1,6 @@ [pytest] log_level = NOTSET -addopts = --strict -rfEw --instafail --benchmark-columns=Min,Max,Median +addopts = --strict --instafail --benchmark-columns=Min,Max,Median testpaths = tests markers = gui: Tests using the GUI (e.g. spawning widgets) |