replace eups calls with lsst.utils.getPackageDir()

lsst-dm · May 22, 2015 · 531b355 · 531b355
1 parent fc6a288
commit 531b355
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/python/lsst/obs/test/testMapper.py b/python/lsst/obs/test/testMapper.py
@@ -22,7 +22,7 @@
 
 import os
 
-import eups
+import lsst.utils
 import lsst.afw.image.utils as afwImageUtils
 from lsst.daf.butlerUtils import CameraMapper
 import lsst.pex.policy as pexPolicy
@@ -65,9 +65,7 @@ def _defectLookup(self, dataId):
         @param dataId (dict) Dataset identifier
         @return (string) path to the defects file or None if not available
         """
-        obsTestDir = eups.productDir("obs_test")
-        if obsTestDir is None:
-            raise RuntimeError("obs_test must be setup")
+        obsTestDir = lsst.utils.getPackageDir('obs_test')
 
         return os.path.join(obsTestDir, "data", "input", "defects", "defects.fits")
 

diff --git a/tests/map.py b/tests/map.py
@@ -25,7 +25,7 @@
 import os
 import unittest
 
-import eups
+import lsst.utils
 import lsst.utils.tests as utilsTests
 from lsst.obs.test import TestMapper
 import lsst.afw.image as afwImage
@@ -34,9 +34,7 @@ class TestMapperTestCase(unittest.TestCase):
     """A test case for the test mapper."""
 
     def setUp(self):
-        obsTestDir = eups.productDir("obs_test")
-        if not obsTestDir:
-            raise RuntimeError("obs_test is not setup")
+        obsTestDir = lsst.utils.getPackageDir('obs_test')
         self.input = os.path.join(obsTestDir, "data", "input")
         self.output = self.input
         self.mapper = TestMapper(root=self.input)