Update code.

setup.py

@@ -8,7 +8,7 @@
     name='zope.pytestlayer',
     version='8.3.dev0',
 
-    python_requires='>=3.7',
+    python_requires='>=3.9',
     install_requires=[
         'pytest >= 6, < 8',
         'setuptools',
@@ -49,12 +49,11 @@
         "Natural Language :: English",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",

src/zope/pytestlayer/fixture.py

@@ -7,7 +7,7 @@
 import zope.dottedname.resolve
 
 
-class ZopeLayerState(object):
+class ZopeLayerState:
 
     def __init__(self):
         self.current = set()
@@ -104,7 +104,7 @@ def get_layer_name(layer):
         # As per zope.testrunner conventions, a layer is assumed to have a
         # __name__ even if it's not a class.
         name = layer.__name__
-    return '%s.%s' % (layer.__module__, name)
+    return f'{layer.__module__}.{name}'
 
 
 def make_identifier(string):
@@ -115,7 +115,7 @@ def make_identifier(string):
 def get_fixture_name(layer, scope):
     name = make_identifier(get_layer_name(layer))
     layerid = id(layer)
-    return 'zope_layer_{scope}_{name}_{layerid}'.format(**locals())
+    return f'zope_layer_{scope}_{name}_{layerid}'
 
 
 LAYERS = {}

src/zope/pytestlayer/layered.py

@@ -43,7 +43,7 @@ class LayeredTestCaseFunction(_pytest.unittest.TestCaseFunction):
     def from_parent(cls, parent, name, **kw):
         description = get_description(parent)
         keywords = get_keywords(description)
-        function = super(LayeredTestCaseFunction, cls).from_parent(
+        function = super().from_parent(
             parent=parent,
             name=name,
             keywords=keywords,
@@ -66,7 +66,7 @@ def setup(self):
 
     def teardown(self):
         _testcase = self._testcase
-        super(LayeredTestCaseFunction, self).teardown()
+        super().teardown()
         # Do not die with a meaningless error message when rerunning doctests:
         self._testcase = _testcase
 
@@ -96,5 +96,4 @@ def walk_suite(suite):
                 fixture.raise_if_bad_layer(suite.layer)
                 yield item, suite.layer
             else:
-                for result in walk_suite(item):
-                    yield result
+                yield from walk_suite(item)

src/zope/pytestlayer/tests/fixture/bad_layer/test_core.py

@@ -1,7 +1,7 @@
 import unittest
 
 
-class FooLayer(object):
+class FooLayer:
     __name__ = 'FooLayer'
 
 

src/zope/pytestlayer/tests/fixture/custom_fixture_name/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/keep_layer_across_test_classes/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):
@@ -24,7 +24,7 @@ def testTearDown(cls):
         del cls.test_foo
 
 
-class BarLayer(object):
+class BarLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/layers_with_same_name/test_core.py

@@ -1,7 +1,7 @@
 import unittest
 
 
-class Layer(object):
+class Layer:
 
     def __init__(self, value, bases=()):
         self.__name__ = 'TestLayer'

src/zope/pytestlayer/tests/fixture/no_setup_or_teardown/test_core.py

@@ -1,7 +1,7 @@
 import unittest
 
 
-class FooLayer(object):
+class FooLayer:
     pass
 
 

src/zope/pytestlayer/tests/fixture/order_by_layer/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):
@@ -24,7 +24,7 @@ def testTearDown(cls):
         del cls.test_foo
 
 
-class BarLayer(object):
+class BarLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/order_with_layered_suite/test_core.py

@@ -6,7 +6,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):
@@ -27,7 +27,7 @@ def testTearDown(cls):
         del cls.test_foo
 
 
-class BarLayer(object):
+class BarLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/session_fixture/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/shared_with_layered_suite/test_core.py

@@ -6,7 +6,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/single_layer/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/single_layer_in_two_modules/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/single_layer_with_unattached_base_layer/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class BarLayer(object):
+class BarLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/single_layered_suite/test_core.py

@@ -6,7 +6,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/two_dependent_layered_suites/test_core.py

@@ -6,7 +6,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/two_dependent_layers/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/two_independent_layers/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):
@@ -24,7 +24,7 @@ def testTearDown(cls):
         del cls.test_foo
 
 
-class BarLayer(object):
+class BarLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/fixture/with_and_without_layer/test_core.py

@@ -3,7 +3,7 @@
 from zope.pytestlayer.testing import log_to_terminal
 
 
-class FooLayer(object):
+class FooLayer:
 
     @classmethod
     def setUp(cls):

src/zope/pytestlayer/tests/test_fixture.py

@@ -1,7 +1,7 @@
 from .. import fixture
 
 
-class Layer(object):
+class Layer:
     pass
 
 

src/zope/pytestlayer/tests/test_layer.py

@@ -1,7 +1,7 @@
 from zope.pytestlayer import fixture
 
 
-class LayerClass(object):
+class LayerClass:
     pass