Skip to content

Commit 7f960ad

Browse files
committed
Merge branch '5.0.x' into setup-py-no-distutils
2 parents 7371506 + cad3801 commit 7f960ad

File tree

329 files changed

+7515
-3220
lines changed

Some content is hidden

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

329 files changed

+7515
-3220
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/5.0.x.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/5.0.x.tar.gz
7878
7979
- name: run test

.github/workflows/eb_command.yml

Lines changed: 6 additions & 2 deletions
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']
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
@@ -32,6 +32,10 @@ jobs:
3232
# update to latest pip, check version
3333
pip install --upgrade pip
3434
pip --version
35+
if ! python -c "import distutils" 2> /dev/null; then
36+
# we need setuptools for distutils in Python 3.12+, needed for python setup.py sdist
37+
pip install --upgrade setuptools
38+
fi
3539
3640
# for modules tool
3741
APT_PKGS="lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev"
@@ -68,7 +72,7 @@ jobs:
6872
python setup.py sdist
6973
ls dist
7074
export PREFIX=/tmp/$USER/$GITHUB_SHA
71-
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
75+
pip install --prefix $PREFIX dist/easybuild[-_]framework*tar.gz
7276
7377
- name: run tests for 'eb' command
7478
env:

.github/workflows/end2end.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ 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
2021
steps:
2122
- name: Check out the repo
2223
uses: actions/checkout@v3

.github/workflows/linting.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +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']
17-
16+
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
1817
steps:
1918
- uses: actions/checkout@v3
2019

.github/workflows/unit_tests.yml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
runs-on: ubuntu-20.04
1515
outputs:
1616
lmod8: Lmod-8.7.6
17-
modules4: modules-4.1.4
17+
modules4: modules-4.5.3
18+
modules5: modules-5.3.1
1819
steps:
1920
- run: "true"
2021
build:
@@ -28,6 +29,7 @@ jobs:
2829
# https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#needs-context
2930
- ${{needs.setup.outputs.lmod8}}
3031
- ${{needs.setup.outputs.modules4}}
32+
- ${{needs.setup.outputs.modules5}}
3133
lc_all: [""]
3234
include:
3335
# Test different Python 3 versions with Lmod 8.x (with both Lua and Tcl module syntax)
@@ -41,6 +43,10 @@ jobs:
4143
modules_tool: ${{needs.setup.outputs.lmod8}}
4244
- python: '3.11'
4345
modules_tool: ${{needs.setup.outputs.lmod8}}
46+
- python: '3.12'
47+
modules_tool: ${{needs.setup.outputs.lmod8}}
48+
- python: '3.13'
49+
modules_tool: ${{needs.setup.outputs.lmod8}}
4450
# There may be encoding errors in Python 3 which are hidden when an UTF-8 encoding is set
4551
# Hence run the tests (again) with LC_ALL=C and Python 3.6 (or any < 3.7)
4652
- python: 3.6
@@ -83,6 +89,10 @@ jobs:
8389
pip install --upgrade pip
8490
pip --version
8591
pip install -r requirements.txt
92+
if ! python -c "import distutils" 2> /dev/null; then
93+
# we need setuptools for distutils in Python 3.12+, needed for python setup.py sdist
94+
pip install --upgrade setuptools
95+
fi
8696
# git config is required to make actual git commits (cfr. tests for GitRepository)
8797
git config --global user.name "Travis CI"
8898
git config --global user.email "[email protected]"
@@ -95,12 +105,12 @@ jobs:
95105
# and are only run after the PR gets merged
96106
GITHUB_TOKEN: ${{secrets.CI_UNIT_TESTS_GITHUB_TOKEN}}
97107
run: |
98-
# only install GitHub token when testing with Lmod 8.x + Python 3.6 or 3.9, to avoid hitting GitHub rate limit;
108+
# only install GitHub token when testing with Lmod 8.x + Python 3.6 or 3.9, to avoid hitting GitHub rate limit
99109
# tests that require a GitHub token are skipped automatically when no GitHub token is available
100110
if [[ "${{matrix.modules_tool}}" =~ 'Lmod-8' ]] && [[ "${{matrix.python}}" =~ 3.[69] ]]; then
101111
if [ ! -z $GITHUB_TOKEN ]; then
102-
SET_KEYRING="import keyrings.alt.file; keyring.set_keyring(keyrings.alt.file.PlaintextKeyring())";
103-
python -c "import keyring; $SET_KEYRING; keyring.set_password('github_token', 'easybuild_test', '$GITHUB_TOKEN')";
112+
SET_KEYRING="import keyrings.alt.file; keyring.set_keyring(keyrings.alt.file.PlaintextKeyring())"
113+
python -c "import keyring; $SET_KEYRING; keyring.set_password('github_token', 'easybuild_test', '$GITHUB_TOKEN')"
104114
fi
105115
echo "GitHub token installed!"
106116
else
@@ -132,7 +142,7 @@ jobs:
132142
python setup.py sdist
133143
ls dist
134144
export PREFIX=/tmp/$USER/$GITHUB_SHA
135-
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
145+
pip install --prefix $PREFIX dist/easybuild[-_]framework*tar.gz
136146
137147
- name: run test suite
138148
env:
@@ -144,15 +154,17 @@ jobs:
144154
cd $HOME
145155
# initialize environment for modules tool
146156
if [ -f $HOME/moduleshome ]; then export MODULESHOME=$(cat $HOME/moduleshome); fi
147-
source $(cat $HOME/mod_init); type module
157+
source $(cat $HOME/mod_init)
158+
type module
159+
module --version
148160
# make sure 'eb' is available via $PATH, and that $PYTHONPATH is set (some tests expect that);
149161
# also pick up changes to $PATH set by sourcing $MOD_INIT
150162
export PREFIX=/tmp/$USER/$GITHUB_SHA
151163
export PATH=$PREFIX/bin:$(cat $HOME/path)
152164
export PYTHONPATH=$PREFIX/lib/python${{matrix.python}}/site-packages:$PYTHONPATH
153165
eb --version
154166
# tell EasyBuild which modules tool is available
155-
if [[ ${{matrix.modules_tool}} =~ ^modules-4 ]]; then
167+
if [[ ${{matrix.modules_tool}} =~ ^modules- ]]; then
156168
export EASYBUILD_MODULES_TOOL=EnvironmentModules
157169
else
158170
export EASYBUILD_MODULES_TOOL=Lmod
@@ -181,7 +193,17 @@ jobs:
181193
# run test suite
182194
python -O -m test.framework.suite 2>&1 | tee test_framework_suite.log
183195
# try and make sure output of running tests is clean (no printed messages/warnings)
184-
IGNORE_PATTERNS="no GitHub token available|skipping SvnRepository test|requires Lmod as modules tool|stty: 'standard input': Inappropriate ioctl for device|CryptographyDeprecationWarning: Python 3.[56]|from cryptography.* import |CryptographyDeprecationWarning: Python 2|Blowfish|GC3Pie not available, skipping test"
196+
IGNORE_PATTERNS="no GitHub token available"
197+
IGNORE_PATTERNS+="|skipping SvnRepository test"
198+
IGNORE_PATTERNS+="|requires Lmod as modules tool"
199+
IGNORE_PATTERNS+="|stty: 'standard input': Inappropriate ioctl for device"
200+
IGNORE_PATTERNS+="|CryptographyDeprecationWarning: Python 3.[56]"
201+
IGNORE_PATTERNS+="|from cryptography.* import "
202+
IGNORE_PATTERNS+="|CryptographyDeprecationWarning: Python 2"
203+
IGNORE_PATTERNS+="|Blowfish"
204+
IGNORE_PATTERNS+="|GC3Pie not available, skipping test"
205+
IGNORE_PATTERNS+="|CryptographyDeprecationWarning: TripleDES has been moved"
206+
IGNORE_PATTERNS+="|algorithms.TripleDES"
185207
# '|| true' is needed to avoid that GitHub Actions stops the job on non-zero exit of grep (i.e. when there are no matches)
186208
PRINTED_MSG=$(egrep -v "${IGNORE_PATTERNS}" test_framework_suite.log | grep '\.\n*[A-Za-z]' || true)
187209
test "x$PRINTED_MSG" = "x" || (echo "ERROR: Found printed messages in output of test suite" && echo "${PRINTED_MSG}" && exit 1)

