DM-21207: Remove deprecated Policy usage from pex_config, ip_diffim, and meas_algorithms

doc/lsst.pex.config/design-notes.rst

@@ -37,16 +37,6 @@ Design goals
 
 - Support lists of parameter values.
 
-Relationship to pex\_policy
-===========================
-
-The `lsst.pex.Policy` and `lsst.pex.PolicyDictionary` classes in the `pex_policy`_ package provided many of the features of `pex_config`_ in C++ and, via SWIG wrapping, Python.
-`pex_config`_ (which contains the :ref:`lsst.pex.config` module) was developed to provide additional features and remove
-some shortcomings.
-
-`pex_policy`_ is being replaced with `pex_config`_ in the LSST Data Management System codebase.
-To aid the transition, the `makePolicy` a utility function converts a `Config` to a `~lsst.pex.policy.Policy`.
-
 Architecture
 ============
 
@@ -55,4 +45,3 @@ The storage and history for the fields is also maintained in the `Config` object
 This allows `Field` classes to be easily inherited.
 
 .. _pex_config: https://github.com/lsst/pex_config
-.. _pex_policy: https://github.com/lsst/pex_policy

doc/overview.dox

@@ -260,11 +260,6 @@ After using SWIG, the preferred way to create the  Config is via the
 
 \section Notes
 
-\subsection pexConfigConvert Relationship to lsst::pex::policy
-
-The  Policy and  PolicyDictionary classes in the lsst::pex::policy package provided many of the features of lsst::pex::config in C++ and, via SWIG wrapping, Python.  lsst::pex::config was developed to provide additional features and remove some shortcomings.  lsst::pex::policy is being replaced with lsst::pex::config in the LSST DMS codebase; to aid the transition a utility function is provided to convert a  Config to a  Policy.
-
-
 \subsection pexConfigArchitecture Architecture
  Config uses a metaclass to record the  Field attributes within each Config object in an internal dictionary.  The storage and history for the fields is also maintained in the  Config, not the  Field itself.  This allows  Fields to be inherited without difficulty.
 

python/lsst/pex/config/convert.py

@@ -25,14 +25,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__all__ = ('makePropertySet', 'makePolicy')
-
-from deprecated.sphinx import deprecated
-
-try:
-    import lsst.pex.policy as pexPolicy
-except ImportError:
-    pexPolicy = None
+__all__ = ('makePropertySet',)
 
 try:
     import lsst.daf.base as dafBase
@@ -57,7 +50,6 @@ def makePropertySet(config):
 
     See also
     --------
-    makePolicy
     lsst.daf.base.PropertySet
     """
     if dafBase is None:
@@ -77,44 +69,3 @@ def _helper(ps, prefix, dict_):
         return ps
     else:
         return None
-
-
-@deprecated("pex_policy is deprecated, prefer makePropertySet (will be removed after v19)",
-            category=FutureWarning)
-def makePolicy(config):
-    """Convert a configuration into a `lsst.pex.policy.Policy`.
-
-    Parameters
-    ----------
-    config : `lsst.pex.config.Config`
-        Configuration instance.
-
-    Returns
-    -------
-    policy : `lsst.pex.policy.Policy`
-        A `~lsst.pex.policy.Policy` that is equivalent to the ``config``
-        instance. If ``config`` is `None` then return value is also `None`.
-
-    See also
-    --------
-    makePropertySet
-    lsst.pex.policy.Policy
-    """
-    if pexPolicy is None:
-        raise RuntimeError("lsst.pex.policy is not available")
-
-    def _helper(dict_):
-        p = pexPolicy.Policy()
-        for k, v in dict_.items():
-            if isinstance(v, dict):
-                p.set(k, _helper(v))
-            elif isinstance(v, list):
-                for vi in v:
-                    p.add(k, vi)
-            elif v is not None:
-                p.set(k, v)
-        return p
-    if config:
-        return _helper(config.toDict())
-    else:
-        return None

tests/test_Config.py

@@ -34,16 +34,12 @@
 
 import lsst.pex.config as pexConfig
 
-# Some tests depend on daf_base or pex_policy.
-# Skip them if they are not found.
+# Some tests depend on daf_base.
+# Skip them if it is not found.
 try:
     import lsst.daf.base as dafBase
 except ImportError:
     dafBase = None
-try:
-    import lsst.pex.policy as pexPolicy
-except ImportError:
-    pexPolicy = None
 
 GLOBAL_REGISTRY = {}
 
@@ -332,20 +328,6 @@ class III(AAA):
         self.assertEqual(III.a.default, 5)
         self.assertEqual(AAA.a.default, 4)
 
-    @unittest.skipIf(pexPolicy is None, "lsst.pex.policy is required")
-    def testConvertPolicy(self):
-        with self.assertWarns(FutureWarning):
-            pol = pexConfig.makePolicy(self.simple)
-        self.assertFalse(pol.exists("i"))
-        self.assertEqual(pol.get("f"), self.simple.f)
-        self.assertEqual(pol.get("b"), self.simple.b)
-        self.assertEqual(pol.get("c"), self.simple.c)
-        self.assertEqual(pol.getArray("ll"), list(self.simple.ll))
-
-        with self.assertWarns(FutureWarning):
-            pol = pexConfig.makePolicy(self.comp)
-        self.assertEqual(pol.get("c.f"), self.comp.c.f)
-
     @unittest.skipIf(dafBase is None, "lsst.daf.base is required")
     def testConvertPropertySet(self):
         ps = pexConfig.makePropertySet(self.simple)

ups/pex_config.table

@@ -2,7 +2,6 @@ setupRequired(numpy)
 setupRequired(pybind11)
 setupRequired(python)
 setupOptional(daf_base)
-setupOptional(pex_policy)
 
 envPrepend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
 envPrepend(DYLD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)