Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-41043: Adjust imports for daf_butler reorganization of core #377

Merged
merged 4 commits into from
Oct 9, 2023
Merged

DM-41043: Adjust imports for daf_butler reorganization of core #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c857a7
Fix doc string referring to Quantum class
timj Oct 5, 2023
ce73d2c
Do not use butler.core for imports that didn't need it
timj Oct 5, 2023
3eca894
Adjust for move of butler packages out of core
timj Oct 5, 2023
ffc814c
Additional updates for lsst.daf.butler subpackage restructuring.
TallJimbo Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/lsst/pipe/base/_quantumContext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/base/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/base/executionButlerBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion python/lsst/pipe/base/graph/_loadHelpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/base/graph/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion python/lsst/pipe/base/quantum_graph_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/base/tests/simpleQGraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down