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

DM-41043: Adjust imports referring to lsst.daf.butler.core
lsst · Oct 9, 2023 · cb87889 · cb87889
2 parents 8e0072f + c4937ba
commit cb87889
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/python/lsst/ctrl/mpexec/cmdLineFwk.py b/python/lsst/ctrl/mpexec/cmdLineFwk.py
@@ -51,14 +51,14 @@
     DatasetId,
     DatasetRef,
     DatasetType,
-    DatastoreCacheManager,
-    DatastoreRecordData,
     DimensionUniverse,
     LimitedButler,
     Quantum,
     QuantumBackedButler,
     Registry,
 )
+from lsst.daf.butler.datastore.cache_manager import DatastoreCacheManager
+from lsst.daf.butler.datastore.record_data import DatastoreRecordData
 from lsst.daf.butler.registry import MissingCollectionError, RegistryDefaults
 from lsst.daf.butler.registry.wildcards import CollectionWildcard
 from lsst.pipe.base import (

diff --git a/python/lsst/ctrl/mpexec/log_capture.py b/python/lsst/ctrl/mpexec/log_capture.py
@@ -38,7 +38,7 @@
 from logging import FileHandler
 
 from lsst.daf.butler import Butler, FileDataset, LimitedButler, Quantum
-from lsst.daf.butler.core.logging import ButlerLogRecordHandler, ButlerLogRecords, ButlerMDC, JsonLogFormatter
+from lsst.daf.butler.logging import ButlerLogRecordHandler, ButlerLogRecords, ButlerMDC, JsonLogFormatter
 from lsst.pipe.base import InvalidQuantumError, TaskDef
 
 _LOG = logging.getLogger(__name__)

diff --git a/python/lsst/ctrl/mpexec/showInfo.py b/python/lsst/ctrl/mpexec/showInfo.py
@@ -39,7 +39,8 @@
 
 import lsst.pex.config as pexConfig
 import lsst.pex.config.history as pexConfigHistory
-from lsst.daf.butler import Butler, DatasetRef, DatasetType, DatastoreRecordData, NamedKeyMapping
+from lsst.daf.butler import Butler, DatasetRef, DatasetType, NamedKeyMapping
+from lsst.daf.butler.datastore.record_data import DatastoreRecordData
 from lsst.pipe.base import Pipeline, QuantumGraph
 from lsst.pipe.base.pipeline_graph import visualization
 

diff --git a/tests/test_cmdLineFwk.py b/tests/test_cmdLineFwk.py
@@ -61,12 +61,12 @@
     Config,
     DataCoordinate,
     DatasetRef,
+    DatasetType,
     DimensionConfig,
     DimensionUniverse,
     Quantum,
     Registry,
 )
-from lsst.daf.butler.core.datasets.type import DatasetType
 from lsst.daf.butler.registry import RegistryConfig
 from lsst.pipe.base import (
     Instrument,