Skip to content

Commit

Permalink
Remove pipx.y symlinks in /usr/local/bin (#1104)
Browse files Browse the repository at this point in the history
For the sake of consistency when we'll add PyPy and given the fact that pipx.y were introduced very recently, remove those those symlinks.
Use `pythonx.y -m pip` instead.
  • Loading branch information
mayeut authored May 23, 2021
1 parent adc51c0 commit de3fa74
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion docker/build_scripts/finalize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ for PREFIX in $(find /opt/_internal/ -mindepth 1 -maxdepth 1 -name 'cpython*');
# Make versioned python commands available directly in environment.
PYVERS=$(${PREFIX}/bin/python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
ln -s ${PREFIX}/bin/python /usr/local/bin/python${PYVERS}
ln -s ${PREFIX}/bin/pip /usr/local/bin/pip${PYVERS}
done

# Create venv for auditwheel & certifi
Expand Down
5 changes: 1 addition & 4 deletions tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@ for PYTHON in /opt/python/*/bin/python; do
# Make sure sqlite3 module can be loaded properly and is the manylinux version one
# c.f. https://github.com/pypa/manylinux/issues/1030
$PYTHON -c 'import sqlite3; print(sqlite3.sqlite_version); assert sqlite3.sqlite_version_info[0:2] >= (3, 34)'
# pythonx.y & pipx.y shall be available directly in PATH
# pythonx.y shall be available directly in PATH
PYVERS=$(${PYTHON} -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
LINK_VERSION=$(python${PYVERS} -V)
REAL_VERSION=$(${PYTHON} -V)
test "${LINK_VERSION}" = "${REAL_VERSION}"
LINK_VERSION=$(pip${PYVERS} -V)
REAL_VERSION=$(${PYTHON} -m pip -V)
test "${LINK_VERSION%% from *}" = "${REAL_VERSION%% from *}"
done

# minimal tests for tools that should be present
Expand Down

0 comments on commit de3fa74

Please sign in to comment.