replace eups.productDir() calls with lsst.utils.getPackageDir()

lsst-dm · May 26, 2015 · 1428d43 · 1428d43
1 parent 227ecda
commit 1428d43
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/tests/crSplitStagesImSimTest.py b/tests/crSplitStagesImSimTest.py
@@ -37,7 +37,7 @@
 import pdb
 import unittest
 
-import eups
+import lsst.utils
 import lsst.utils.tests as utilsTests
 import lsst.pex.harness.Clipboard as pexClipboard
 import lsst.pex.policy as pexPolicy
@@ -119,7 +119,8 @@ def removeCRsSilently(self, exposure):
         omask <<= mask
 
     def setUp(self):
-        filename = os.path.join(eups.productDir("afwdata"), "ImSim",
+        afwdataDir = lsst.utils.getPackageDir("afwdata")
+        filename = os.path.join(afwdataDir, "ImSim",
                 "postISR", "v85751839-fr", "s0", "R23", "S11", "C00.fits")
 
         bbox = afwGeom.Box2I(afwGeom.Point2I(0,0), afwGeom.Extent2I(512, 512))
@@ -210,9 +211,11 @@ def suite():
 
     suites = []
 
-    if not eups.productDir("afwdata"):
+    try:
+        lsst.utils.getPackageDir("afwdata")
+    except Exception:
         print >> sys.stderr, "afwdata is not setting up; skipping test"
-    else:        
+    else:
         suites += unittest.makeSuite(CrSplitStagesImSimTestCase)
 
     suites += unittest.makeSuite(utilsTests.MemoryTestCase)

diff --git a/tests/crSplitStagesTest.py b/tests/crSplitStagesTest.py
@@ -37,7 +37,7 @@
 import pdb
 import unittest
 
-import eups
+import lsst.utils
 import lsst.utils.tests as utilsTests
 import lsst.pex.harness.Clipboard as pexClipboard
 import lsst.pex.policy as pexPolicy
@@ -119,7 +119,8 @@ def removeCRsSilently(self, exposure):
         omask <<= mask
 
     def setUp(self):
-        filename = os.path.join(eups.productDir("afwdata"), "CFHT", "D4", "cal-53535-i-797722_1")
+        afwdataDir = lsst.utils.getPackageDir("afwdata")
+        filename = os.path.join(afwdataDir, "CFHT", "D4", "cal-53535-i-797722_1")
         bbox = afwGeom.Box2I(afwGeom.Point2I(32,32), afwGeom.Extent2I(512, 512))
         exposure = afwImage.ExposureF(filename, 0, bbox, afwImage.LOCAL)
         self.exposures = self.fakeCRSplitExposures(exposure)
@@ -207,9 +208,11 @@ def suite():
 
     suites = []
 
-    if not eups.productDir("afwdata"):
+    try:
+        lsst.utils.getPackageDir("afwdata")
+    except Exception:
         print >> sys.stderr, "afwdata is not setting up; skipping test"
-    else:        
+    else:
         suites += unittest.makeSuite(CrSplitStageTestCase)
 
     suites += unittest.makeSuite(utilsTests.MemoryTestCase)

diff --git a/ups/datarel.table b/ups/datarel.table
@@ -1,6 +1,7 @@
 setupRequired(ap)
 setupRequired(ctrl_orca)
 setupRequired(pipe_tasks)
+setupRequired(utils)
 
 # setupOptional(obs_cfht)
 setupOptional(obs_lsstSim)