Skip to content

Commit 805b3dd

Browse files
committed
Use local copies of get-pip.py for bootstrapping
1 parent 90d6980 commit 805b3dd

File tree

8 files changed

+88552
-17
lines changed

8 files changed

+88552
-17
lines changed

bootstrap.sh

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,23 +101,16 @@ py_pkg_prefix=external/$(uname -m)
101101
# Install a fresh pip in the current environment
102102
pyver=$(python3 -c 'import sys; print(".".join(str(s) for s in sys.version_info[:2]))')
103103
if [ "$pyver" == "3.6" ]; then
104-
get_pip_url="https://bootstrap.pypa.io/pip/3.6/get-pip.py"
104+
get_pip="$PWD/tools/python/3.6/get-pip.py"
105105
elif [ "$pyver" == "3.7" ]; then
106-
get_pip_url="https://bootstrap.pypa.io/pip/3.7/get-pip.py"
106+
get_pip="$PWD/tools/python/3.7/get-pip.py"
107107
else
108-
get_pip_url="https://bootstrap.pypa.io/get-pip.py"
108+
get_pip="$PWD/tools/python/get-pip.py"
109109
fi
110110

111-
if ! type "curl" > /dev/null 2>&1; then
112-
echo -e "could not find \`curl': please install curl and try again"
113-
exit 1
114-
fi
115-
116-
INFO "curl -s $get_pip_url | $python"
117-
curl -s $get_pip_url | $python
118-
119-
export PATH=$(pwd)/$py_pkg_prefix/usr/bin:$PATH
120-
export PYTHONPATH=$(pwd)/$py_pkg_prefix:$PYTHONPATH
111+
$python $get_pip
112+
export PATH=$PWD/$py_pkg_prefix/usr/bin:$PATH
113+
export PYTHONPATH=$PWD/$py_pkg_prefix:$PYTHONPATH
121114
if [ -n "$PYGELF" ]; then
122115
tmp_requirements=$(mktemp)
123116
sed -e 's/^#+pygelf%//g' requirements.txt > $tmp_requirements

ci-scripts/dockerfiles/eb-spack-howto.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV _EB_VER=4.4.1
1111

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

1616
# ReFrame user
1717
RUN useradd -ms /bin/bash rfmuser

ci-scripts/dockerfiles/reframe-lmod.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM ghcr.io/reframe-hpc/lmod:8.4.12
77

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

1212
# ReFrame user
1313
RUN useradd -ms /bin/bash rfmuser

ci-scripts/dockerfiles/reframe-lmod77.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM ghcr.io/reframe-hpc/lmod:7.7
77

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

1212
# ReFrame user
1313
RUN useradd -ms /bin/bash rfmuser

ci-scripts/dockerfiles/reframe-tmod4.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM ghcr.io/reframe-hpc/tmod:4.6.0
88
# ReFrame requirements
99
RUN \
1010
apt-get -y update && \
11-
apt-get -y install gcc make git python3 python3-pip curl
11+
apt-get -y install gcc make git python3 python3-pip
1212

1313
# ReFrame user
1414
RUN useradd -ms /bin/bash rfmuser

tools/python/3.6/get-pip.py

Lines changed: 27079 additions & 0 deletions
Large diffs are not rendered by default.

tools/python/3.7/get-pip.py

Lines changed: 33038 additions & 0 deletions
Large diffs are not rendered by default.

tools/python/get-pip.py

Lines changed: 28425 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)