From 85e7774fbeb61d977ee34c8ddc47b49bf96d1a8a Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 15 Apr 2024 11:58:34 +0200 Subject: [PATCH 1/2] Update ganga start --- bin/ganga | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/ganga b/bin/ganga index d808c67797..8ee24610cd 100755 --- a/bin/ganga +++ b/bin/ganga @@ -20,6 +20,7 @@ from __future__ import print_function import sys, os +import platform if 'LBENV_SOURCED' in os.environ.keys(): @@ -45,7 +46,11 @@ def standardSetup(): #On CVMFS we need to point to the site-packages directory as we don't start the virtualenv if exeDir.startswith('/cvmfs/ganga.cern.ch', 0, 20): - sys.path.insert(0, '/cvmfs/ganga.cern.ch/Ganga/install/miniconda3/envs/ganga/lib/python3.11/site-packages/') + sys.path.insert(0, '/cvmfs/ganga.cern.ch/Ganga/install/micromamba_el9/lib/python3.11/site-packages/') + if 'glibc2.17' in platform.platform(): + sys.path.append('/cvmfs/ganga.cern.ch/Ganga/install/8.7.4/condor_install/condor_2_17') + else: + sys.path.append('/cvmfs/ganga.cern.ch/Ganga/install/8.7.4/condor_install/condor_2_34') #This function is needed to add the individual ganga modules to the sys path - awful hack but saved rewriting all the code. This is needed for pip installs pathsToAdd = filter(lambda p : 'ganga' in os.listdir(p), From 9f39cc5745dce2420fcab3ad09e56210459714c5 Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 15 Apr 2024 12:01:54 +0200 Subject: [PATCH 2/2] Update ganga --- bin/ganga | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ganga b/bin/ganga index 8ee24610cd..87c6fc5465 100755 --- a/bin/ganga +++ b/bin/ganga @@ -48,9 +48,9 @@ def standardSetup(): if exeDir.startswith('/cvmfs/ganga.cern.ch', 0, 20): sys.path.insert(0, '/cvmfs/ganga.cern.ch/Ganga/install/micromamba_el9/lib/python3.11/site-packages/') if 'glibc2.17' in platform.platform(): - sys.path.append('/cvmfs/ganga.cern.ch/Ganga/install/8.7.4/condor_install/condor_2_17') + sys.path.append('/cvmfs/ganga.cern.ch/Ganga/install/condor_install/condor_2_17') else: - sys.path.append('/cvmfs/ganga.cern.ch/Ganga/install/8.7.4/condor_install/condor_2_34') + sys.path.append('/cvmfs/ganga.cern.ch/Ganga/install/condor_install/condor_2_34') #This function is needed to add the individual ganga modules to the sys path - awful hack but saved rewriting all the code. This is needed for pip installs pathsToAdd = filter(lambda p : 'ganga' in os.listdir(p),