RELEASE_NOTES

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,112 @@ 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.4 (22 September 2024)
8+
--------------------------
9+
10+
update/bugfix release
11+
12+
- various enhancements, including:
13+
- set $LMOD_TERSE_DECORATIONS to 'no' to avoid additional info in output produced by 'ml --terse avail' (#4648)
14+
- various bug fixes, including:
15+
- implement workaround for permission error when copying read-only files that have extended attributes set and using Python 3.6 (#4642)
16+
- take into account alternate sysroot for /bin/bash used by run_cmd (#4646)
17+
18+
19+
v4.9.3 (14 September 2024)
20+
--------------------------
21+
22+
update/bugfix release
23+
24+
- various enhancements, including:
25+
- add support for `--extra-source-urls` to fetch sources from additional URLs (#4079)
26+
- add definition for gmpflf toolchain (#4566, #4571)
27+
- reuse pre-computed checksums (#4569)
28+
- add `cuda_cc_space_sep` variant that does not have periods (#4583)
29+
- add `--skip-sanity-check` option (#4590)
30+
- add `GNU_FTP_SOURCE` template constant (#4597)
31+
- improve error messages for empty easyconfigs (#4603)
32+
- improve help string for `--dep-graph` (#4610)
33+
- only call `_sanity_check_step_extensions` if `--skip-extensions` is not set (#4620)
34+
- add support for `--software-commit` and an associated template `%(software_commit)s` (#4628)
35+
- various bug fixes, including:
36+
- correctly evaluate result for `--dep-graph` (#4554)
37+
- fix fetch progress bar showing to many files (#4568)
38+
- resolve internal for imkl>=2021 version subdir via "latest" symlink (#4570)
39+
- fix typo in message about including an easyblock from a commit (#4575)
40+
- don't use special flags for `strict`, `precise`, `loose`, `veryloose` toolchain options on RISC-V (#4576)
41+
- fix help text for `cuda_compute_capabilities` template (#4589)
42+
- fix help message for `--http-headers-fields-urlpat` configuration option (#4594)
43+
- fix `test_compiler_cache` in case `gcc` is available multiple times (#4599)
44+
- handle post-install patches in check_checksums_for (#4605)
45+
- fix `copy_file` with a folder as the target (#4609)
46+
- allow for case where `homepage = None` when generating the docs (#4626)
47+
- fix test_github_det_commit_status by using more recent commits (#4636)
48+
- other changes:
49+
- clean up code that was only there to support Python 2.6 + avoid syntax warnings when parsing py2vs3/py.p2 with Python 3.x (#3788)
50+
- use Intel's oneAPI Fortran compiler by default for version 2024.0.0 and newer (`oneapi_fortran` toolchain option set to `True`) (#4567)
51+
- allow using Node 16 actions in CI (#4574)
52+
- remove a superflous check in `EasyBlock.run_all_steps` (#4623)
53+
- remove trailing dots from backup message produced by --inject-checksums (#4632)
54+
55+
56+
v4.9.2 (12 June 2024)
57+
---------------------
58+
59+
update/bugfix release
60+
61+
- various enhancements, including:
62+
- improve behavior when using extension which has 'nosource' enabled (#4506)
63+
- enhance 'get_software_libdir' to return 'lib' or 'lib64' if only one of them contains library files (#4513)
64+
- implement versions checks to avoid mixing major versions across the EasyBuild components (#4520, #4553)
65+
- add support for easyconfig parameter 'module_only' (#4537)
66+
- various bug fixes, including:
67+
- fix typo in patch_step logging (#4505)
68+
- consider both 'easybuild-framework*.tar.gz' and 'easybuild_framework*.tar.gz' in CI workflows (#4507)
69+
- don't delete existing environment module files when using '--dump-env-script' with '--force' or '--rebuild' (#4512)
70+
- fix resolved (template) values in case of failure (#4532)
71+
- also consider '$CRAY_PE_LIBSCI_PREFIX_DIR' to determine installation prefix for cray-libsci (#4551)
72+
- symlink downloaded repo at specified commit when using '--from-commit' so easyconfigs for dependencies are found (#4552)
73+
- other changes:
74+
- code cleanup in 'easyblock.py' (#4519)
75+
- stop running unit tests on Python 3.5 (#4530)
76+
77+
78+
v4.9.1 (5 April 2024)
79+
---------------------
80+
81+
update/bugfix release
82+
83+
- various enhancements, including:
84+
- make `is_rpath_wrapper` faster by only checking file contents if file is not located in subdirectory of RPATH wrapper subdirectory (#4406)
85+
- add terse support to `--missing-modules` (#4407)
86+
- adapt version pattern for EnvironmentModules to allow using development version (#4416)
87+
- use `--all` option with EnvironmentModules v4.6+ to get available hidden modules (#4417)
88+
- add support for appending to path environment variables via `modextrapaths_append` + add corresponding `allow_append_abs_path` (#4436)
89+
- improve output produced by `--check-github` (#4437)
90+
- add script for updating local git repos with `develop` branch (#4438)
91+
- show error when multiple PR options are passed (#4440)
92+
- improve `findPythonDeps` script to recognize non-canonical package names (#4445)
93+
- add support for `--from-commit` and `--include-easyblocks-from-commit` (#4468)
94+
- improve logging & handling of (empty) `--optarch` values (#4481)
95+
- add `--short` option to `findUpdatedEcs` script (#4488)
96+
- add generic GCC and Clang compiler flags for RISC-V (#4489)
97+
- various bug fixes, including:
98+
- clean up log file of `EasyBlock` instance in `check_sha256_checksums` (#4452)
99+
- fix description of `backup-modules` configuration option (#4456)
100+
- replace `'` with `"` for `printf` in CI workflow for running test suite to have bash replace a variable (#4461)
101+
- use `cp -dR` instead of `cp -a` for shell script "extraction" (#4465)
102+
- fix link to documentation in `close_pr` message (#4466)
103+
- fix `test_github_merge_pr` by using more recent easyconfigs PR (#4470)
104+
- add workaround for 404 error when installing packages in CI workflow for testing Apptainer integration (#4472)
105+
- other changes:
106+
- clean up & speed up environment checks (#4409)
107+
- use more performant and concise dict construction by using dict comprehensions (#4410)
108+
- remove superflous string formatting (#4411)
109+
- clean up uses of `getattr` and `hasattr` (#4412)
110+
- update copyright lines to 2024 (#4494)
111+
112+
7113
v4.9.0 (30 December 2023)
8114
-------------------------
9115

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),

0 commit comments

Comments
 (0)