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

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

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
       - id: trailing-whitespace
       - id: check-toml
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 23.11.0
     hooks:
       - id: black
         # It is recommended to specify the latest version of Python
@@ -22,6 +22,6 @@ repos:
         name: isort (python)
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.1.2
+    rev: v0.1.6
     hooks:
       - id: ruff

pyproject.toml

@@ -39,7 +39,7 @@
 
 [tool.black]
 line-length = 110
-target-version = ["py310"]
+target-version = ["py311"]
 
 [tool.isort]
 profile = "black"
@@ -77,7 +77,7 @@ select = [
     "W",  # pycodestyle
     "D",  # pydocstyle
 ]
-target-version = "py310"
+target-version = "py311"
 extend-select = [
     "RUF100", # Warn about unused noqa
 ]

tests/test_butlerFits.py

@@ -150,7 +150,7 @@ def tearDownClass(cls):
             shutil.rmtree(cls.root, ignore_errors=True)
 
     def setUp(self):
-        self.butler = makeTestCollection(self.creatorButler)
+        self.butler = makeTestCollection(self.creatorButler, uniqueId=self.id())
 
     def makeExampleCatalog(self) -> lsst.afw.table.SourceCatalog:
         catalogPath = os.path.join(TESTDIR, "data", "source_catalog.fits")

tests/test_defineVisits.py

@@ -45,7 +45,7 @@ def setUp(self):
         """
         self.root = tempfile.mkdtemp(dir=TESTDIR)
         self.creatorButler = butlerTests.makeTestRepo(self.root, [])
-        self.butler = butlerTests.makeTestCollection(self.creatorButler)
+        self.butler = butlerTests.makeTestCollection(self.creatorButler, uniqueId=self.id())
 
         self.config = DefineVisitsTask.ConfigClass()
         self.task = DefineVisitsTask(config=self.config, butler=self.butler)

tests/test_ingest.py

@@ -111,7 +111,7 @@ def tearDownClass(cls):
             shutil.rmtree(cls.root, ignore_errors=True)
 
     def setUp(self):
-        self.butler = butlerTests.makeTestCollection(self.creatorButler)
+        self.butler = butlerTests.makeTestCollection(self.creatorButler, uniqueId=self.id())
         self.outputRun = self.butler.run
 
         config = RawIngestTask.ConfigClass()
@@ -433,7 +433,7 @@ def tearDownClass(cls):
             shutil.rmtree(cls.root, ignore_errors=True)
 
     def setUp(self):
-        self.butler = butlerTests.makeTestCollection(self.creatorButler)
+        self.butler = butlerTests.makeTestCollection(self.creatorButler, uniqueId=self.id())
 
         self.config = RawIngestTask.ConfigClass()
         self.config.transfer = "copy"  # safe non-default value