Merge pull request #377 from lsst/tickets/DM-41043

DM-41043: Adjust imports for daf_butler reorganization of core
lsst · Oct 9, 2023 · c71f3aa · c71f3aa
2 parents 76003a3 + ffc814c
commit c71f3aa
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/python/lsst/pipe/base/_quantumContext.py b/python/lsst/pipe/base/_quantumContext.py
@@ -169,7 +169,7 @@ class QuantumContext:
     ----------
     butler : `lsst.daf.butler.LimitedButler`
         Butler object from/to which datasets will be get/put.
-    quantum : `lsst.daf.butler.core.Quantum`
+    quantum : `lsst.daf.butler.Quantum`
         Quantum object that describes the datasets which will be get/put by a
         single execution of this node in the pipeline graph.
     resources : `ExecutionResources`, optional

diff --git a/python/lsst/pipe/base/connections.py b/python/lsst/pipe/base/connections.py
@@ -802,7 +802,7 @@ def adjustQuantum(
         Mapping[str, tuple[Output, Collection[DatasetRef]]],
     ]:
         """Override to make adjustments to `lsst.daf.butler.DatasetRef` objects
-        in the `lsst.daf.butler.core.Quantum` during the graph generation stage
+        in the `lsst.daf.butler.Quantum` during the graph generation stage
         of the activator.
 
         Parameters

diff --git a/python/lsst/pipe/base/executionButlerBuilder.py b/python/lsst/pipe/base/executionButlerBuilder.py
@@ -33,8 +33,8 @@
 from collections.abc import Callable, Iterable, Mapping
 
 from lsst.daf.butler import Butler, Config, DatasetRef, DatasetType, Registry
-from lsst.daf.butler.core.repoRelocation import BUTLER_ROOT_TAG
 from lsst.daf.butler.registry import ConflictingDefinitionError, MissingDatasetTypeError
+from lsst.daf.butler.repo_relocation import BUTLER_ROOT_TAG
 from lsst.daf.butler.transfers import RepoExportContext
 from lsst.resources import ResourcePath, ResourcePathExpression
 from lsst.utils.introspection import get_class_of

diff --git a/python/lsst/pipe/base/graph/_loadHelpers.py b/python/lsst/pipe/base/graph/_loadHelpers.py
@@ -37,7 +37,8 @@
 from typing import TYPE_CHECKING, BinaryIO
 from uuid import UUID
 
-from lsst.daf.butler import DimensionUniverse, PersistenceContextVars
+from lsst.daf.butler import DimensionUniverse
+from lsst.daf.butler.persistence_context import PersistenceContextVars
 from lsst.resources import ResourceHandleProtocol, ResourcePath
 
 if TYPE_CHECKING:

diff --git a/python/lsst/pipe/base/graph/graph.py b/python/lsst/pipe/base/graph/graph.py
@@ -48,9 +48,9 @@
     DatasetType,
     DimensionRecordsAccumulator,
     DimensionUniverse,
-    PersistenceContextVars,
     Quantum,
 )
+from lsst.daf.butler.persistence_context import PersistenceContextVars
 from lsst.resources import ResourcePath, ResourcePathExpression
 from lsst.utils.introspection import get_full_type_name
 from networkx.drawing.nx_agraph import write_dot

diff --git a/python/lsst/pipe/base/quantum_graph_builder.py b/python/lsst/pipe/base/quantum_graph_builder.py
@@ -51,9 +51,10 @@
     DatasetRef,
     DatasetType,
     DimensionUniverse,
+    NamedKeyDict,
+    NamedKeyMapping,
     Quantum,
 )
-from lsst.daf.butler.core.named import NamedKeyDict, NamedKeyMapping
 from lsst.daf.butler.registry import MissingCollectionError, MissingDatasetTypeError
 from lsst.utils.logging import LsstLogAdapter, getLogger
 from lsst.utils.timer import timeMethod

diff --git a/python/lsst/pipe/base/tests/simpleQGraph.py b/python/lsst/pipe/base/tests/simpleQGraph.py
@@ -40,7 +40,7 @@
 import lsst.pex.config as pexConfig
 import numpy
 from lsst.daf.butler import Butler, Config, DataId, DatasetRef, DatasetType, Formatter, LimitedButler
-from lsst.daf.butler.core.logging import ButlerLogRecords
+from lsst.daf.butler.logging import ButlerLogRecords
 from lsst.resources import ResourcePath
 from lsst.utils import doImportType
 from lsst.utils.introspection import get_full_type_name