Merge branch 'tickets/DM-26326' into master

lsst · Dec 4, 2020 · 1f79e15 · 1f79e15
2 parents 189da9c + 21cf94c
commit 1f79e15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/tests/test_appipe.py b/tests/test_appipe.py
@@ -53,6 +53,10 @@ def setUpClass(cls):
             cls.datadir = lsst.utils.getPackageDir("ap_pipe_testdata")
         except pexExcept.NotFoundError:
             raise unittest.SkipTest("ap_pipe_testdata not set up")
+        try:
+            lsst.utils.getPackageDir("obs_decam")
+        except LookupError:
+            raise unittest.SkipTest("obs_decam not set up; needed for ap_pipe_testdata")
 
     def _setupObjPatch(self, *args, **kwargs):
         """Create a patch in setUp that will be reverted once the test ends.

diff --git a/ups/ap_pipe.table b/ups/ap_pipe.table
@@ -13,6 +13,7 @@ setupRequired(pipe_tasks)
 setupRequired(ap_association)
 
 setupOptional(ap_pipe_testdata)
+setupOptional(obs_decam)
 
 envPrepend(PYTHONPATH, ${PRODUCT_DIR}/python)
 envPrepend(PATH, ${PRODUCT_DIR}/bin)