Fix tests on pytest 9 (#4835)

Fixes #4826

Author: hauntsaninja

.github/workflows/pypi_upload.yml

@@ -96,8 +96,6 @@ jobs:
       - uses: pypa/cibuildwheel@v3.2.1
         with:
           only: ${{ matrix.only }}
-        env:
-          CIBW_TEST_REQUIRES_WINDOWS: "pytest^<9.0"
 
       - name: Upload wheels as workflow artifacts
         uses: actions/upload-artifact@v5

pyproject.toml

@@ -168,7 +168,7 @@ skip = [
 # This is the bare minimum needed to run the test suite. Pulling in the full
 # test_requirements.txt would download a bunch of other packages not necessary
 # here and would slow down the testing step a fair bit.
-test-requires = ["pytest>=6.1.1,<9.0"]
+test-requires = ["pytest>=7"]
 test-command = 'pytest {project} -k "not incompatible_with_mypyc"'
 test-extras = ["d"," jupyter"]
 # Skip trying to test arm64 builds on Intel Macs. (so cross-compilation doesn't

test_requirements.txt

@@ -1,6 +1,6 @@
 coverage >= 5.3
 pre-commit
-pytest >= 6.1.1, <9.0
+pytest >= 7
 pytest-xdist >= 3.0.2
 pytest-cov >= 4.1.0
 tox

tests/optional.py

@@ -21,20 +21,7 @@
 from typing import TYPE_CHECKING
 
 import pytest
-
-try:
-    from pytest import StashKey
-except ImportError:
-    # pytest < 7
-    #
-    # "isort: skip" is needed or it moves the "type: ignore" to the following line
-    # because of the line length, and then mypy complains.
-    # Of course, adding the "isort: skip" means that
-    # flake8-bugbear then also complains about the line length,
-    # so we *also* need a "noqa" comment for good measure :)
-    from _pytest.store import (  # type: ignore[import-not-found, no-redef]  # isort: skip  # noqa: B950
-        StoreKey as StashKey,
-    )
+from pytest import StashKey
 
 log = logging.getLogger(__name__)
 
@@ -73,7 +60,8 @@ def pytest_configure(config: "Config") -> None:
     if isinstance(ot_ini, str):
         ot_ini = ot_ini.strip().split("\n")
     marker_re = re.compile(r"^\s*(?P<no>no_)?(?P<marker>\w+)(:\s*(?P<description>.*))?")
-    for ot in ot_ini:
+    # getattr shim here is so that we support both pytest>=9 and pytest<9
+    for ot in getattr(ot_ini, "value", ot_ini):
         m = marker_re.match(ot)
         if not m:
             raise ValueError(f"{ot!r} doesn't match pytest marker syntax")

tests/test_black.py

@@ -922,7 +922,7 @@ def test_get_features_used_for_future_flags(self) -> None:
             ("a = 1 + 2\nfrom something import annotations", set()),
             ("from __future__ import x, y", set()),
         ]:
-            with self.subTest(src=src, features=features):
+            with self.subTest(src=src, features=sorted(f.value for f in features)):
                 node = black.lib2to3_parse(src)
                 future_imports = black.get_future_imports(node)
                 self.assertEqual(