Skip to content

Commit 0c02ded

Browse files
boegelboegel
committed
Merge branch '5.0.x' into job-local-tweak
2 parents d158194 + cde21cb commit 0c02ded

318 files changed

Lines changed: 3813 additions & 1731 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/eb_command.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-20.04
1515
strategy:
1616
matrix:
17-
python: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
17+
python: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
1818
fail-fast: false
1919
steps:
2020
- uses: actions/checkout@v3

‎.github/workflows/end2end.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,17 @@ jobs:
1717
fail-fast: false
1818
container:
1919
image: ghcr.io/easybuilders/${{ matrix.container }}-amd64
20-
env: {ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true} # Allow using Node16 actions
20+
volumes:
21+
- /node20217:/node20217:rw,rshared
22+
- ${{ matrix.container == 'centos-7.9' && '/node20217:/__e/node20:ro,rshared' || ' ' }}
2123
steps:
24+
- name: install nodejs20glibc2.17
25+
if: ${{ matrix.container == 'centos-7.9' }}
26+
run: |
27+
curl -LO https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz
28+
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
2229
- name: Check out the repo
23-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
2431

2532
- name: download and unpack easyblocks and easyconfigs repositories
2633
run: |
@@ -49,6 +56,7 @@ jobs:
4956
"eb --show-system-info"
5057
"eb --check-eb-deps"
5158
"eb --show-config"
59+
"eb -x bzip2-1.0.8.eb"
5260
)
5361
for cmd in "${cmds[@]}"; do
5462
echo ">>> $cmd"

‎.github/workflows/linting.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
strategy:
1515
matrix:
16-
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
16+
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
1717
steps:
1818
- uses: actions/checkout@v3
1919

‎.github/workflows/unit_tests.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
modules_tool: ${{needs.setup.outputs.lmod8}}
4646
- python: '3.12'
4747
modules_tool: ${{needs.setup.outputs.lmod8}}
48+
- python: '3.13'
49+
modules_tool: ${{needs.setup.outputs.lmod8}}
4850
# There may be encoding errors in Python 3 which are hidden when an UTF-8 encoding is set
4951
# Hence run the tests (again) with LC_ALL=C and Python 3.6 (or any < 3.7)
5052
- python: 3.6
@@ -131,7 +133,7 @@ jobs:
131133
run: |
132134
# make sure there are no (top-level) "import setuptools" or "import pkg_resources" statements,
133135
# since EasyBuild should not have a runtime requirement on setuptools
134-
SETUPTOOLS_IMPORTS=$(egrep -RI '^(from|import)[ ]*pkg_resources|^(from|import)[ ]*setuptools' * || true)
136+
SETUPTOOLS_IMPORTS=$(egrep --exclude setup.py -RI '^(from|import)[ ]*pkg_resources|^(from|import)[ ]*setuptools' * || true)
135137
test "x$SETUPTOOLS_IMPORTS" = "x" || (echo "Found setuptools and/or pkg_resources imports in easybuild/:\n${SETUPTOOLS_IMPORTS}" && exit 1)
136138
137139
- name: install sources
@@ -195,7 +197,7 @@ jobs:
195197
IGNORE_PATTERNS+="|skipping SvnRepository test"
196198
IGNORE_PATTERNS+="|requires Lmod as modules tool"
197199
IGNORE_PATTERNS+="|stty: 'standard input': Inappropriate ioctl for device"
198-
IGNORE_PATTERNS+="|CryptographyDeprecationWarning: Python 3.[56]"
200+
IGNORE_PATTERNS+="|CryptographyDeprecationWarning: Python 3.[567]"
199201
IGNORE_PATTERNS+="|from cryptography.* import "
200202
IGNORE_PATTERNS+="|CryptographyDeprecationWarning: Python 2"
201203
IGNORE_PATTERNS+="|Blowfish"

‎easybuild/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##
2-
# Copyright 2011-2024 Ghent University
2+
# Copyright 2011-2025 Ghent University
33
#
44
# This file is part of EasyBuild,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

‎easybuild/base/exceptions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2015-2024 Ghent University
2+
# Copyright 2015-2025 Ghent University
33
#
44
# This file is part of EasyBuild,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

‎easybuild/base/fancylogger.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2011-2024 Ghent University
2+
# Copyright 2011-2025 Ghent University
33
#
44
# This file is part of EasyBuild,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

‎easybuild/base/generaloption.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2011-2024 Ghent University
2+
# Copyright 2011-2025 Ghent University
33
#
44
# This file is part of EasyBuild,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

‎easybuild/base/testing.py‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2014-2024 Ghent University
2+
# Copyright 2014-2025 Ghent University
33
#
44
# This file is part of EasyBuild,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -76,13 +76,6 @@ class TestCase(OrigTestCase):
7676
ASSERT_MAX_DIFF = 100
7777
DIFF_OFFSET = 5 # lines of text around changes
7878

79-
def is_string(self, x):
80-
"""test if the variable x is a string)"""
81-
try:
82-
return isinstance(x, str)
83-
except NameError:
84-
return isinstance(x, str)
85-
8679
# pylint: disable=arguments-differ
8780
def assertEqual(self, a, b, msg=None):
8881
"""Make assertEqual always print useful messages"""
@@ -95,11 +88,11 @@ def assertEqual(self, a, b, msg=None):
9588
else:
9689
msg = "%s: %s" % (msg, e)
9790

98-
if self.is_string(a):
91+
if isinstance(a, str):
9992
txta = a
10093
else:
10194
txta = pprint.pformat(a)
102-
if self.is_string(b):
95+
if isinstance(b, str):
10396
txtb = b
10497
else:
10598
txtb = pprint.pformat(b)
@@ -167,7 +160,7 @@ def assertErrorRegex(self, error, regex, call, *args, **kwargs):
167160
self.fail("Expected errors with %s(%s) call should occur" % (call.__name__, str_args))
168161
except error as err:
169162
msg = self.convert_exception_to_str(err)
170-
if self.is_string(regex):
163+
if isinstance(regex, str):
171164
regex = re.compile(regex)
172165
self.assertTrue(regex.search(msg), "Pattern '%s' is found in '%s'" % (regex.pattern, msg))
173166

‎easybuild/framework/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##
2-
# Copyright 2009-2024 Ghent University
2+
# Copyright 2009-2025 Ghent University
33
#
44
# This file is part of EasyBuild,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

0 commit comments

Comments
 (0)