Merge pull request #2325 from ganga-devs/mesmith75-patch-2

Update ganga-cvmfs-install.sh
ganga-devs · Apr 15, 2024 · bb00b5b · bb00b5b
2 parents bd2ee0b + 96cac04
commit bb00b5b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/ganga/GangaRelease/tools/ganga-cvmfs-install-dev.sh b/ganga/GangaRelease/tools/ganga-cvmfs-install-dev.sh
@@ -4,25 +4,19 @@ cvmfs_server transaction ganga.cern.ch
 
 cd /cvmfs/ganga.cern.ch/Ganga/install/DEV
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/cvmfs/sft.cern.ch/lcg/releases/LCG_100/Python/3.8.6/x86_64-centos7-gcc9-opt/lib
+micromamba activate
 
 . bin/activate
 
-pip install --upgrade ganga[LHCb]@git+https://github.com/ganga-devs/ganga.git@develop
+pip install --upgrade ganga[LHCb,Dirac]@git+https://github.com/ganga-devs/ganga.git@develop
 
-
-sed -i "23i\
-lib_string = '/cvmfs/sft.cern.ch/lcg/views/LCG_100/x86_64-centos7-gcc9-opt/lib64:/cvmfs/sft.cern.ch/lcg/views/LCG_100/x86_64-centos7-gcc9-opt/lib:/cvmfs/sft.cern.ch/lcg/releases/gcc/9.2.0-afc57/x86_64-centos7/lib:/cvmfs/sft.cern.ch/lcg/releases/gcc/9.2.0-afc57/x86_64-centos7/lib64'\n\
-sys.path.append('/cvmfs/sft.cern.ch/lcg/views/LCG_100/x86_64-centos7-gcc9-opt/lib/python3.8/site-packages')\n\
-if not 'LD_LIBRARY_PATH' in os.environ.keys():\n\
-    os.environ['LD_LIBRARY_PATH'] = lib_string\n\
-    os.execv(sys.argv[0], sys.argv)\n\
-elif not lib_string in os.environ['LD_LIBRARY_PATH']:\n\
-    os.environ['LD_LIBRARY_PATH'] += ':'+lib_string\n\
-    os.execv(sys.argv[0], sys.argv)" bin/ganga
+# We need to uninstall htcondor from the default installation to use the preinstalled versions on cvmfs
+pip uninstall htcondor
 
 deactivate
 
+micromamba deactivate
+
 cd ~
 
 cvmfs_server publish ganga.cern.ch

diff --git a/ganga/GangaRelease/tools/ganga-cvmfs-install.sh b/ganga/GangaRelease/tools/ganga-cvmfs-install.sh
@@ -2,7 +2,7 @@
 
 cvmfs_server transaction ganga.cern.ch
 
-conda activate ganga
+micromamba activate
 
 cd /cvmfs/ganga.cern.ch/Ganga/install
 
@@ -14,9 +14,12 @@ pip install --upgrade pip setuptools
 
 pip install ganga[LHCb,Dirac]@git+https://github.com/ganga-devs/ganga.git@$1
 
+# We need to uninstall htcondor from the default installation to use the preinstalled versions on cvmfs
+pip uninstall htcondor
+
 deactivate
 
-conda deactivate
+micromamba deactivate
 
 rm -f /cvmfs/ganga.cern.ch/Ganga/install/LATEST