Skip to content

Commit 91ea34d

Browse files
committed
Use only available Python versions
Not all Python versions are available on every OS. Update to use another Python version or a different OS.
1 parent 467e822 commit 91ea34d

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

.github/workflows/eb_command.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ concurrency:
1111

1212
jobs:
1313
test-eb:
14-
runs-on: ubuntu-24.04
1514
strategy:
1615
matrix:
17-
python: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
16+
python: [3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
17+
os: [ubuntu-24.04]
18+
include:
19+
- python: 3.7
20+
os: ubuntu-22.04
1821
fail-fast: false
22+
runs-on: ${{matrix.os}}
1923
steps:
2024
- uses: actions/checkout@v4
2125

.github/workflows/linting.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,15 @@ concurrency:
1010

1111
jobs:
1212
python-linting:
13-
runs-on: ubuntu-latest
1413
strategy:
1514
matrix:
16-
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
15+
python: [3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
16+
os: [ubuntu-24.04]
17+
include:
18+
- python: 3.7
19+
os: ubuntu-22.04
20+
fail-fast: false
21+
runs-on: ${{matrix.os}}
1722

1823
steps:
1924
- uses: actions/checkout@v4

.github/workflows/unit_tests.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ jobs:
2222
- run: "true"
2323
build:
2424
needs: setup
25-
runs-on: ubuntu-24.04
25+
runs-on: ${{matrix.os}}
2626
strategy:
2727
matrix:
28-
python: [3.6]
28+
os: [ubuntu-22.04]
29+
python: [3.7]
2930
modules_tool:
3031
# use variables defined by 'setup' job above, see also
3132
# https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#needs-context
@@ -37,21 +38,18 @@ jobs:
3738
lc_all: [""]
3839
include:
3940
# Test different Python 3 versions with Lmod 8.x
40-
- python: 3.7
41-
modules_tool: ${{needs.setup.outputs.lmod8}}
4241
- python: 3.8
4342
modules_tool: ${{needs.setup.outputs.lmod8}}
43+
os: ubuntu-24.04
4444
- python: 3.9
4545
modules_tool: ${{needs.setup.outputs.lmod8}}
46+
os: ubuntu-24.04
4647
- python: '3.10'
4748
modules_tool: ${{needs.setup.outputs.lmod8}}
49+
os: ubuntu-24.04
4850
- python: '3.11'
4951
modules_tool: ${{needs.setup.outputs.lmod8}}
50-
# There may be encoding errors in Python 3 which are hidden when an UTF-8 encoding is set
51-
# Hence run the tests (again) with LC_ALL=C and Python 3.6 (or any < 3.7)
52-
- python: 3.6
53-
modules_tool: ${{needs.setup.outputs.lmod8}}
54-
lc_all: C
52+
os: ubuntu-24.04
5553
fail-fast: false
5654
steps:
5755
- uses: actions/checkout@v4
@@ -101,9 +99,9 @@ jobs:
10199
# and are only run after the PR gets merged
102100
GITHUB_TOKEN: ${{secrets.CI_UNIT_TESTS_GITHUB_TOKEN}}
103101
run: |
104-
# only install GitHub token when testing with Lmod 8.x + Python 3.6 or 3.9, to avoid hitting GitHub rate limit
102+
# only install GitHub token when testing with Lmod 8.x + Python 3.7 or 3.9, to avoid hitting GitHub rate limit
105103
# tests that require a GitHub token are skipped automatically when no GitHub token is available
106-
if [[ "${{matrix.modules_tool}}" =~ 'Lmod-8' ]] && [[ "${{matrix.python}}" =~ 3.[69] ]]; then
104+
if [[ "${{matrix.modules_tool}}" =~ 'Lmod-8' ]] && [[ "${{matrix.python}}" =~ 3.[79] ]]; then
107105
if [ ! -z $GITHUB_TOKEN ]; then
108106
SET_KEYRING="import keyrings.alt.file; keyring.set_keyring(keyrings.alt.file.PlaintextKeyring())"
109107
python -c "import keyring; $SET_KEYRING; keyring.set_password('github_token', 'easybuild_test', '$GITHUB_TOKEN')"

0 commit comments

Comments
 (0)