Enable more ruff rules

This aligns us with testtools.

Signed-off-by: Stephen Finucane <stephen@that.guru>

Author: stephenfin

doc/example.py

@@ -28,7 +28,7 @@ def make(self, dependency_resources):
         return "You need to implement your own getResource."
 
 
-class MyResource(object):
+class MyResource:
     """My pet resource."""
 
 

pyproject.toml

@@ -73,4 +73,11 @@ packages = ["testresources"]
 exclude = ["testresources/_version.py"]
 
 [tool.ruff.lint]
-select = ["E4", "E5", "E7", "E9", "F"]
+select = ["E", "F", "I", "PIE", "UP", "RSE", "RUF"]
+ignore = [
+    # we make use of resources as a class var to initialize things
+    "RUF012"
+]
+
+[tool.ruff.lint.per-file-ignores]
+"testresources/tests/*" = ["S"]

testresources/__init__.py

@@ -20,7 +20,6 @@
 import heapq
 import inspect
 import unittest
-
 from collections.abc import MutableSet
 
 # same format as sys.version_info: "A tuple containing the five components of
@@ -138,7 +137,7 @@ def _kruskals_graph_MST(graph):
     edges = set()
     for from_node, to_nodes in graph.items():
         for to_node, value in to_nodes.items():
-            edge = (value,) + tuple(sorted([from_node, to_node]))
+            edge = (value, *tuple(sorted([from_node, to_node])))
             edges.add(edge)
     edges = list(edges)
     heapq.heapify(edges)
@@ -529,7 +528,7 @@ class TestLoader(unittest.TestLoader):
     suiteClass = OptimisingTestSuite
 
 
-class TestResourceManager(object):
+class TestResourceManager:
     """A manager for resources that can be shared across tests.
 
     ResourceManagers can report activity to a TestResult. The methods
@@ -797,7 +796,7 @@ def __init__(
             be embedded in the string returned by the id() method, to identify
             the generic resource. Defaults to '__name__'.
         """
-        super(GenericResource, self).__init__()
+        super().__init__()
         self.resource_factory = resource_factory
         self.setup_method_name = setup_method_name
         self.teardown_method_name = teardown_method_name
@@ -819,9 +818,8 @@ def id(self):
 
         :see: The `id_attribute_name` parameter.
         """
-        return "%s[%s]" % (
-            super(GenericResource, self).id(),
-            getattr(self.resource_factory, self.id_attribute_name),
+        return (
+            f"{super().id()}[{getattr(self.resource_factory, self.id_attribute_name)}]"
         )
 
 
@@ -851,7 +849,7 @@ def __init__(self, fixture):
 
         :param fixture: The fixture to wrap.
         """
-        super(FixtureResource, self).__init__()
+        super().__init__()
         self.fixture = fixture
 
     def clean(self, resource):
