fix compatibility with pytest ^8

pytest-dev · Feb 6, 2024 · b917ef3 · b917ef3
1 parent e92efad
commit b917ef3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/dependencies/default/constraints.txt b/dependencies/default/constraints.txt
@@ -5,7 +5,7 @@ hypothesis==6.96.2
 iniconfig==2.0.0
 packaging==23.2
 pluggy==1.3.0
-pytest==7.4.4
+pytest==8.0.0
 sortedcontainers==2.4.0
 tomli==2.0.1
 typing_extensions==4.9.0
diff --git a/dependencies/default/requirements.txt b/dependencies/default/requirements.txt
@@ -1,3 +1,3 @@
 # Always adjust install_requires in setup.cfg and pytest-min-requirements.txt
 # when changing runtime dependencies
-pytest >= 7.0.0,<8
+pytest >= 7.0.0, !=8.0.0rc1, !=8.0.0rc2
diff --git a/dependencies/pytest-min/constraints.txt b/dependencies/pytest-min/constraints.txt
@@ -14,7 +14,7 @@ packaging==23.2
 pluggy==1.3.0
 py==1.11.0
 Pygments==2.16.1
-pytest==7.0.0
+pytest==8.0.0
 requests==2.31.0
 sortedcontainers==2.4.0
 tomli==2.0.1

diff --git a/dependencies/pytest-min/requirements.txt b/dependencies/pytest-min/requirements.txt
@@ -1,3 +1,3 @@
 # Always adjust install_requires in setup.cfg and requirements.txt
 # when changing minimum version dependencies
-pytest[testing] == 7.0.0
+pytest[testing] == 8.0.0
diff --git a/setup.cfg b/setup.cfg
@@ -40,7 +40,7 @@ include_package_data = True
 
 # Always adjust requirements.txt and pytest-min-requirements.txt when changing runtime dependencies
 install_requires =
-  pytest >= 7.0.0,<8
+  pytest >= 7.0.0, !=8.0.0rc1, !=8.0.0rc2
 
 [options.extras_require]
 testing =

diff --git a/tests/markers/test_session_scope.py b/tests/markers/test_session_scope.py
@@ -44,7 +44,7 @@ async def test_this_runs_in_same_loop(self):
             """
         ),
     )
-    subpackage_name = "subpkg"
+    subpackage_name = "z_subpkg"  # must be alphabetically ordered after test_module_one.py
     subpkg = pytester.mkpydir(subpackage_name)
     subpkg.joinpath("test_subpkg.py").write_text(
         dedent(

diff --git a/tests/test_is_async_test.py b/tests/test_is_async_test.py
@@ -77,8 +77,10 @@ def pytest_collection_modifyitems(items):
     if pytest.version_tuple < (7, 2):
         # Probably related to https://github.com/pytest-dev/pytest/pull/10012
         result.assert_outcomes(failed=1)
-    else:
+    elif pytest.version_tuple < (8,):
         result.assert_outcomes(skipped=1)
+    else:
+        result.assert_outcomes(failed=1)
 
 
 def test_returns_true_for_unmarked_coroutine_item_in_auto_mode(pytester: Pytester):