Skip to content

Commit 9218551

Browse files
author
Samuel Moors
committed
Merge branch 'develop' into data
2 parents 2448db5 + a9ef0d2 commit 9218551

File tree

315 files changed

+1232
-593
lines changed

Some content is hidden

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

315 files changed

+1232
-593
lines changed

.github/workflows/container_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
python setup.py sdist
7474
ls dist
7575
export PREFIX=/tmp/$USER/$GITHUB_SHA
76-
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
76+
pip install --prefix $PREFIX dist/easybuild[-_]framework*tar.gz
7777
pip install --prefix $PREFIX https://github.com/easybuilders/easybuild-easyblocks/archive/develop.tar.gz
7878
7979
- name: run test

.github/workflows/container_tests_apptainer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
python setup.py sdist
7474
ls dist
7575
export PREFIX=/tmp/$USER/$GITHUB_SHA
76-
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
76+
pip install --prefix $PREFIX dist/easybuild[-_]framework*tar.gz
7777
pip install --prefix $PREFIX https://github.com/easybuilders/easybuild-easyblocks/archive/develop.tar.gz
7878
7979
- name: run test

.github/workflows/eb_command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
python setup.py sdist
6969
ls dist
7070
export PREFIX=/tmp/$USER/$GITHUB_SHA
71-
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
71+
pip install --prefix $PREFIX dist/easybuild[-_]framework*tar.gz
7272
7373
- name: run tests for 'eb' command
7474
env:

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
python setup.py sdist
141141
ls dist
142142
export PREFIX=/tmp/$USER/$GITHUB_SHA
143-
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
143+
pip install --prefix $PREFIX dist/easybuild[-_]framework*tar.gz
144144
145145
- name: run test suite
146146
env:

RELEASE_NOTES

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,41 @@ For more detailed information, please see the git log.
44
These release notes can also be consulted at https://easybuild.readthedocs.io/en/latest/Release_notes.html.
55

66

7+
v4.9.1 (5 April 2024)
8+
---------------------
9+
10+
update/bugfix release
11+
12+
- various enhancements, including:
13+
- make `is_rpath_wrapper` faster by only checking file contents if file is not located in subdirectory of RPATH wrapper subdirectory (#4406)
14+
- add terse support to `--missing-modules` (#4407)
15+
- adapt version pattern for EnvironmentModules to allow using development version (#4416)
16+
- use `--all` option with EnvironmentModules v4.6+ to get available hidden modules (#4417)
17+
- add support for appending to path environment variables via `modextrapaths_append` + add corresponding `allow_append_abs_path` (#4436)
18+
- improve output produced by `--check-github` (#4437)
19+
- add script for updating local git repos with `develop` branch (#4438)
20+
- show error when multiple PR options are passed (#4440)
21+
- improve `findPythonDeps` script to recognize non-canonical package names (#4445)
22+
- add support for `--from-commit` and `--include-easyblocks-from-commit` (#4468)
23+
- improve logging & handling of (empty) `--optarch` values (#4481)
24+
- add `--short` option to `findUpdatedEcs` script (#4488)
25+
- add generic GCC and Clang compiler flags for RISC-V (#4489)
26+
- various bug fixes, including:
27+
- clean up log file of `EasyBlock` instance in `check_sha256_checksums` (#4452)
28+
- fix description of `backup-modules` configuration option (#4456)
29+
- replace `'` with `"` for `printf` in CI workflow for running test suite to have bash replace a variable (#4461)
30+
- use `cp -dR` instead of `cp -a` for shell script "extraction" (#4465)
31+
- fix link to documentation in `close_pr` message (#4466)
32+
- fix `test_github_merge_pr` by using more recent easyconfigs PR (#4470)
33+
- add workaround for 404 error when installing packages in CI workflow for testing Apptainer integration (#4472)
34+
- other changes:
35+
- clean up & speed up environment checks (#4409)
36+
- use more performant and concise dict construction by using dict comprehensions (#4410)
37+
- remove superflous string formatting (#4411)
38+
- clean up uses of `getattr` and `hasattr` (#4412)
39+
- update copyright lines to 2024 (#4494)
40+
41+
742
v4.9.0 (30 December 2023)
843
-------------------------
944

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-2023 Ghent University
2+
# Copyright 2011-2024 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-2023 Ghent University
2+
# Copyright 2015-2024 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: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2011-2023 Ghent University
2+
# Copyright 2011-2024 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),
@@ -147,10 +147,10 @@ def _env_to_boolean(varname, default=False):
147147
>>> _env_to_boolean('NO_FOOBAR')
148148
False
149149
"""
150-
if varname not in os.environ:
150+
try:
151+
return os.environ[varname].lower() in ('1', 'yes', 'true', 'y')
152+
except KeyError:
151153
return default
152-
else:
153-
return os.environ.get(varname).lower() in ('1', 'yes', 'true', 'y')
154154

155155

156156
OPTIMIZED_ANSWER = "not available in optimized mode"
@@ -911,16 +911,15 @@ def resetroot():
911911
_default_logTo = None
912912
if 'FANCYLOG_SERVER' in os.environ:
913913
server = os.environ['FANCYLOG_SERVER']
914-
port = DEFAULT_UDP_PORT
915914
if ':' in server:
916915
server, port = server.split(':')
916+
else:
917+
port = DEFAULT_UDP_PORT
917918

918919
# maybe the port was specified in the FANCYLOG_SERVER_PORT env var. this takes precedence
919-
if 'FANCYLOG_SERVER_PORT' in os.environ:
920-
port = int(os.environ['FANCYLOG_SERVER_PORT'])
921-
port = int(port)
920+
port = os.environ.get('FANCYLOG_SERVER_PORT', port)
922921

923-
logToUDP(server, port)
922+
logToUDP(server, int(port))
924923
_default_logTo = logToUDP
925924
else:
926925
# log to screen by default

easybuild/base/generaloption.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2011-2023 Ghent University
2+
# Copyright 2011-2024 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),
@@ -199,7 +199,8 @@ class ExtOption(CompleterOption):
199199
ALWAYS_TYPED_ACTIONS = Option.ALWAYS_TYPED_ACTIONS + EXTOPTION_EXTRA_OPTIONS
200200

201201
TYPE_STRLIST = ['%s%s' % (name, klass) for klass in ['list', 'tuple'] for name in ['str', 'path']]
202-
TYPE_CHECKER = dict([(x, check_str_list_tuple) for x in TYPE_STRLIST] + list(Option.TYPE_CHECKER.items()))
202+
TYPE_CHECKER = {x: check_str_list_tuple for x in TYPE_STRLIST}
203+
TYPE_CHECKER.update(Option.TYPE_CHECKER)
203204
TYPES = tuple(TYPE_STRLIST + list(Option.TYPES))
204205
BOOLEAN_ACTIONS = ('store_true', 'store_false',) + EXTOPTION_LOG
205206

@@ -807,7 +808,7 @@ def get_env_options(self):
807808
epilogprefixtxt += "eg. --some-opt is same as setting %(prefix)s_SOME_OPT in the environment."
808809
self.epilog.append(epilogprefixtxt % {'prefix': self.envvar_prefix})
809810

810-
candidates = dict([(k, v) for k, v in os.environ.items() if k.startswith("%s_" % self.envvar_prefix)])
811+
candidates = {k: v for k, v in os.environ.items() if k.startswith("%s_" % self.envvar_prefix)}
811812

812813
for opt in self._get_all_options():
813814
if opt._long_opts is None:

easybuild/base/testing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2014-2023 Ghent University
2+
# Copyright 2014-2024 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)