@@ -866,7 +864,7 @@ def id(self):
 
         The default is to call str(fixture) to get such information.
         """
-        return "%s[%s]" % (super(FixtureResource, self).id(), str(self.fixture))
+        return f"{super().id()}[{self.fixture!s}]"
 
     def _reset(self, resource, dependency_resources):
         self.fixture.reset()
@@ -896,15 +894,15 @@ class is neded, or you can use multiple inheritance and call into
     resources = []
 
     def setUp(self):
-        super(ResourcedTestCase, self).setUp()
+        super().setUp()
         self.setUpResources()
 
     def setUpResources(self):
         setUpResources(self, self.resources, _get_result())
 
     def tearDown(self):
         self.tearDownResources()
-        super(ResourcedTestCase, self).tearDown()
+        super().tearDown()
 
     def tearDownResources(self):
         tearDownResources(self, self.resources, _get_result())
@@ -946,7 +944,7 @@ def neededResources(resources):
         dependencies = neededResources(
             [dependency for name, dependency in resource.resources]
         )
-        for resource in dependencies + [resource]:
+        for resource in [*dependencies, resource]:
             if resource in seen:
                 continue
             seen.add(resource)

testresources/tests/TestUtil.py

@@ -57,8 +57,8 @@ def visitTests(suite, visitor):
                 visitTests(test, visitor)
             else:
                 print(
-                    "unvisitable non-unittest.TestCase element %r (%r)"
-                    % (test, test.__class__)
+                    f"unvisitable non-unittest.TestCase element {test!r} "
+                    f"({test.__class__!r})"
                 )
 
 
@@ -80,7 +80,7 @@ class TestLoader(unittest.TestLoader):
     suiteClass = TestSuite
 
 
-class TestVisitor(object):
+class TestVisitor:
     """A visitor for Tests"""
 
     def visitSuite(self, aTestSuite):

testresources/tests/__init__.py

@@ -22,10 +22,10 @@
 
 def test_suite():
     import testresources.tests.test_optimising_test_suite
+    import testresources.tests.test_resource_graph
     import testresources.tests.test_resourced_test_case
     import testresources.tests.test_test_loader
     import testresources.tests.test_test_resource
-    import testresources.tests.test_resource_graph
 
     result = TestUtil.TestSuite()
     result.addTest(testresources.tests.test_test_loader.test_suite())
@@ -36,7 +36,7 @@ def test_suite():
     return result
 
 
-class ResultWithoutResourceExtensions(object):
+class ResultWithoutResourceExtensions:
     """A test fake which does not have resource extensions."""
 
 

testresources/tests/test_optimising_test_suite.py

@@ -15,12 +15,14 @@
 #  license.
 #
 
-import testtools
 import random
+import unittest
+
+import testtools
+
 import testresources
 from testresources import split_by_resources
 from testresources.tests import ResultWithResourceExtensions
-import unittest
 
 
 def test_suite():
@@ -56,7 +58,7 @@ def clean(self, resource):
 
     def make(self, dependency_resources):
         self.makes += 1
-        resource = "boo %d" % self.makes
+        resource = f"boo {self.makes}"
         self.calls.append(("make", resource))
         return resource
 
@@ -84,7 +86,7 @@ def runTest(self):
         return test_case
 
     def setUp(self):
-        super(TestOptimisingTestSuite, self).setUp()
+        super().setUp()
         self.optimising_suite = testresources.OptimisingTestSuite()
 
     def testAddTest(self):
@@ -293,7 +295,7 @@ class Resource(testresources.TestResource):
             """Dummy resource."""
 
             def __init__(self, name):
-                super(Resource, self).__init__()
+                super().__init__()
                 self.name = name
 
             def make(self, dependency_resources):
@@ -399,7 +401,7 @@ class TestCostOfSwitching(testtools.TestCase):
     """Tests for cost_of_switching."""
 
     def setUp(self):
-        super(TestCostOfSwitching, self).setUp()
+        super().setUp()
         self.suite = testresources.OptimisingTestSuite()
 
     def makeResource(self, setUpCost=1, tearDownCost=1):
@@ -486,7 +488,7 @@ def testTwoCasesInGraph(self):
 
 class TestGraphStuff(testtools.TestCase):
     def setUp(self):
-        super(TestGraphStuff, self).setUp()
+        super().setUp()
 
         class MockTest(unittest.TestCase):
             def __repr__(self):
@@ -583,7 +585,7 @@ def testBasicSortTests(self):
                     [self.case1, self.case2, self.case3, self.case4],
                     [self.case3, self.case2, self.case1, self.case4],
                 ],
-                "failed with permutation %s" % (permutation,),
+                f"failed with permutation {permutation}",
             )
 
     def testGlobalMinimum(self):
@@ -667,7 +669,7 @@ def testSortingTwelveIndependentIsFast(self):
         # Add more sample tests
         cases = [self.case1, self.case2, self.case3, self.case4]
         for pos in range(5, 13):
-            cases.append(testtools.clone_test_with_new_id(cases[0], "case%d" % pos))
+            cases.append(testtools.clone_test_with_new_id(cases[0], f"case{pos}"))
         # We care that this is fast in this test, so we don't need to have
         # overlapping resource usage
         for case, manager in zip(cases, managers):
@@ -684,7 +686,7 @@ def testSortingTwelveOverlappingIsFast(self):
         # Add more sample tests
         cases = [self.case1, self.case2, self.case3, self.case4]
         for pos in range(5, 13):
-            cases.append(testtools.clone_test_with_new_id(cases[0], "case%d" % pos))
+            cases.append(testtools.clone_test_with_new_id(cases[0], f"case{pos}"))
         tempdir = testresources.TestResourceManager()
         # give all tests a tempdir, enough to provoke a single partition in
         # the current code.

testresources/tests/test_resource_graph.py

@@ -19,6 +19,7 @@
 """Test _resource_graph(resource_sets)."""
 
 import testtools
+
 import testresources
 from testresources import _resource_graph
 

testresources/tests/test_resourced_test_case.py

@@ -16,7 +16,9 @@
 #
 
 import unittest
+
 import testtools
+
 import testresources
 from testresources.tests import ResultWithResourceExtensions
 
@@ -38,13 +40,13 @@ def make(self, dependency_resources):
         return self._resource
 
 
-class MockResourceInstance(object):
+class MockResourceInstance:
     """A resource instance."""
 
 
 class TestResourcedTestCase(testtools.TestCase):
     def setUp(self):
-        super(TestResourcedTestCase, self).setUp()
+        super().setUp()
 
         class Example(testresources.ResourcedTestCase):
             def test_example(self):
@@ -60,7 +62,7 @@ class OtherBaseCase(unittest.TestCase):
 
             def setUp(self):
                 self.setUpCalled = True
-                super(OtherBaseCase, self).setUp()
+                super().setUp()
 
         class OurCase(testresources.ResourcedTestCase, OtherBaseCase):
             def runTest(self):
@@ -76,7 +78,7 @@ class OtherBaseCase(unittest.TestCase):
 
             def tearDown(self):
                 self.tearDownCalled = True
-                super(OtherBaseCase, self).setUp()
+                super().setUp()
 
         class OurCase(testresources.ResourcedTestCase, OtherBaseCase):
             def runTest(self):

testresources/tests/test_test_loader.py

@@ -16,7 +16,8 @@
 #
 
 import testtools
-from testresources import TestLoader, OptimisingTestSuite
+
+from testresources import OptimisingTestSuite, TestLoader
 from testresources.tests import TestUtil
 
 

testresources/tests/test_test_resource.py

@@ -20,8 +20,8 @@
 
 import testresources
 from testresources.tests import (
-    ResultWithResourceExtensions,
     ResultWithoutResourceExtensions,
+    ResultWithResourceExtensions,
 )
 
 
@@ -48,7 +48,7 @@ def reset(self):
         self.calls.append("reset" + self.suffix)
 
 
-class MockResourceInstance(object):
+class MockResourceInstance:
     def __init__(self, name):
         self._name = name
 
@@ -63,7 +63,7 @@ class MockResource(testresources.TestResourceManager):
     """Mock resource that logs the number of make and clean calls."""
 
     def __init__(self):
-        super(MockResource, self).__init__()
+        super().__init__()
         self.makes = 0
         self.cleans = 0
 
@@ -79,7 +79,7 @@ class MockResettableResource(MockResource):
     """Mock resource that logs the number of reset calls too."""
 
     def __init__(self):
-        super(MockResettableResource, self).__init__()
+        super().__init__()
         self.resets = 0
 
     def _reset(self, resource, dependency_resources):