Merge pull request #387 from lsst/tickets/DM-41846

DM-41846: Use the test ID as the unique component of the test run collection

.github/workflows/build.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.11"]
 
     steps:
       - uses: actions/checkout@v3

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lsst-pipe-base"
-requires-python = ">=3.10.0"
+requires-python = ">=3.11.0"
 description = "Pipeline infrastructure for the Rubin Science Pipelines."
 license = {text = "BSD 3-Clause License"}
 readme = "README.md"
@@ -16,7 +16,6 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Topic :: Scientific/Engineering :: Astronomy",
 ]

tests/test_dataset_handle.py

@@ -86,9 +86,12 @@ class TestDatasetHandle(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        config = StorageClassConfig.fromYaml(storageClasses)
+        cls.storage_class_config = StorageClassConfig.fromYaml(storageClasses)
         cls.factory = StorageClassFactory()
-        cls.factory.addFromConfig(config)
+
+    def setUp(self):
+        self.factory.reset()
+        self.factory.addFromConfig(self.storage_class_config)
 
     def test_dataset_handle_basic(self):
         inMemoryDataset = 42

tests/test_testUtils.py

@@ -247,7 +247,7 @@ def tearDownClass(cls):
 
     def setUp(self):
         super().setUp()
-        self.butler = butlerTests.makeTestCollection(self.repo)
+        self.butler = butlerTests.makeTestCollection(self.repo, uniqueId=self.id())
 
     def _makeVisitTestData(self, dataId):
         """Create dummy datasets suitable for VisitTask.