Merge pull request #175 from lsst/tickets/DM-40057

DM-40057: shorten deprecation timeline and add ticket TODOs
lsst · Jul 23, 2023 · 411fad2 · 411fad2
2 parents 3b3147e + 9248fec
commit 411fad2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/python/lsst/ap/association/diaForcedSource.py b/python/lsst/ap/association/diaForcedSource.py
@@ -133,7 +133,7 @@ def run(self,
 
         if expIdBits is not None:
             warnings.warn(
-                "'expIdBits' argument is deprecated in favor of 'idGenerator'; will be removed after v27.",
+                "'expIdBits' argument is deprecated in favor of 'idGenerator'; will be removed after v26.",
                 category=FutureWarning,
             )
 

diff --git a/python/lsst/ap/association/diaPipe.py b/python/lsst/ap/association/diaPipe.py
@@ -342,10 +342,10 @@ def run(self,
             Template exposure used to create diffIm.
         ccdExposureIdBits : `int`
             Number of bits used for a unique ``ccdVisitId``.  Deprecated in
-            favor of ``idGenerator``, and ignored if that is present.  Pass
-            `None` explicitly to avoid a deprecation warning (a default is
-            impossible given that later positional arguments are not
-            defaulted).
+            favor of ``idGenerator``, and ignored if that is present (will be
+            removed after v26).  Pass `None` explicitly to avoid a deprecation
+            warning (a default is impossible given that later positional
+            arguments are not defaulted).
         band : `str`
             The band in which the new DiaSources were detected.
         idGenerator : `lsst.meas.base.IdGenerator`, optional

diff --git a/python/lsst/ap/association/packageAlerts.py b/python/lsst/ap/association/packageAlerts.py
@@ -86,7 +86,8 @@ def run(self,
             diaForcedSources,
             diffIm,
             template,
-            ccdExposureIdBits=None):
+            ccdExposureIdBits=None,  # TODO: remove (including docs) on DM-38687.
+            ):
         """Package DiaSources/Object and exposure data into Avro alerts.
 
         Writes Avro alerts to a location determined by the
@@ -112,11 +113,11 @@ def run(self,
         template : `lsst.afw.image.ExposureF` or `None`
             Template image used to create the ``diffIm``.
         ccdExposureIdBits : `int`, optional
-            Unused.  Deprecated and will be removed after v27.
+            Unused.  Deprecated and will be removed after v26.
         """
         if ccdExposureIdBits is not None:
             warnings.warn(
-                "The 'ccdExposureIdBits' argument is deprecated and unused; it will be removed after v27.",
+                "The 'ccdExposureIdBits' argument is deprecated and unused; it will be removed after v26.",
                 category=FutureWarning,
             )
         alerts = []