Merge pull request #42 from lsst/tickets/DM-21065

DM-21065: Deprecate makePolicy
lsst · Sep 4, 2019 · c96e915 · c96e915
2 parents 6b74884 + 3b19ebc
commit c96e915
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/python/lsst/pex/config/convert.py b/python/lsst/pex/config/convert.py
@@ -21,6 +21,8 @@
 
 __all__ = ('makePropertySet', 'makePolicy')
 
+from deprecated.sphinx import deprecated
+
 try:
     import lsst.pex.policy as pexPolicy
 except ImportError:
@@ -71,6 +73,8 @@ def _helper(ps, prefix, dict_):
         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`.
 

diff --git a/tests/test_Config.py b/tests/test_Config.py
@@ -314,14 +314,16 @@ class III(AAA):
 
     @unittest.skipIf(pexPolicy is None, "lsst.pex.policy is required")
     def testConvertPolicy(self):
-        pol = pexConfig.makePolicy(self.simple)
+        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))
 
-        pol = pexConfig.makePolicy(self.comp)
+        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")

diff --git a/ups/pex_config.cfg b/ups/pex_config.cfg
@@ -3,7 +3,6 @@
 import lsst.sconsUtils
 
 dependencies = {
-    "required": ["daf_base", "pex_policy"],
     "buildRequired": ["python", "pybind11"],
 }