Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ganga start for condor fix #2324

Merged
merged 3 commits into from
Apr 16, 2024
Merged

Update ganga start for condor fix #2324

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85e7774
Update ganga start
mesmith75 Apr 15, 2024
9f39cc5
Update ganga
mesmith75 Apr 15, 2024
24f3e6a
Merge branch 'develop' into mesmith75-patch-1
mesmith75 Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion bin/ganga
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

from __future__ import print_function
import sys, os
import platform


if 'LBENV_SOURCED' in os.environ.keys():
Expand All @@ -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/condor_install/condor_2_17')
else:
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),
Expand Down
Loading