Merge pull request #434 from lsst/tickets/DM-40443

DM-40443: Remove interfaces deprecated on DM-40441.

doc/changes/DM-40443.removal.rst

@@ -0,0 +1,9 @@
+Removed deprecated code scheduled to be removed after v27:
+
+* Removed ``lsst.pipe.base.graphBuilder``.
+* Removed ``lsst.pipe.base.pipeTools``.
+* Removed ``lsst.pipe.base.BaseConnection.makeDatasetType``
+* Removed ``Pipeline.toExpandedPipeline`` (replaced by ``to_graph``).
+* Removed ``PipelineDatasetTypes`` and ``TaskDatasetTypes``.
+* Removed ``QuantumGraphBuilderError``.
+* APIs no longer accept ``TaskDef``.

python/lsst/pipe/base/__init__.py

@@ -1,7 +1,3 @@
-# The graphBuilder module is deprecated, but we still export its symbols for
-# backwards compatibility.
-import warnings
-
 from . import automatic_connection_constants, connectionTypes, pipeline_graph, pipelineIR, utils
 from ._dataset_handle import *
 
@@ -17,12 +13,6 @@
 from .connections import *
 from .executionButlerBuilder import *
 from .graph import *
-
-with warnings.catch_warnings():
-    warnings.simplefilter("ignore", FutureWarning)
-    from .graphBuilder import *
-del warnings
-
 from .pipeline import *
 
 # We import the main PipelineGraph type and the module (above), but we don't

python/lsst/pipe/base/connectionTypes.py

@@ -35,8 +35,7 @@
 from collections.abc import Callable, Iterable, Sequence
 from typing import ClassVar
 
-from deprecated.sphinx import deprecated as deprecated_sphinx  # avoid clash with BaseConnection.deprecated
-from lsst.daf.butler import DataCoordinate, DatasetRef, DatasetType, DimensionUniverse, Registry, StorageClass
+from lsst.daf.butler import DataCoordinate, DatasetRef, DatasetType, Registry
 from lsst.utils.introspection import find_outside_stacklevel
 
 
@@ -106,35 +105,6 @@ def __get__(self, inst, klass):
                 f"Connection {self.varName!r} of {klass.__name__} has been removed."
             ) from None
 
-    # TODO: remove on DM-40443.
-    @deprecated_sphinx(
-        reason="Deprecated in favor of PipelineGraph, and will be removed after v27.",
-        version="27.0",
-        category=FutureWarning,
-    )
-    def makeDatasetType(
-        self, universe: DimensionUniverse, parentStorageClass: StorageClass | str | None = None
-    ) -> DatasetType:
-        """Construct a true `~lsst.daf.butler.DatasetType` instance with
-        normalized dimensions.
-
-        Parameters
-        ----------
-        universe : `lsst.daf.butler.DimensionUniverse`
-            Set of all known dimensions to be used to normalize the dimension
-            names specified in config.
-        parentStorageClass : `lsst.daf.butler.StorageClass` or `str`, optional
-            Parent storage class for component datasets; `None` otherwise.
-
-        Returns
-        -------
-        datasetType : `~lsst.daf.butler.DatasetType`
-            The `~lsst.daf.butler.DatasetType` defined by this connection.
-        """
-        return DatasetType(
-            self.name, universe.empty, self.storageClass, parentStorageClass=parentStorageClass
-        )
-
 
 @dataclasses.dataclass(frozen=True)
 class DimensionedConnection(BaseConnection):
@@ -176,39 +146,6 @@ def __post_init__(self):
         if not isinstance(self.dimensions, Iterable):
             raise TypeError("Dimensions must be iterable of dimensions")
 
-    # TODO: remove on DM-40443.
-    @deprecated_sphinx(
-        reason="Deprecated in favor of PipelineGraph, and will be removed after v27.",
-        version="27.0",
-        category=FutureWarning,
-    )
-    def makeDatasetType(
-        self, universe: DimensionUniverse, parentStorageClass: StorageClass | str | None = None
-    ) -> DatasetType:
-        """Construct a true `~lsst.daf.butler.DatasetType` instance with
-        normalized dimensions.
-
-        Parameters
-        ----------
-        universe : `lsst.daf.butler.DimensionUniverse`
-            Set of all known dimensions to be used to normalize the dimension
-            names specified in config.
-        parentStorageClass : `lsst.daf.butler.StorageClass` or `str`, optional
-            Parent storage class for component datasets; `None` otherwise.
-
-        Returns
-        -------
-        datasetType : `~lsst.daf.butler.DatasetType`
-            The `~lsst.daf.butler.DatasetType` defined by this connection.
-        """
-        return DatasetType(
-            self.name,
-            universe.conform(self.dimensions),
-            self.storageClass,
-            isCalibration=self.isCalibration,
-            parentStorageClass=parentStorageClass,
-        )
-
 
 @dataclasses.dataclass(frozen=True)
 class BaseInput(DimensionedConnection):