Merge pull request #97 from lsst-camera-dh/ETCCB-648

Etccb 648
lsst-camera-dh · Nov 22, 2021 · 4a2f4b5 · 4a2f4b5
2 parents 81637de + 85a977b
commit 4a2f4b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/bin/jh_install.py b/bin/jh_install.py
@@ -217,17 +217,13 @@ def _module_path(self):
     def _python_configs(self):
         python_dirs = [os.path.join('${'+self._env_var(x)+'}', 'python')
                        for x in self.package_dirs]
-        third_party_pars = self.third_party_pars
-        if 'datacatdir' in third_party_pars:
-            python_dirs.append('${DATACATDIR}')
+        for package_dir, path in self.third_party_pars.items():
+            if package_dir in ('modules_dir', 'eo_utilities_dir'):
+                continue
+            python_dirs.append(path)
         python_dirs.extend(['${HARNESSEDJOBSDIR}/python', self._module_path(),
                             '${PYTHONPATH}'])
-        python_configs = ''
-        if 'datacatdir' in third_party_pars:
-            python_configs += """export DATACATDIR=%s/lib
-export DATACAT_CONFIG=%s
-""" % (os.path.join(third_party_pars['datacatdir']), third_party_pars['datacat_config'])
-        python_configs += "export PYTHONPATH=%s\n" % ":".join(python_dirs)
+        python_configs = "export PYTHONPATH=%s\n" % ":".join(python_dirs)
         return python_configs
 
     def jh(self):

diff --git a/packageLists/IR2_JH_versions.txt b/packageLists/IR2_JH_versions.txt
@@ -5,7 +5,7 @@ lcatr-schema = 0.7.0
 lcatr-modulefiles = 0.4.0
 
 [eups_packages]
-eotest = 1.3.2
+eotest = 1.4.0
 obs_lsst = 1.1.0-rc
 
 [packages]
@@ -14,16 +14,16 @@ eTraveler-clientAPI = 1.7.1
 metrology-data-analysis = 0.0.14
 camera-model = 0.1.5
 config_files = 0.0.12
-jh-ccs-utils = 0.2.5
-IandT-jobs = 0.4.2
+jh-ccs-utils = 0.2.6
+IandT-jobs = 0.4.3
 jh-dev-tools = 0.2.0
-EO-analysis-jobs = 1.5.11
+EO-analysis-jobs = 1.5.12
 
 [dmstack]
 stack_dir = /gpfs/slac/lsst/fs3/g/software/stack/v21.0.0
 
 [third_party]
-datacatdir = /lsst/dh/software/centos7-gcc48/dev/datacat/0.4
-datacat_config = /lsst/dh/software/centos7-gcc48/dev/datacat/config.cfg
+datacat_dir = /gpfs/slac/lsst/fs2/u1/dh/software/centos7-gcc48/prod/datacat/lib/python3.7/site-packages
+datacat_utilities_dir = /gpfs/slac/lsst/fs2/u1/dh/software/centos7-gcc48/prod/datacat-utilities/python
 modules_dir = /gpfs/slac/lsst/fs2/u1/dh/software/centos7-gcc48/prod/Modules
 eo_utilities_dir = /gpfs/slac/lsst/fs2/u1/dh/software/centos7-gcc48/prod/EO-utilities