Skip to content

Commit f378bac

Browse files
authored
Merge pull request #4267 from boegel/rip_python27
stop running tests with Python 2.7 since it is no longer supported in GitHub Actions
2 parents e2b1c49 + f0b2d4d commit f378bac

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

.github/workflows/container_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ubuntu-22.04
1515
strategy:
1616
matrix:
17-
python: [2.7, 3.7]
17+
python: [3.7]
1818
fail-fast: false
1919
steps:
2020
- uses: actions/checkout@v3
2121

2222
- name: set up Python
23-
uses: actions/setup-python@v3
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: ${{matrix.python}}
2626
architecture: x64

.github/workflows/container_tests_apptainer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
runs-on: ubuntu-22.04
1515
strategy:
1616
matrix:
17-
python: [2.7, 3.7]
17+
python: [3.7]
1818
apptainer: [1.0.0, 1.1.7]
1919
fail-fast: false
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222

2323
- name: set up Python
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v3
2525
with:
2626
python-version: ${{matrix.python}}
2727
architecture: x64

.github/workflows/eb_command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ubuntu-20.04
1515
strategy:
1616
matrix:
17-
python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
17+
python: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
1818
fail-fast: false
1919
steps:
2020
- uses: actions/checkout@v3
2121

2222
- name: set up Python
23-
uses: actions/setup-python@v3
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: ${{matrix.python}}
2626
architecture: x64

.github/workflows/linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
strategy:
1515
matrix:
16-
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
16+
python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
1717

1818
steps:
1919
- uses: actions/checkout@v3
2020

2121
- name: set up Python
22-
uses: actions/setup-python@v3
22+
uses: actions/setup-python@v4
2323
with:
2424
python-version: ${{ matrix.python-version }}
2525

.github/workflows/unit_tests.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-20.04
2626
strategy:
2727
matrix:
28-
python: [2.7, 3.6]
28+
python: [3.6]
2929
modules_tool:
3030
# use variables defined by 'setup' job above, see also
3131
# https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#needs-context
@@ -81,7 +81,7 @@ jobs:
8181
- uses: actions/checkout@v3
8282

8383
- name: set up Python
84-
uses: actions/setup-python@v3
84+
uses: actions/setup-python@v4
8585
with:
8686
python-version: ${{matrix.python}}
8787
architecture: x64
@@ -207,10 +207,6 @@ jobs:
207207
# create file owned by root but writable by anyone (used by test_copy_file)
208208
sudo touch /tmp/file_to_overwrite_for_easybuild_test_copy_file.txt
209209
sudo chmod o+w /tmp/file_to_overwrite_for_easybuild_test_copy_file.txt
210-
# silence deprecation warning when using Python 2, since it breaks a bunch of tests
211-
if [ "${{matrix.python}}" == '2.7' ]; then
212-
export TEST_EASYBUILD_SILENCE_DEPRECATION_WARNINGS=python2
213-
fi
214210
# run test suite
215211
python -O -m test.framework.suite 2>&1 | tee test_framework_suite.log
216212
# try and make sure output of running tests is clean (no printed messages/warnings)

0 commit comments

Comments
 (0)