Merge branch 'main' into debt/remove-pkg-resources

pypa · Feb 12, 2022 · 664ec58 · 664ec58
2 parents 31850d4 + ce9ddd5
commit 664ec58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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