Merge branch 'main' into feature/skeleton

pypa · Nov 5, 2023 · 6ec501a · 6ec501a
2 parents 4673d63 + d3e5de0
commit 6ec501a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -89,6 +89,8 @@ jobs:
         run: tox
 
   test_cygwin:
+    # disabled due to lack of Rust support pypa/setuptools#3921
+    if: ${{ false }}
     strategy:
       matrix:
         python:

diff --git a/setup.cfg b/setup.cfg
@@ -42,6 +42,7 @@ testing =
 	pytest-ruff
 
 	# local
+	pytest >= 7.4.3  #186
 	jaraco.envs>=2.4
 	jaraco.path
 	jaraco.text

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,6 @@
 [testenv]
 description = perform primary checks (tests, style, types, coverage)
 deps =
-	# pypa/distutils#186; workaround for pytest-dev/pytest#10447
-	pytest @ git+https://github.com/RonnyPfannschmidt/pytest@fix-10447-maker-mro-order-needs-reverse
 setenv =
 	PYTHONWARNDEFAULTENCODING = 1
 	# pypa/distutils#99