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

Don't upgrade pip twice #1483

Merged
merged 4 commits into from
Feb 20, 2025
Merged

Don't upgrade pip twice #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b5365e
Fix syntax highlight
singiamtel Feb 17, 2025
cad82ba
Don't upgrade pip twice
singiamtel Feb 17, 2025
e28a91f
Centralize pip installs
singiamtel Feb 17, 2025
e594acd
Keep ALIBUILD_SLUG behaviour
singiamtel Feb 20, 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
9 changes: 0 additions & 9 deletions daily-tags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ rm -rf alidist/
git config --global user.name 'ALICE Builder'
git config --global user.email alibuild@cern.ch

PYTHON_USER_OPT=""
if [[ -z "$VIRTUAL_ENV" ]]; then
PYTHON_USER_OPT="--user"
fi

# Upgrade pip
python3 -m pip install ${PYTHON_USER_OPT} --upgrade pip
# Install the latest release if ALIBUILD_SLUG is not provided
python3 -m pip install ${PYTHON_USER_OPT} --upgrade "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
aliBuild analytics off

# The alidist branches are always named with a trailing .0 instead of the
Expand Down
5 changes: 5 additions & 0 deletions jenkins/daily-tags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ try {
node ("slc9_x86-64-light") {
timeout (240) {
withEnv(["ALIBOT_SLUG=${ALIBOT_SLUG}",
"ALIBUILD_SLUG=${ALIBUILD_SLUG}",
"WAIT_PR_LIMIT=${WAIT_PR_LIMIT}",
"PACKAGES=${PACKAGES}"]) {
withCredentials([[$class: 'StringBinding',
Expand All @@ -34,6 +35,7 @@ try {
mkdir -p /local/tmp
case $ARCHITECTURE in
ubuntu24*)
# Bypass PEP 668
PYTHON_USER_OPT="--break-system-packages --user"
;;
*)
Expand All @@ -42,6 +44,7 @@ try {
esac
TMPDIR=/local/tmp python3 -m pip install ${PYTHON_USER_OPT} --upgrade pip
TMPDIR=/local/tmp python3 -m pip install ${PYTHON_USER_OPT} --upgrade "${ALIBOT_SLUG:+git+https://github.com/${ALIBOT_SLUG}}"
TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
type check-open-pr
if [ "${PACKAGES%% *}" = AliPhysics ]; then
WAIT_TESTS="build/AliPhysics/release build/AliPhysics/root6"
Expand Down Expand Up @@ -116,6 +119,7 @@ try {
mkdir -p /local/tmp
case $ARCHITECTURE in
ubuntu24*)
# Bypass PEP 668
PYTHON_USER_OPT="--break-system-packages --user"
;;
*)
Expand All @@ -124,6 +128,7 @@ try {
esac
TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} pip
TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} "git+https://github.com/$ALIBOT_SLUG"
TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
[ -f /opt/rh/rh-git218/enable ] && source /opt/rh/rh-git218/enable
daily-tags.sh || err=$?
rm -rf alidist daily-tags.?????????? mirror
Expand Down