Merge branch 'tickets/DM-46523'

Author: taranu

python/lsst/pipe/tasks/diff_matched_tract_catalog.py

@@ -35,10 +35,8 @@
 import astropy.table
 import astropy.units as u
 import numpy as np
-import pandas as pd
 from smatch.matcher import sphdist
 from typing import Sequence
-import warnings
 
 
 def is_sequence_set(x: Sequence):
@@ -300,25 +298,25 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
 
     def run(
         self,
-        catalog_ref: pd.DataFrame | astropy.table.Table,
-        catalog_target: pd.DataFrame | astropy.table.Table,
-        catalog_match_ref: pd.DataFrame | astropy.table.Table,
-        catalog_match_target: pd.DataFrame | astropy.table.Table,
+        catalog_ref: astropy.table.Table,
+        catalog_target: astropy.table.Table,
+        catalog_match_ref: astropy.table.Table,
+        catalog_match_target: astropy.table.Table,
         wcs: afwGeom.SkyWcs = None,
     ) -> pipeBase.Struct:
         """Load matched reference and target (measured) catalogs, measure summary statistics, and output
         a combined matched catalog with columns from both inputs.
 
         Parameters
         ----------
-        catalog_ref : `pandas.DataFrame` | `astropy.table.Table`
+        catalog_ref : `astropy.table.Table`
             A reference catalog to diff objects/sources from.
-        catalog_target : `pandas.DataFrame` | `astropy.table.Table`
+        catalog_target : `astropy.table.Table`
             A target catalog to diff reference objects/sources to.
-        catalog_match_ref : `pandas.DataFrame` | `astropy.table.Table`
+        catalog_match_ref : `astropy.table.Table`
             A catalog with match indices of target sources and selection flags
             for each reference source.
-        catalog_match_target : `pandas.DataFrame` | `astropy.table.Table`
+        catalog_match_target : `astropy.table.Table`
             A catalog with selection flags for each target source.
         wcs : `lsst.afw.image.SkyWcs`
             A coordinate system to convert catalog positions to sky coordinates,
@@ -333,19 +331,6 @@ def run(
         # Would be nice if this could refer directly to ConfigClass
         config: DiffMatchedTractCatalogConfig = self.config
 
-        is_ref_pd = isinstance(catalog_ref, pd.DataFrame)
-        is_target_pd = isinstance(catalog_target, pd.DataFrame)
-        is_match_ref_pd = isinstance(catalog_match_ref, pd.DataFrame)
-        is_match_target_pd = isinstance(catalog_match_target, pd.DataFrame)
-        if is_ref_pd:
-            catalog_ref = astropy.table.Table.from_pandas(catalog_ref)
-        if is_target_pd:
-            catalog_target = astropy.table.Table.from_pandas(catalog_target)
-        if is_match_ref_pd:
-            catalog_match_ref = astropy.table.Table.from_pandas(catalog_match_ref)
-        if is_match_target_pd:
-            catalog_match_target = astropy.table.Table.from_pandas(catalog_match_target)
-
         # Strip any provenance from tables before merging to prevent
         # warnings from conflicts being issued by astropy.utils.merge during
         # vstack or hstack calls.
@@ -354,11 +339,6 @@ def run(
         DatasetProvenance.strip_provenance_from_flat_dict(catalog_match_ref.meta)
         DatasetProvenance.strip_provenance_from_flat_dict(catalog_match_target.meta)
 
-        # TODO: Remove pandas support in DM-46523
-        if is_ref_pd or is_target_pd or is_match_ref_pd or is_match_target_pd:
-            warnings.warn("pandas usage in MatchProbabilisticTask is deprecated; it will be removed "
-                          " in favour of astropy.table after release 28.0.0", category=FutureWarning)
-
         select_ref = catalog_match_ref['match_candidate']
         # Add additional selection criteria for target sources beyond those for matching
         # (not recommended, but can be done anyway)

tests/test_diff_matched_tract_catalog.py

@@ -31,7 +31,6 @@
 
 from astropy.table import Table
 import numpy as np
-import pytest
 
 
 def _error_format(column):
@@ -150,19 +149,6 @@ def test_DiffMatchedTractCatalogTask(self):
             catalog_match_target=self.catalog_match_target,
             wcs=self.wcs,
         )
-        # TODO: Remove pandas support in DM-46523
-        with pytest.warns(FutureWarning):
-            result_pd = task.run(
-                catalog_ref=self.catalog_ref.to_pandas(),
-                catalog_target=self.catalog_target.to_pandas(),
-                catalog_match_ref=self.catalog_match_ref.to_pandas(),
-                catalog_match_target=self.catalog_match_target.to_pandas(),
-                wcs=self.wcs,
-            )
-            self.assertListEqual(list(result.cat_matched.columns), list(result_pd.cat_matched.columns))
-            for column in result.cat_matched.columns:
-                self.assertListEqual(list(result.cat_matched[column]), list(result_pd.cat_matched[column]))
-
         columns_result = list(result.cat_matched.columns)
         columns_expect = list(columns_target) + ["match_distance", "match_distanceErr"]
         prefix = DiffMatchedTractCatalogConfig.column_matched_prefix_ref.default