Skip to content

fix: make sure versioned python commands in /usr/local/bin aren't broken #1684

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
merged 1 commit into from
Sep 28, 2024
Merged

fix: make sure versioned python commands in /usr/local/bin aren't broken #1684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions docker/build_scripts/finalize-one.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ if [ "${PY_IMPL}" == "graalpy" ]; then
# GraalPy doesn't update pip/setuptools because it uses a patched version of pip/setuptools
${PREFIX}/bin/python -m ensurepip --default-pip
${PREFIX}/bin/python -m pip install -U --require-hashes -r ${MY_DIR}/requirements${PY_VER}.txt
elif [ -f /usr/local/bin/python${PY_VER} ]; then
elif [ -f /usr/local/bin/cpython${PY_VER} ]; then
# Use the already intsalled cpython pip to bootstrap pip if available
/usr/local/bin/python${PY_VER} -m pip --python ${PREFIX}/bin/python install -U --require-hashes -r ${MY_DIR}/requirements${PY_VER}.txt
/usr/local/bin/cpython${PY_VER} -m pip --python ${PREFIX}/bin/python install -U --require-hashes -r ${MY_DIR}/requirements${PY_VER}.txt
else
${PREFIX}/bin/python -m ensurepip
${PREFIX}/bin/python -m pip install -U --require-hashes -r ${MY_DIR}/requirements${PY_VER}.txt
Expand All @@ -40,8 +40,14 @@ fi
# Create a symlink to PREFIX using the ABI_TAG in /opt/python/
ABI_TAG=$(${PREFIX}/bin/python ${MY_DIR}/python-tag-abi-tag.py)
ln -s ${PREFIX} /opt/python/${ABI_TAG}

# Make versioned python commands available directly in environment.
# Don't use symlinks: c.f. https://github.com/python/cpython/issues/106045
cat <<EOF > /usr/local/bin/${PY_IMPL}${PY_VER}${PY_GIL}
#!/bin/sh
exec /opt/python/${ABI_TAG}/bin/python "\$@"
EOF
chmod +x /usr/local/bin/${PY_IMPL}${PY_VER}${PY_GIL}
if [[ "${PY_IMPL}" == "cpython" ]]; then
ln -s ${PREFIX}/bin/python /usr/local/bin/python${PY_VER}${PY_GIL}
ln -s ${PY_IMPL}${PY_VER}${PY_GIL} /usr/local/bin/python${PY_VER}${PY_GIL}
fi
ln -s ${PREFIX}/bin/python /usr/local/bin/${PY_IMPL}${PY_VER}${PY_GIL}