Merge pull request #3287 from vkarak/packaging/ship-getpip

[packaging] Use local copies of `get-pip.py` for bootstrapping

Author: vkarak

.github/workflows/test-flux.yaml

@@ -28,8 +28,8 @@ jobs:
 
       - name: Install Reframe
         run: |
-          apt-get update && apt-get install -y python3-pip curl
-          /bin/bash ./bootstrap.sh
+          apt-get update && apt-get install -y python3-pip
+          ./bootstrap.sh
           export PATH=$PWD/bin:$PATH
           which reframe
 

.github/workflows/test-schedulers.yaml

@@ -19,6 +19,6 @@ jobs:
     - name: Build Images
       run: |
         docker compose -f .github/pseudo-cluster/docker-compose.yml build
-    - name: Run Unittests with ${{ matrix.scheduler }} sceduler
+    - name: Run Unittests with ${{ matrix.scheduler }} scheduler
       run: |
         BACKEND=${{ matrix.scheduler }} docker compose -f .github/pseudo-cluster/docker-compose.yml up --abort-on-container-exit --exit-code-from frontend

bootstrap.sh

@@ -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

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

@@ -5,8 +5,8 @@
 
 FROM ghcr.io/reframe-hpc/lmod:8.4.12
 
-ENV _SPACK_VER=0.16
-ENV _EB_VER=4.4.1
+ENV _SPACK_VER=0.22.2
+ENV _EB_VER=4.9.4
 
 
 # Install ReFrame unit test requirements
@@ -19,7 +19,7 @@ RUN useradd -ms /bin/bash rfmuser
 USER rfmuser
 
 # Install Spack
-RUN git clone --branch releases/v${_SPACK_VER} https://github.com/spack/spack ~/spack && \
+RUN git clone --branch v${_SPACK_VER} https://github.com/spack/spack ~/spack && \
     cd ~/spack
 
 RUN pip3 install easybuild==${_EB_VER}

ci-scripts/dockerfiles/reframe-lmod.dockerfile

@@ -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

ci-scripts/dockerfiles/reframe-lmod77.dockerfile

@@ -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

ci-scripts/dockerfiles/reframe-tmod4.dockerfile

@@ -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

reframe/frontend/autodetect.py

@@ -47,7 +47,8 @@ def __enter__(self):
         self._workdir = os.path.abspath(
             tempfile.mkdtemp(prefix='rfm.', dir=self._prefix)
         )
-        paths = ['bin/', 'reframe/', 'bootstrap.sh', 'requirements.txt']
+        paths = ['bin/', 'reframe/', 'tools/',
+                 'bootstrap.sh', 'requirements.txt']
         use_pip = False
         try:
             for p in paths: