File tree Expand file tree Collapse file tree 8 files changed +88552
-17
lines changed Expand file tree Collapse file tree 8 files changed +88552
-17
lines changed Original file line number Diff line number Diff line change @@ -101,23 +101,16 @@ py_pkg_prefix=external/$(uname -m)
101101# Install a fresh pip in the current environment
102102pyver=$( python3 -c ' import sys; print(".".join(str(s) for s in sys.version_info[:2]))' )
103103if [ " $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"
105105elif [ " $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"
107107else
108- get_pip_url= " https://bootstrap.pypa.io /get-pip.py"
108+ get_pip= " $PWD /tools/python /get-pip.py"
109109fi
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
121114if [ -n " $PYGELF " ]; then
122115 tmp_requirements=$( mktemp)
123116 sed -e ' s/^#+pygelf%//g' requirements.txt > $tmp_requirements
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ ENV _EB_VER=4.4.1
1111
1212# Install ReFrame unit test requirements
1313RUN 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
1717RUN useradd -ms /bin/bash rfmuser
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ FROM ghcr.io/reframe-hpc/lmod:8.4.12
77
88# Install ReFrame unit test requirements
99RUN 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
1313RUN useradd -ms /bin/bash rfmuser
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ FROM ghcr.io/reframe-hpc/lmod:7.7
77
88# Install ReFrame unit test requirements
99RUN 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
1313RUN useradd -ms /bin/bash rfmuser
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ FROM ghcr.io/reframe-hpc/tmod:4.6.0
88# ReFrame requirements
99RUN \
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
1414RUN useradd -ms /bin/bash rfmuser
Load Diff Large diffs are not rendered by default.
Load Diff Large diffs are not rendered by default.
Load Diff Large diffs are not rendered by default.
You can’t perform that action at this time.
0 commit comments