Bump deprecation->removal version from v26 to v27.

Co-authored-by: Tim Jenness <tjenness@lsst.org>
lsst · Apr 8, 2024 · 977d342 · 977d342
1 parent ff87744
commit 977d342
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/python/lsst/ctrl/mpexec/log_capture.py b/python/lsst/ctrl/mpexec/log_capture.py
@@ -98,7 +98,7 @@ def capture_logging(
         task_node : `lsst.pipe.base.TaskDef` or \
                 `~lsst.pipe.base.pipeline_graph.TaskNode`
             The task definition.  Support for `~lsst.pipe.base.TaskDef` is
-            deprecated and will be removed after v26.
+            deprecated and will be removed after v27.
         quantum : `~lsst.daf.butler.Quantum`
             Single Quantum instance.
 
@@ -130,7 +130,7 @@ def capture_logging(
             # DM-40443.
             log_dataset_name = task_node.logOutputDatasetName
             warnings.warn(
-                "Passing TaskDef instances to LogCapture is deprecatedand will not be supported after v26.",
+                "Passing TaskDef instances to LogCapture is deprecated and will not be supported after v27.",
                 FutureWarning,
                 find_outside_stacklevel("lsst.ctrl.mpexec"),
             )

diff --git a/python/lsst/ctrl/mpexec/quantumGraphExecutor.py b/python/lsst/ctrl/mpexec/quantumGraphExecutor.py
@@ -58,7 +58,7 @@ def execute(self, task_node: TaskNode | TaskDef, /, quantum: Quantum) -> Quantum
         task_node : `~lsst.pipe.base.TaskDef` or \
                 `~lsst.pipe.base.pipeline_graph.TaskNode`
             Task definition structure.  `~lsst.pipe.base.TaskDef` support is
-            deprecated and will be removed after v26.
+            deprecated and will be removed after v27.
         quantum : `~lsst.daf.butler.Quantum`
             Quantum for this execution.
 

diff --git a/python/lsst/ctrl/mpexec/separablePipelineExecutor.py b/python/lsst/ctrl/mpexec/separablePipelineExecutor.py
@@ -202,7 +202,7 @@ def make_quantum_graph(
             A graph builder that implements a
             `~lsst.pipe.base.GraphBuilder.makeGraph` method. By default, a new
             instance of `lsst.pipe.base.GraphBuilder` is used.  Deprecated in
-            favor of ``builder_class`` and will be removed after v26.
+            favor of ``builder_class`` and will be removed after v27.
         builder_class : `type` [ \
                 `lsst.pipe.base.quantum_graph_builder.QuantumGraphBuilder` ], \
                 optional
@@ -244,7 +244,7 @@ class are provided automatically (from explicit arguments to this
         if builder:
             warnings.warn(
                 "The 'builder' argument to SeparablePipelineBuilder.make_quantum_graph "
-                "is deprecated in favor of 'builder_class', and will be removed after v26.",
+                "is deprecated in favor of 'builder_class', and will be removed after v27.",
                 FutureWarning,
                 find_outside_stacklevel("lsst.ctrl.mpexec"),
             )

diff --git a/python/lsst/ctrl/mpexec/simple_pipeline_executor.py b/python/lsst/ctrl/mpexec/simple_pipeline_executor.py
@@ -257,7 +257,7 @@ def from_pipeline(
                 `~collections.abc.Iterable` [ `~lsst.pipe.base.TaskDef` ]
             A Python object describing the tasks to run, along with their
             labels and configuration.  Passing `~lsst.pipe.base.TaskDef`
-            objects is deprecated and will not be supported after v26.
+            objects is deprecated and will not be supported after v27.
         where : `str`, optional
             Data ID query expression that constraints the quanta generated.
         bind : `~collections.abc.Mapping`, optional
@@ -283,7 +283,7 @@ def from_pipeline(
             # on DM-40443.
             warnings.warn(
                 "Passing TaskDefs to SimplePipelineExecutor.from_pipeline is deprecated "
-                "and will be removed after v26.",
+                "and will be removed after v27.",
                 category=FutureWarning,
                 stacklevel=find_outside_stacklevel("lsst.ctrl.mpexec"),
             )

diff --git a/python/lsst/ctrl/mpexec/singleQuantumExecutor.py b/python/lsst/ctrl/mpexec/singleQuantumExecutor.py
@@ -194,7 +194,7 @@ def _conform_task_def(self, task_node: TaskDef | TaskNode) -> TaskNode:
         if isinstance(task_node, TaskDef):
             warnings.warn(
                 "Passing TaskDef to SingleQuantumExecutor methods is deprecated "
-                "and will not be supported after v26.",
+                "and will not be supported after v27.",
                 FutureWarning,
                 find_outside_stacklevel("lsst.ctrl.mpexec"),
             )
@@ -334,7 +334,7 @@ def checkExistingOutputs(
         task_node : `~lsst.pipe.base.TaskDef` or \
                 `~lsst.pipe.base.pipeline_graph.TaskNode`
             Task definition structure.  `~lsst.pipe.base.TaskDef` support is
-            deprecated and will be removed after v26.
+            deprecated and will be removed after v27.
         limited_butler : `~lsst.daf.butler.LimitedButler`
             Butler to use for querying and clobbering.
 
@@ -432,7 +432,7 @@ def updatedQuantumInputs(
         task_node : `~lsst.pipe.base.TaskDef` or \
                 `~lsst.pipe.base.pipeline_graph.TaskNode`
             Task definition structure.  `~lsst.pipe.base.TaskDef` support is
-            deprecated and will be removed after v26.
+            deprecated and will be removed after v27.
         limited_butler : `~lsst.daf.butler.LimitedButler`
             Butler to use for querying.
 
@@ -507,7 +507,7 @@ def runQuantum(
         task_node : `~lsst.pipe.base.TaskDef` or \
                 `~lsst.pipe.base.pipeline_graph.TaskNode`
             Task definition structure.  `~lsst.pipe.base.TaskDef` support is
-            deprecated and will be removed after v26.
+            deprecated and will be removed after v27.
         limited_butler : `~lsst.daf.butler.LimitedButler`
             Butler to use for dataset I/O.
         """

diff --git a/python/lsst/ctrl/mpexec/taskFactory.py b/python/lsst/ctrl/mpexec/taskFactory.py
@@ -65,7 +65,7 @@ def makeTask(
         if isinstance(task_node, TaskDef):
             # TODO: remove this block on DM-40443, along with type annotation.
             warnings.warn(
-                "Passing TaskDef to TaskFactory is deprecated and will not be supported after v26.",
+                "Passing TaskDef to TaskFactory is deprecated and will not be supported after v27.",
                 FutureWarning,
                 find_outside_stacklevel("lsst.pipe.base"),
             )

diff --git a/python/lsst/ctrl/mpexec/util.py b/python/lsst/ctrl/mpexec/util.py
@@ -63,8 +63,8 @@ def printTable(rows: list[tuple], header: tuple | None) -> None:
 
 # TODO: remove on DM-40443.
 @deprecated(
-    "filterTasks is deprecated in favor of filterTaskNodes, and will be removed after v26.",
-    version="v26.0",
+    "filterTasks is deprecated in favor of filterTaskNodes, and will be removed after v27.",
+    version="v27.0",
     category=FutureWarning,
 )
 def filterTasks(pipeline: Pipeline, name: str | None) -> list[TaskDef]: