Skip to content

Commit 006ee91

Browse files
vkarakvkarak
committed
Remove support for Python < 3.9
1 parent 07ff6b3 commit 006ee91

29 files changed

+114
-343
lines changed

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
10+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
1111
steps:
1212
- uses: actions/checkout@v4
1313
- name: Set up Python ${{ matrix.python-version }}
@@ -24,28 +24,11 @@ jobs:
2424
- name: Upload coverage reports
2525
uses: codecov/codecov-action@v4.2.0
2626

27-
unittest-py-eol:
28-
runs-on: ubuntu-latest
29-
strategy:
30-
matrix:
31-
python-version: ['3.6', '3.7']
32-
steps:
33-
- uses: actions/checkout@v4
34-
- name: Build Image for Python ${{ matrix.python-version }}
35-
run: |
36-
docker build --build-arg PYTHON_VERSION=${{ matrix.python-version }} -f ci-scripts/dockerfiles/reframe-python.dockerfile -t reframe-python${{ matrix.python-version }}:latest .
37-
- name: Run Unittests
38-
run: |
39-
docker run --name reframe-python${{ matrix.python-version }} reframe-python${{ matrix.python-version }}:latest
40-
docker cp reframe-python${{ matrix.python-version }}:/home/rfmuser/reframe/coverage.xml .
41-
- name: Upload coverage reports
42-
uses: codecov/codecov-action@v4.2.0
43-
4427
unittest-macos:
4528
runs-on: macos-latest
4629
strategy:
4730
matrix:
48-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
31+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
4932
steps:
5033
- uses: actions/checkout@v4
5134
- name: Set up Python ${{ matrix.python-version }}
@@ -66,7 +49,7 @@ jobs:
6649
runs-on: ubuntu-latest
6750
strategy:
6851
matrix:
69-
modules-version: [lmod, lmod77, tmod32, tmod4]
52+
modules-version: [lmod, envmodules]
7053
steps:
7154
- uses: actions/checkout@v4
7255
- name: Login to GitHub Container Registry
@@ -121,7 +104,7 @@ jobs:
121104
runs-on: ubuntu-latest
122105
strategy:
123106
matrix:
124-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
107+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
125108
steps:
126109
- uses: actions/checkout@v4
127110
- name: Setup up Python ${{ matrix.python-version }}
@@ -144,7 +127,7 @@ jobs:
144127
runs-on: ubuntu-latest
145128
strategy:
146129
matrix:
147-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
130+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
148131
steps:
149132
- uses: actions/checkout@v4
150133
- name: Set up Python ${{ matrix.python-version }}

‎.github/workflows/test-flux.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
container: ['fluxrm/flux-sched:focal']
13+
container: ['fluxrm/flux-sched:noble']
1414

1515
container:
1616
image: ${{ matrix.container }}
@@ -30,7 +30,6 @@ jobs:
3030
run: |
3131
apt-get update && apt-get install -y python3-pip
3232
./bootstrap.sh
33-
pip install pytest-cov
3433
export PATH=$PWD/bin:$PATH
3534
which reframe
3635

‎ci-scripts/dockerfiles/Lmod.dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
ENV TZ=Europe/Zurich
44
ENV DEBIAN_FRONTEND=noninteractive
5-
ENV _LMOD_VER=8.4.12
5+
ENV _LMOD_VER=9.0.4
66

77
# Setup apt
88
RUN \
@@ -11,7 +11,7 @@ RUN \
1111
update-ca-certificates
1212

1313
# Required utilities
14-
RUN apt-get -y install wget
14+
RUN apt-get -y install bc wget
1515

1616
# Install Lmod
1717
RUN \

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#
44

55

6-
FROM ghcr.io/reframe-hpc/lmod:8.4.12
6+
FROM ghcr.io/reframe-hpc/lmod:9.0.4
77

8-
ENV _SPACK_VER=0.22.2
9-
ENV _EB_VER=4.9.4
8+
ENV _SPACK_VER=1.1.0
9+
ENV _EB_VER=5.1.2
1010

1111

1212
# Install ReFrame unit test requirements
@@ -22,7 +22,7 @@ USER rfmuser
2222
RUN git clone --branch v${_SPACK_VER} https://github.com/spack/spack ~/spack && \
2323
cd ~/spack
2424

25-
RUN pip3 install easybuild==${_EB_VER}
25+
RUN pip3 install --break-system-packages easybuild==${_EB_VER}
2626

2727
ENV PATH="/home/rfmuser/.local/bin:${PATH}"
2828

@@ -35,6 +35,6 @@ RUN ./bootstrap.sh
3535

3636
RUN echo '. /usr/local/lmod/lmod/init/profile && . /home/rfmuser/spack/share/spack/setup-env.sh' > /home/rfmuser/setup.sh
3737

38-
ENV BASH_ENV /home/rfmuser/setup.sh
38+
ENV BASH_ENV=/home/rfmuser/setup.sh
3939

40-
CMD ["/bin/bash", "-c", "./bin/reframe --system=tutorialsys -r -C examples/tutorial/config/baseline_modules.py -R -c examples/tutorial/easybuild/eb_test.py -c examples/tutorial/spack/spack_test.py"]
40+
CMD ["/bin/bash", "-c", "./bin/reframe --system=tutorialsys --exec-policy=serial -r -C examples/tutorial/config/baseline_modules.py -R -c examples/tutorial/easybuild/eb_test.py -c examples/tutorial/spack/spack_test.py"]

ci-scripts/dockerfiles/Tmod4.dockerfile renamed to ci-scripts/dockerfiles/envmodules.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
ENV TZ=Europe/Zurich
44
ENV DEBIAN_FRONTEND=noninteractive
5-
ENV _TMOD_VER=4.6.0
5+
ENV _TMOD_VER=5.6.1
66

77
# Setup apt
88
RUN \

ci-scripts/dockerfiles/reframe-tmod4.dockerfile renamed to ci-scripts/dockerfiles/reframe-envmodules.dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Execute this from the top-level ReFrame source directory
33
#
44

5-
FROM ghcr.io/reframe-hpc/tmod:4.6.0
5+
FROM ghcr.io/reframe-hpc/envmodules:5.6.1
66

77

88
# ReFrame requirements
@@ -21,6 +21,5 @@ COPY --chown=rfmuser . /home/rfmuser/reframe/
2121
WORKDIR /home/rfmuser/reframe
2222

2323
RUN ./bootstrap.sh
24-
RUN pip install pytest-cov
2524

2625
CMD ["/bin/bash", "-c", "./test_reframe.py --cov=reframe --cov-report=xml --rfm-user-config=ci-scripts/configs/tmod4.py"]

‎ci-scripts/dockerfiles/reframe-lmod.dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55

6-
FROM ghcr.io/reframe-hpc/lmod:8.4.12
6+
FROM ghcr.io/reframe-hpc/lmod:9.0.4
77

88
# Install ReFrame unit test requirements
99
RUN apt-get -y update && \
@@ -20,6 +20,5 @@ COPY --chown=rfmuser . /home/rfmuser/reframe/
2020
WORKDIR /home/rfmuser/reframe
2121

2222
RUN ./bootstrap.sh
23-
RUN pip install pytest-cov
2423

2524
CMD ["/bin/bash", "-c", "./test_reframe.py --cov=reframe --cov-report=xml --rfm-user-config=ci-scripts/configs/lmod.py"]

‎ci-scripts/dockerfiles/reframe-lmod77.dockerfile‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎ci-scripts/dockerfiles/reframe-python.dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55

6-
ARG PYTHON_VERSION=3.6
6+
ARG PYTHON_VERSION=3.9
77

88
FROM docker.io/python:${PYTHON_VERSION}
99

@@ -18,6 +18,5 @@ COPY --chown=rfmuser . /home/rfmuser/reframe/
1818
WORKDIR /home/rfmuser/reframe
1919

2020
RUN ./bootstrap.sh +docs
21-
RUN pip install pytest-cov
2221

2322
CMD ["/bin/bash", "-c", "./test_reframe.py --cov=reframe --cov-report=xml"]

‎ci-scripts/dockerfiles/reframe-tmod32.dockerfile‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)