Merge branch '2.0'

Author: bitprophet

docs/changelog.rst

@@ -2,6 +2,9 @@
 Changelog
 =========
 
+- :release:`2.0.2 <2024-03-29>`
+- :bug:`32` Fix dangling compatibility issues with pytest version 8.x. Thanks
+  to Alex Gaynor for the patch!
 - :release:`2.0.1 <2023-05-22>`
 - :bug:`9` Don't try loading Pytest fixture functions as if they were test
   functions. Classifying this as a bug even though it's a moderately sized

pytest_relaxed/_version.py

@@ -1,2 +1,2 @@
-__version_info__ = (2, 0, 1)
+__version_info__ = (2, 0, 2)
 __version__ = ".".join(map(str, __version_info__))

pytest_relaxed/plugin.py

@@ -9,9 +9,9 @@
 from .fixtures import environ  # noqa
 
 
-def pytest_ignore_collect(path, config):
+def pytest_ignore_collect(collection_path, config):
     # Ignore files and/or directories marked as private via Python convention.
-    return path.basename.startswith("_")
+    return collection_path.name.startswith("_")
 
 
 # We need to use collect_file, not pycollect_makemodule, as otherwise users

tests/test_collection.py

@@ -208,7 +208,7 @@ def test_setup_given_inner_class_instances_when_inherited(self, testdir):
         testdir.makepyfile(
             foo="""
             class Outer:
-                def setup(self):
+                def setup_method(self):
                     self.some_attr = 17
 
                 class inner: