Skip to content

Commit 1cc34b4

Browse files
committed
Merge branch 'develop' of https://github.com/easybuilders/easybuild-easyconfigs into 20251204194529_new_pr_Braindecode120
2 parents cb5155f + f02bfd0 commit 1cc34b4

2,395 files changed

Lines changed: 54855 additions & 63259 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/tagbot.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,13 @@ def pr_ecs(pr_diff):
159159
'2025.2.0': '2025b',
160160
}
161161

162-
toolchain_names = ['foss', 'gompi', 'gfbf', 'iimpi', 'iimkl', 'intel']
162+
llvm_tc_gen_map = {
163+
'20.1.5': '2023b',
164+
'20.1.8': '2025b',
165+
}
166+
167+
toolchain_names = ['foss', 'gompi', 'gfbf', 'iimpi', 'iimkl', 'intel', 'llvm-compilers', 'lfbf',
168+
'lompi', 'lmpich', 'lfoss', 'lmpflf']
163169
toolchain_present = {}
164170
for toolchain_ver in gcc_tc_gen_map.values():
165171
toolchain_present[toolchain_ver] = False
@@ -176,6 +182,10 @@ def pr_ecs(pr_diff):
176182
if f"-intel-compilers-{intel_version}" in file_path:
177183
toolchain_present[toolchain_version] = True
178184
continue
185+
for llvm_version, toolchain_version in llvm_tc_gen_map.items():
186+
if f"-llvm-compilers-{llvm_version}" in file_path:
187+
toolchain_present[toolchain_version] = True
188+
continue
179189
# Check for common toolchains with our toolchain naming
180190
for toolchain_version in gcc_tc_gen_map.values():
181191
if any(f"-{toolchain_name}-{toolchain_version}" in file_path for toolchain_name in toolchain_names):

.github/workflows/unit_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
strategy:
1515
matrix:
16-
python: ['3.7', '3.11']
16+
python: ['3.11'] #['3.7', '3.11']
1717
modules_tool: [Lmod-8.6.8]
18-
module_syntax: [Lua, Tcl]
18+
module_syntax: [Lua] #[Lua, Tcl]
1919
fail-fast: false
2020
steps:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2

RELEASE_NOTES

Lines changed: 251 additions & 2 deletions
Large diffs are not rendered by default.

contrib/easyconfig-templates/2022a/CMakeMake-python-extension-github.eb.tmpl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ dependencies = [
2525
]
2626

2727
exts_defaultclass = 'PythonPackage'
28-
exts_default_options = {
29-
'source_urls': [PYPI_SOURCE],
30-
'download_dep_fail': True,
31-
'sanity_pip_check': True,
32-
}
3328
exts_list = [
3429
('python_dependency', '0.0.0', {
3530
}),
@@ -48,6 +43,4 @@ sanity_check_commands = [
4843
"python -c 'import %(namelower)s'",
4944
]
5045

51-
modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
52-
5346
moduleclass = 'module_class'

contrib/easyconfig-templates/2023a/CMakeMake-python-extension-github.eb.tmpl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ dependencies = [
2525
]
2626

2727
exts_defaultclass = 'PythonPackage'
28-
exts_default_options = {
29-
'source_urls': [PYPI_SOURCE],
30-
'download_dep_fail': True,
31-
'sanity_pip_check': True,
32-
}
3328
exts_list = [
3429
('python_dependency', '0.0.0', {
3530
}),
@@ -48,6 +43,4 @@ sanity_check_commands = [
4843
"python -c 'import %(namelower)s'",
4944
]
5045

51-
modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
52-
5346
moduleclass = 'module_class'

contrib/easyconfig-templates/2024a/CMakeMake-python-extension-github.eb.tmpl

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Template for CMakeMake package with PythonPackage extensions in gfbf 2023a
1+
# Template for CMakeMake package with PythonPackage extensions in gfbf 2024a
22
easyblock = 'CMakeMake'
33

44
name = 'SoftwareName'
@@ -9,27 +9,22 @@ description = """
99
Description in 80 chars long column
1010
"""
1111

12-
toolchain = {'name': 'gfbf', 'version': '2023a'}
12+
toolchain = {'name': 'gfbf', 'version': '2024a'}
1313

1414
github_account = 'gh_account'
1515
source_urls = [GITHUB_SOURCE]
1616
sources = [{'download_filename': '%(version)s.tar.gz', 'filename': SOURCE_TAR_GZ}]
1717

1818
builddependencies = [
19-
('CMake', '3.29.3'),
19+
('CMake', '3.31.8'),
2020
]
2121

2222
dependencies = [
23-
('CMake', '3.12.3'),
24-
('SciPy-bundle', '2023.07'),
23+
('Python', '3.12.3'),
24+
('SciPy-bundle', '2024.05'),
2525
]
2626

2727
exts_defaultclass = 'PythonPackage'
28-
exts_default_options = {
29-
'source_urls': [PYPI_SOURCE],
30-
'download_dep_fail': True,
31-
'sanity_pip_check': True,
32-
}
3328
exts_list = [
3429
('python_dependency', '0.0.0', {
3530
}),
@@ -48,6 +43,4 @@ sanity_check_commands = [
4843
"python -c 'import %(namelower)s'",
4944
]
5045

51-
modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
52-
5346
moduleclass = 'module_class'

easybuild/easyconfigs/a/ABINIT/ABINIT-9.4.2-foss-2021a.eb

Lines changed: 0 additions & 70 deletions
This file was deleted.

easybuild/easyconfigs/a/ABINIT/ABINIT-9.4.2-intel-2021a.eb

Lines changed: 0 additions & 73 deletions
This file was deleted.

easybuild/easyconfigs/a/ABINIT/ABINIT-9.6.2-intel-2021a.eb

Lines changed: 0 additions & 73 deletions
This file was deleted.

easybuild/easyconfigs/a/ABRicate/ABRicate-1.0.0-gompi-2021a.eb

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)