replace eups calls with lsst.utils.getPackageDir()

lsst-dm · May 22, 2015 · a4eb2e7 · a4eb2e7
1 parent 3cba4e3
commit a4eb2e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/tests/Dictionary_1.py b/tests/Dictionary_1.py
@@ -23,7 +23,7 @@
 
 import os
 import unittest
-import eups
+import lsst.utils
 #import inspect
 
 import lsst.utils.tests as tests
@@ -65,8 +65,8 @@ def assertValidationError(self, errorCode, callableObj, field, value):
     testDictDir = None
     def getTestDictionary(self, filename=None):
         if not self.testDictDir:
-            self.testDictDir = os.path.join(eups.productDir("pex_policy"),
-                                                  "tests", "dictionary")
+            pexPolicyDir = lsst.utils.getPackageDir('pex_policy')
+            self.testDictDir = os.path.join(pexPolicyDir, "tests", "dictionary")
         return os.path.join(self.testDictDir, filename) if filename else self.testDictDir
 
     def testDictionaryLoad(self):

diff --git a/tests/UrnPolicyFile_1.py b/tests/UrnPolicyFile_1.py
@@ -23,7 +23,7 @@
 
 import os
 import unittest
-import eups
+import lsst.utils
 #import inspect
 
 import lsst.utils.tests as tests
@@ -61,8 +61,9 @@ def assertRaiseLCE(self, excClass, excMsg, callableObj, failMsg, *args, **kwargs
     examplesDir = None
     def getExamples(self, filename=None):
         if not self.examplesDir:
-            self.examplesDir = os.path.join(eups.productDir("pex_policy"),
-                                            "examples")
+            # XXX is this really the best way to find the src_dir?
+            pexPolicyDir = lsst.utils.getPackageDir('pex_policy')
+            self.examplesDir = os.path.join(pexPolicyDir, "examples")
         if filename:
             return os.path.join(self.examplesDir, filename)
         else:
@@ -133,7 +134,8 @@ def testRepos(self):
         # when the repository is mis-specified, local files cannot be loaded
         upf = UrnPolicyFile("pex_policy:tests:urn/indirect_parent_good.paf")
         # we expect it to look in <package>/tests/simple.paf
-        expectedFile = os.environ["PEX_POLICY_DIR"] + "/tests/simple.paf"
+        pexPolicyDir = lsst.utils.getPackageDir('pex_policy')
+        expectedFile = pexPolicyDir + "/tests/simple.paf"
         self.assertRaiseLCE(lsst.pex.exceptions.IoError,
                             "failure opening Policy file: " + expectedFile,
                             upf.load, "Wrong repository dir.", Policy())

diff --git a/tests/testBigBool.py b/tests/testBigBool.py
@@ -31,9 +31,10 @@
 import unittest
 import time
 
+import lsst.utils
 from lsst.pex.policy import Policy
 
-proddir = os.environ["PEX_POLICY_DIR"]
+proddir = lsst.utils.getPackageDir('pex_policy')
 
 class BigBoolTestCase(unittest.TestCase):
 

diff --git a/tests/testGet.py b/tests/testGet.py
@@ -31,9 +31,10 @@
 import unittest
 import time
 
+import lsst.utils
 from lsst.pex.policy import Policy
 
-proddir = os.environ["PEX_POLICY_DIR"]
+proddir = lsst.utils.getPackageDir('pex_policy')
 
 class GetTestCase(unittest.TestCase):
 

diff --git a/ups/pex_policy.table b/ups/pex_policy.table
@@ -1,4 +1,5 @@
 setupRequired(daf_base)
+setupRequired(utils)
 
 envPrepend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
 envPrepend(DYLD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)