DM-53370: Free butler resources when no longer needed

.github/workflows/build.yaml

@@ -53,7 +53,7 @@ jobs:
 
       - name: Run tests
         run: |
-          pytest -r a -v -n 3 --cov=lsst.ctrl.bps --cov=tests --cov-report=xml --cov-report=term --cov-branch \
+          pytest -Wd -r a -v -n 3 --cov=lsst.ctrl.bps --cov=tests --cov-report=xml --cov-report=term --cov-branch \
             --junitxml=junit.xml -o junit_family=legacy
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v5

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-yaml
         args:
@@ -10,12 +10,12 @@ repos:
       - id: check-toml
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.9.6
+    rev: v0.13.0
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
       - id: ruff-format
   - repo: https://github.com/numpy/numpydoc
-    rev: "v1.8.0"
+    rev: "v1.9.0"
     hooks:
       - id: numpydoc-validation

pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
     "astropy >=4.0",
     "pyyaml >=5.1",
     "click >= 7.0",
-    "networkx",
+    "networkx <3.6",
     "lsst-daf-butler",
     "lsst-pipe-base",
     "lsst-ctrl-mpexec",

requirements.txt

@@ -1,6 +1,6 @@
 click
 astropy
-networkx
+networkx <3.6
 pyyaml
 lsst-daf-butler @ git+https://github.com/lsst/daf_butler@main
 lsst-utils @ git+https://github.com/lsst/utils@main

tests/cqg_test_utils.py

@@ -180,8 +180,8 @@ def make_test_clustered_quantum_graph(outdir):
     cqg : `lsst.ctrl.bps.ClusteredQuantumGraph`
         Clustered quantum graph.
     """
-    helper = make_test_helper()
-    qgc = helper.make_quantum_graph_builder(output_run="run").finish(attach_datastore_records=False)
+    with make_test_helper() as helper:
+        qgc = helper.make_quantum_graph_builder(output_run="run").finish(attach_datastore_records=False)
     qg_filename = f"{outdir}/test_file.qg"
     qgc.write(qg_filename)
     qgraph = qgc.assemble()

tests/qg_test_utils.py

@@ -334,15 +334,15 @@ def make_test_quantum_graph(run: str = "run", uneven=False):
             |          |           |
            T4(1,2)    T4(1,4)     T4(3,4)
     """
-    helper = make_test_helper()
-    qgc = helper.make_quantum_graph_builder(output_run=run).finish(attach_datastore_records=False)
-    if uneven:
-        keys_to_drop = {("T1", 1, 2), ("T1", 1, 4), ("T2", 1, 2)}
-        qgc.quantum_datasets = {
-            qd.quantum_id: qd
-            for qd in qgc.quantum_datasets.values()
-            if (qd.task_label, *qd.data_coordinate) not in keys_to_drop
-        }
-        qgc.set_thin_graph()
-        qgc.set_header_counts()
-    return qgc.assemble()
+    with make_test_helper() as helper:
+        qgc = helper.make_quantum_graph_builder(output_run=run).finish(attach_datastore_records=False)
+        if uneven:
+            keys_to_drop = {("T1", 1, 2), ("T1", 1, 4), ("T2", 1, 2)}
+            qgc.quantum_datasets = {
+                qd.quantum_id: qd
+                for qd in qgc.quantum_datasets.values()
+                if (qd.task_label, *qd.data_coordinate) not in keys_to_drop
+            }
+            qgc.set_thin_graph()
+            qgc.set_header_counts()
+        return qgc.assemble()

tests/test_pre_transform.py

@@ -194,7 +194,8 @@ def testValidate(self, mock_validate):
             "validateClusteredQgraph": True,
         }
         config = BpsConfig(settings, search_order=[])
-        qgraph = InMemoryRepo().make_quantum_graph()
+        with InMemoryRepo() as repo:
+            qgraph = repo.make_quantum_graph()
         with self.assertRaisesRegex(RuntimeError, "Fake error"):
             _ = cluster_quanta(config, qgraph, "a_name")
 
@@ -208,7 +209,8 @@ def testNoValidate(self, mock_validate):
             "validateClusteredQgraph": False,
         }
         config = BpsConfig(settings, search_order=[])
-        qgraph = InMemoryRepo().make_quantum_graph()
+        with InMemoryRepo() as repo:
+            qgraph = repo.make_quantum_graph()
         _ = cluster_quanta(config, qgraph, "a_name")