From 2ce731796467f869911154da875118c7612abc49 Mon Sep 17 00:00:00 2001 From: Arun Kannawadi Date: Tue, 31 Mar 2026 15:39:18 -0400 Subject: [PATCH 1/2] Remove deprecated TreecorrConfig class Removed deprecated TreecorrConfig class and its usage. --- .../tools/actions/vector/calcRhoStatistics.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py b/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py index 3823cff1b..92ba2baa3 100644 --- a/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py +++ b/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py @@ -21,10 +21,7 @@ from __future__ import annotations -__all__ = ( - "CalcRhoStatistics", - "TreecorrConfig", -) +__all__ = ("CalcRhoStatistics",) import logging from collections.abc import Mapping @@ -32,7 +29,6 @@ import numpy as np import treecorr # type: ignore[import] -from deprecated.sphinx import deprecated from lsst.meas.algorithms.treecorrUtils import TreecorrConfig as TreecorrConfigNew from lsst.pex.config import ChoiceField, ConfigField, Field @@ -50,19 +46,6 @@ _LOG = logging.getLogger(__name__) -# TO DO: Remove TreecorrConfig in here for next major release (DM-47072) -@deprecated( - reason=( - "TreecorrConfig is no longer a part of analysis_tools (DM-45899). " - "Please use lsst.meas.algorithms.treecorrUtils.TreecorrConfig instead." - ), - version="v28.0", - category=FutureWarning, -) -class TreecorrConfig(TreecorrConfigNew): - pass - - class CalcRhoStatistics(KeyedDataAction): r"""Calculate rho statistics. From b7e693fb1a9954beb81c23500f3bd495c9f218d2 Mon Sep 17 00:00:00 2001 From: Arun Kannawadi Date: Tue, 31 Mar 2026 15:41:16 -0400 Subject: [PATCH 2/2] Drop the alias for treecorrUtils.TreecorrConfig Now that the old TreecorrConfig is removed, there is no need to use an alias anymore. --- .../lsst/analysis/tools/actions/vector/calcRhoStatistics.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py b/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py index 92ba2baa3..e6eb0f4a0 100644 --- a/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py +++ b/python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py @@ -30,7 +30,7 @@ import numpy as np import treecorr # type: ignore[import] -from lsst.meas.algorithms.treecorrUtils import TreecorrConfig as TreecorrConfigNew +from lsst.meas.algorithms.treecorrUtils import TreecorrConfig from lsst.pex.config import ChoiceField, ConfigField, Field from ...interfaces import KeyedData, KeyedDataAction, Vector @@ -160,13 +160,13 @@ class CalcRhoStatistics(KeyedDataAction): }, ) - treecorr = ConfigField[TreecorrConfigNew]( + treecorr = ConfigField[TreecorrConfig]( doc="TreeCorr configuration", ) def setDefaults(self): super().setDefaults() - self.treecorr = TreecorrConfigNew() + self.treecorr = TreecorrConfig() self.treecorr.sep_units = "arcmin" self.treecorr.max_sep = 100.0