summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-10-07 19:52:04 -0400
committerJason R. Coombs <jaraco@jaraco.com>2021-10-07 19:52:04 -0400
commit5823e9ca9d242b733a5ff3c8e2c22e13ec0a4c01 (patch)
tree464cd930b220b2be381d41cbde56a0377e747cc9
parentdc43378c8accd85321b42e3fe69fcb87e5266006 (diff)
downloadpytest-runner-5823e9ca9d242b733a5ff3c8e2c22e13ec0a4c01.tar.gz
Rely on pytest 6 and drop workaround for pytest-dev/pytest#6178.
-rw-r--r--pytest.ini2
-rw-r--r--setup.cfg2
2 files changed, 1 insertions, 3 deletions
diff --git a/pytest.ini b/pytest.ini
index 31b114f..9ecdba4 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,8 +2,6 @@
norecursedirs=dist build .tox .eggs
addopts=--doctest-modules
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
-# workaround for warning pytest-dev/pytest#6178
-junit_family=xunit2
filterwarnings=
# Suppress deprecation warning in flake8
ignore:SelectableGroups dict interface is deprecated::flake8
diff --git a/setup.cfg b/setup.cfg
index 69eb0ee..0f7d652 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ exclude =
[options.extras_require]
testing =
# upstream
- pytest >= 4.6
+ pytest >= 6
pytest-checkdocs >= 2.4
pytest-flake8
pytest-black >= 0.3.7; \