Skip to content

fix: Installing multiple modules in InstallDIRAC command #265

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

Merged
fstagni merged 3 commits into from
Aug 28, 2025
Merged

fix: Installing multiple modules in InstallDIRAC command #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9de8425
fix: Installing multiple modules in InstallDIRAC command
chrisburr Aug 25, 2025
022e1e6
test: disable fail-fast in matrix builds to allow partial success
chrisburr Aug 25, 2025
b0d20d0
test: use debian archive repositories for legacy python containers
chrisburr Aug 25, 2025
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 .github/workflows/basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
python:
- 2.7.18
Expand Down Expand Up @@ -51,6 +52,7 @@ jobs:
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
python:
- 2.7.18
Expand All @@ -62,8 +64,10 @@ jobs:
- uses: actions/checkout@v3
- name: Installing dependencies
run: |
echo 'deb http://archive.debian.org/debian stretch main' > /etc/apt/sources.list
echo 'deb http://archive.debian.org/debian-security stretch/updates main' >> /etc/apt/sources.list
apt-get update || true
python -m pip install pytest mock
apt-get update
apt install -y voms-clients
- name: Run pytest
run: pytest
Expand All @@ -75,6 +79,7 @@ jobs:
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
python:
- 2.7.18
Expand Down
7 changes: 4 additions & 3 deletions Pilot/pilotCommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,11 @@ def _localInstallDIRAC(self):
self._saveEnvInFile()

# 7. pip install DIRAC[pilot]
pipInstalling = "pip install %s " % self.pp.pipInstallOptions
pipInstallingPrefix = "pip install %s " % self.pp.pipInstallOptions

if self.pp.modules: # install a non-released (on pypi) version
for modules in self.pp.modules.split(","):
pipInstalling = pipInstallingPrefix
branch = project = ""
elements = modules.split(":::")
url = ""
Expand All @@ -385,9 +386,9 @@ def _localInstallDIRAC(self):
else:
# pip install DIRAC[pilot]==version ExtensionDIRAC[pilot]==version_ext
if not self.releaseVersion or self.releaseVersion in ["master", "main", "integration"]:
cmd = "%s %sDIRAC[pilot]" % (pipInstalling, self.pp.releaseProject)
cmd = "%s %sDIRAC[pilot]" % (pipInstallingPrefix, self.pp.releaseProject)
else:
cmd = "%s %sDIRAC[pilot]==%s" % (pipInstalling, self.pp.releaseProject, self.releaseVersion)
cmd = "%s %sDIRAC[pilot]==%s" % (pipInstallingPrefix, self.pp.releaseProject, self.releaseVersion)
retCode, output = self.executeAndGetOutput(cmd, self.pp.installEnv)
if retCode:
self.log.error("Could not pip install %s [ERROR %d]" % (self.releaseVersion, retCode))
Expand Down