Skip to content

Commit

Permalink
Use local copies of get-pip.py for bootstrapping
Browse files Browse the repository at this point in the history
  • Loading branch information
vkarak committed Oct 23, 2024
1 parent 90d6980 commit 805b3dd
Show file tree
Hide file tree
Showing 8 changed files with 88,552 additions and 17 deletions.
19 changes: 6 additions & 13 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,23 +101,16 @@ py_pkg_prefix=external/$(uname -m)
# Install a fresh pip in the current environment
pyver=$(python3 -c 'import sys; print(".".join(str(s) for s in sys.version_info[:2]))')
if [ "$pyver" == "3.6" ]; then
get_pip_url="https://bootstrap.pypa.io/pip/3.6/get-pip.py"
get_pip="$PWD/tools/python/3.6/get-pip.py"
elif [ "$pyver" == "3.7" ]; then
get_pip_url="https://bootstrap.pypa.io/pip/3.7/get-pip.py"
get_pip="$PWD/tools/python/3.7/get-pip.py"
else
get_pip_url="https://bootstrap.pypa.io/get-pip.py"
get_pip="$PWD/tools/python/get-pip.py"
fi

if ! type "curl" > /dev/null 2>&1; then
echo -e "could not find \`curl': please install curl and try again"
exit 1
fi

INFO "curl -s $get_pip_url | $python"
curl -s $get_pip_url | $python

export PATH=$(pwd)/$py_pkg_prefix/usr/bin:$PATH
export PYTHONPATH=$(pwd)/$py_pkg_prefix:$PYTHONPATH
$python $get_pip
export PATH=$PWD/$py_pkg_prefix/usr/bin:$PATH
export PYTHONPATH=$PWD/$py_pkg_prefix:$PYTHONPATH
if [ -n "$PYGELF" ]; then
tmp_requirements=$(mktemp)
sed -e 's/^#+pygelf%//g' requirements.txt > $tmp_requirements
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/eb-spack-howto.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ENV _EB_VER=4.4.1

# Install ReFrame unit test requirements
RUN apt-get -y update && \
apt-get -y install gcc git make python3 python3-pip curl
apt-get -y install gcc git make python3 python3-pip

# ReFrame user
RUN useradd -ms /bin/bash rfmuser
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/reframe-lmod.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM ghcr.io/reframe-hpc/lmod:8.4.12

# Install ReFrame unit test requirements
RUN apt-get -y update && \
apt-get -y install gcc git make python3 python3-pip curl
apt-get -y install gcc git make python3 python3-pip

# ReFrame user
RUN useradd -ms /bin/bash rfmuser
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/reframe-lmod77.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM ghcr.io/reframe-hpc/lmod:7.7

# Install ReFrame unit test requirements
RUN apt-get -y update && \
apt-get -y install gcc make python3 python3-pip curl
apt-get -y install gcc make python3 python3-pip

# ReFrame user
RUN useradd -ms /bin/bash rfmuser
Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/dockerfiles/reframe-tmod4.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM ghcr.io/reframe-hpc/tmod:4.6.0
# ReFrame requirements
RUN \
apt-get -y update && \
apt-get -y install gcc make git python3 python3-pip curl
apt-get -y install gcc make git python3 python3-pip

# ReFrame user
RUN useradd -ms /bin/bash rfmuser
Expand Down
27,079 changes: 27,079 additions & 0 deletions tools/python/3.6/get-pip.py

Large diffs are not rendered by default.

33,038 changes: 33,038 additions & 0 deletions tools/python/3.7/get-pip.py

Large diffs are not rendered by default.

28,425 changes: 28,425 additions & 0 deletions tools/python/get-pip.py

Large diffs are not rendered by default.

0 comments on commit 805b3dd

Please sign in to comment.