summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2022-02-12 04:55:30 -0500
committerJason R. Coombs <jaraco@jaraco.com>2022-02-12 04:55:30 -0500
commitce9ddd528a9e2507d3ae794f4d26f6a46d06d025 (patch)
treeb988a5d4eeb51b0cff41784527fd317f81c6d238
parentf38d13906be5f3cfe3dadc0333c5ef01badaf777 (diff)
parentf22eb5b60adbe158e458614ea0380a9071c39347 (diff)
downloadpython-setuptools-git-ce9ddd528a9e2507d3ae794f4d26f6a46d06d025.tar.gz
Merge https://github.com/jaraco/skeleton
-rw-r--r--pytest.ini2
-rw-r--r--setup.cfg4
2 files changed, 4 insertions, 2 deletions
diff --git a/pytest.ini b/pytest.ini
index b53fdefa..4a5ad50d 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -16,10 +16,12 @@ filterwarnings=
# shopkeep/pytest-black#55
ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
ignore:The \(fspath. py.path.local\) argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning
+ ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning
# tholo/pytest-flake8#83
ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
ignore:The \(fspath. py.path.local\) argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning
+ ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning
# dbader/pytest-mypy#131
ignore:The \(fspath. py.path.local\) argument to MypyFile is deprecated.:pytest.PytestDeprecationWarning
diff --git a/setup.cfg b/setup.cfg
index 24eda5a3..32d97498 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,7 +47,7 @@ testing =
# workaround for jaraco/skeleton#22
python_implementation != "PyPy"
pytest-cov
- pytest-mypy; \
+ pytest-mypy >= 0.9.1; \
# workaround for jaraco/skeleton#22
python_implementation != "PyPy"
pytest-enabler >= 1.0.1
@@ -83,7 +83,7 @@ testing-integration =
docs =
# upstream
sphinx
- jaraco.packaging >= 8.2
+ jaraco.packaging >= 9
rst.linker >= 1.9
jaraco.tidelift >= 1.4