summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2021-05-01 22:07:58 -0400
committerNed Batchelder <ned@nedbatchelder.com>2021-05-02 07:38:20 -0400
commit8dd451ada6105841f1bd40dfca965da2d5779164 (patch)
tree59b66ce5ae67eef739677daaa55a26ff30584d75
parentb64fc3f54146b0dd32862eb2cd775350cde56940 (diff)
downloadpython-coveragepy-git-8dd451ada6105841f1bd40dfca965da2d5779164.tar.gz
test: update to latest pytest
-rw-r--r--requirements/pytest.pip11
-rw-r--r--setup.cfg3
-rw-r--r--tests/mixins.py2
3 files changed, 6 insertions, 10 deletions
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
index ad717f53..498c1825 100644
--- a/requirements/pytest.pip
+++ b/requirements/pytest.pip
@@ -5,15 +5,10 @@
# The pytest specifics used by coverage.py
-# 4.x is last to support py2
-pytest==4.6.11
-# 1.34 is last to support py2
-pytest-xdist==1.34.0
+pytest==6.2.3
+pytest-xdist==2.2.1
flaky==3.7.0
-# 4.x is py3-only
-mock==3.0.5
# Use a fork of PyContracts that supports Python 3.9
#PyContracts==1.8.12
git+https://github.com/slorg1/contracts@collections_and_validator
-# hypothesis 5.x is py3-only
-hypothesis==4.57.1
+hypothesis==6.10.1
diff --git a/setup.cfg b/setup.cfg
index 0b71f3a2..eb281d89 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[tool:pytest]
-addopts = -q -n3 --strict --force-flaky --no-flaky-report -rfeX --failed-first
+addopts = -q -n3 --strict-markers --force-flaky --no-flaky-report -rfeX --failed-first
python_classes = *Test
markers =
expensive: too slow to run during "make smoke"
@@ -8,6 +8,7 @@ markers =
filterwarnings =
ignore:dns.hash module will be removed:DeprecationWarning
ignore:Using or importing the ABCs:DeprecationWarning
+ ignore:the imp module is deprecated in favour of importlib:DeprecationWarning
# xfail tests that pass should fail the test suite
xfail_strict=true
diff --git a/tests/mixins.py b/tests/mixins.py
index dd9b4e3e..0638f336 100644
--- a/tests/mixins.py
+++ b/tests/mixins.py
@@ -61,7 +61,7 @@ class TempDirMixin:
def _temp_dir(self, tmpdir_factory):
"""Create a temp dir for the tests, if they want it."""
if self.run_in_temp_dir:
- tmpdir = tmpdir_factory.mktemp("")
+ tmpdir = tmpdir_factory.mktemp("t")
self.temp_dir = str(tmpdir)
with change_dir(self.temp_dir):
# Modules should be importable from this temp directory. We don't