Shorten deprecation timelines per RFC-945.

lsst · Jul 21, 2023 · 878f92d · 878f92d
1 parent 4cd0e03
commit 878f92d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/python/lsst/daf/butler/_butler.py b/python/lsst/daf/butler/_butler.py
@@ -1114,7 +1114,7 @@ def _findDatasetRef(
         reason="Butler.put() now behaves like Butler.putDirect() when given a DatasetRef."
         " Please use Butler.put(). Be aware that you may need to adjust your usage if you"
         " were relying on the run parameter to determine the run."
-        " Will be removed after v27.0.",
+        " Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -1206,7 +1206,7 @@ def put(
 
     @deprecated(
         reason="Butler.get() now behaves like Butler.getDirect() when given a DatasetRef."
-        " Please use Butler.get(). Will be removed after v27.0.",
+        " Please use Butler.get(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -1242,7 +1242,7 @@ def getDirect(
 
     @deprecated(
         reason="Butler.getDeferred() now behaves like getDirectDeferred() when given a DatasetRef. "
-        "Please use Butler.getDeferred(). Will be removed after v27.0.",
+        "Please use Butler.getDeferred(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -1740,7 +1740,7 @@ def _exists_many(
         return existence
 
     @deprecated(
-        reason="Butler.datasetExists() has been replaced by Butler.exists(). Will be removed after v27.0.",
+        reason="Butler.datasetExists() has been replaced by Butler.exists(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )

diff --git a/python/lsst/daf/butler/_limited_butler.py b/python/lsst/daf/butler/_limited_butler.py
@@ -57,7 +57,7 @@ def isWriteable(self) -> bool:
 
     @deprecated(
         reason="Butler.put() now behaves like Butler.putDirect() when given a DatasetRef."
-        " Please use Butler.put(). Will be removed after v27.0.",
+        " Please use Butler.put(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -166,7 +166,7 @@ def get(
 
     @deprecated(
         reason="Butler.get() now behaves like Butler.getDirect() when given a DatasetRef."
-        " Please use Butler.get(). Will be removed after v27.0.",
+        " Please use Butler.get(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -202,7 +202,7 @@ def getDirect(
 
     @deprecated(
         reason="Butler.getDeferred() now behaves like getDirectDeferred() when given a DatasetRef. "
-        "Please use Butler.getDeferred(). Will be removed after v27.0.",
+        "Please use Butler.getDeferred(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -445,7 +445,7 @@ def stored_many(
 
     @deprecated(
         reason="Butler.datasetExistsDirect() has been replaced by Butler.stored(). "
-        "Will be removed after v27.0.",
+        "Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -545,7 +545,7 @@ def dimensions(self) -> DimensionUniverse:
     @property
     @deprecated(
         reason="The Butler.datastore property is now deprecated. Butler APIs should now exist with the "
-        "relevant functionality. Will be removed after v27.0.",
+        "relevant functionality. Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )

diff --git a/python/lsst/daf/butler/_quantum_backed.py b/python/lsst/daf/butler/_quantum_backed.py
@@ -381,7 +381,7 @@ def isWriteable(self) -> bool:
 
     @deprecated(
         reason="Butler.get() now behaves like Butler.getDirect() when given a DatasetRef."
-        " Please use Butler.get(). Will be removed after v27.0.",
+        " Please use Butler.get(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )
@@ -420,7 +420,7 @@ def get(
 
     @deprecated(
         reason="Butler.getDeferred() now behaves like getDirectDeferred() when given a DatasetRef. "
-        "Please use Butler.getDeferred(). Will be removed after v27.0.",
+        "Please use Butler.getDeferred(). Will be removed after v26.0.",
         version="v26.0",
         category=FutureWarning,
     )

diff --git a/python/lsst/daf/butler/core/dimensions/_coordinate.py b/python/lsst/daf/butler/core/dimensions/_coordinate.py
@@ -647,7 +647,7 @@ def pack(self, name: str, *, returnMaxBits: Literal[False]) -> int:
 
     # TODO: Remove this method and its overloads above on DM-38687.
     @deprecated(
-        "Deprecated in favor of configurable dimension packers.  Will be removed after v27.",
+        "Deprecated in favor of configurable dimension packers.  Will be removed after v26.",
         version="v26",
         category=FutureWarning,
     )

diff --git a/python/lsst/daf/butler/core/dimensions/_packer.py b/python/lsst/daf/butler/core/dimensions/_packer.py
@@ -177,7 +177,7 @@ def unpack(self, packedId: int) -> DataCoordinate:
 
 # TODO: Remove this class on DM-38687.
 @deprecated(
-    "Deprecated in favor of configurable dimension packers.  Will be removed after v27.",
+    "Deprecated in favor of configurable dimension packers.  Will be removed after v26.",
     version="v26",
     category=FutureWarning,
 )
@@ -244,7 +244,7 @@ def __call__(self, universe: DimensionUniverse, fixed: DataCoordinate) -> Dimens
 
 # TODO: Remove this class on DM-38687.
 @deprecated(
-    "Deprecated in favor of configurable dimension packers.  Will be removed after v27.",
+    "Deprecated in favor of configurable dimension packers.  Will be removed after v26.",
     version="v26",
     category=FutureWarning,
 )

diff --git a/python/lsst/daf/butler/core/dimensions/_universe.py b/python/lsst/daf/butler/core/dimensions/_universe.py
@@ -449,7 +449,7 @@ def sorted(self, elements: Iterable[E | str], *, reverse: bool = False) -> list[
 
     # TODO: Remove this method on DM-38687.
     @deprecated(
-        "Deprecated in favor of configurable dimension packers.  Will be removed after v27.",
+        "Deprecated in favor of configurable dimension packers.  Will be removed after v26.",
         version="v26",
         category=FutureWarning,
     )

diff --git a/python/lsst/daf/butler/core/quantum.py b/python/lsst/daf/butler/core/quantum.py
@@ -397,7 +397,7 @@ def from_simple(
         initInputs: MutableMapping[DatasetType, DatasetRef] = {}
         if reconstitutedDimensions is not None:
             warnings.warn(
-                "The reconstitutedDimensions argument is now ignored and may be removed after v 27",
+                "The reconstitutedDimensions argument is now ignored and may be removed after v26",
                 category=FutureWarning,
                 stacklevel=find_outside_stacklevel("lsst.daf.butler"),
             )

diff --git a/python/lsst/daf/butler/instrument.py b/python/lsst/daf/butler/instrument.py
@@ -28,7 +28,7 @@
 
 
 @deprecated(
-    "Deprecated in favor of configurable dimension packers.  Will be removed after v27.",
+    "Deprecated in favor of configurable dimension packers.  Will be removed after v26.",
     version="v26",
     category=FutureWarning,
 )