Merge branch 'tickets/DM-27177'

lsst · Jun 8, 2022 · fd147dc · fd147dc
2 parents 6cfc7f8 + cd411f0
commit fd147dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/doc/changes/DM-27177.removal.rst b/doc/changes/DM-27177.removal.rst
@@ -0,0 +1,3 @@
+All support for reading and writing `~lsst.afw.image.Filter` objects has been removed.
+The old ``filter`` component for exposures has been removed, and replaced with a new ``filter`` component backed by `~lsst.afw.image.FilterLabel`.
+It functions identically to the ``filterLabel`` component, which has been deprecated.
diff --git a/python/lsst/daf/butler/configs/datastores/formatters.yaml b/python/lsst/daf/butler/configs/datastores/formatters.yaml
@@ -67,8 +67,6 @@ MetricValue:
   parameters:
     unsafe_dump: true
 StructuredDataDict: lsst.daf.butler.formatters.yaml.YamlFormatter
-# TODO: remove Filter in DM-27177
-Filter: lsst.obs.base.formatters.filter.FilterFormatter
 StampsBase: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 Stamps: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 BrightStarStamps: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter

diff --git a/python/lsst/daf/butler/configs/storageClasses.yaml b/python/lsst/daf/butler/configs/storageClasses.yaml
@@ -132,13 +132,8 @@ storageClasses:
     pytype: lsst.ip.isr.StrayLightData
   BrighterFatterKernel:
     pytype: lsst.ip.isr.BrighterFatterKernel
-  # TODO: remove Filter in DM-27177
-  Filter:
-    pytype: lsst.afw.image.Filter
   FilterLabel:
     pytype: lsst.afw.image.FilterLabel
-    # To support exposure.filter; remove in DM-27177
-    delegate: lsst.obs.base.formatters.filter.FilterTranslator
   Exposure:
     pytype: lsst.afw.image.Exposure
     delegate: lsst.obs.base.exposureAssembler.ExposureAssembler
@@ -195,8 +190,7 @@ storageClasses:
       coaddInputs: CoaddInputs
       transmissionCurve: TransmissionCurve
       metadata: PropertyList
-      # TODO: for consistency with Exposure.getFilterLabel(). Deprecate in DM-27177, remove in DM-27811.
-      filterLabel: FilterLabel
+      filter: FilterLabel
       detector: Detector
       validPolygon: Polygon
       summaryStats: ExposureSummaryStats
@@ -205,8 +199,8 @@ storageClasses:
       bbox: Box2I
       dimensions: Extent2I
       xy0: Point2I
-      # TODO: change filter to FilterLabel and make non-derived in DM-27177. This is a breaking change.
-      filter: Filter
+      # TODO: deprecated; remove in DM-27811.
+      filterLabel: FilterLabel
   ExposureF:
     inheritsFrom: Exposure
     pytype: lsst.afw.image.ExposureF