Skip to content

Commit

Permalink
Merge pull request easybuilders#3014 from boegel/5.0.x_fix_test_suite
Browse files Browse the repository at this point in the history
fix test suite: stop testing with Python 3.5 and Lmod 6.x, stop using `toolchain.DUMMY`
  • Loading branch information
bartoldeman authored Oct 5, 2023
2 parents 8a75581 + 40619f4 commit 387b071
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
modules_tool: [Lmod-6.6.3, Lmod-7.8.22, Lmod-8.1.14, modules-tcl-1.147, modules-3.2.10, modules-4.1.4]
python: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
modules_tool: [Lmod-7.8.22, Lmod-8.1.14, modules-tcl-1.147, modules-3.2.10, modules-4.1.4]
module_syntax: [Lua, Tcl]
# exclude some configuration for non-Lmod modules tool:
# - don't test with Lua module syntax (only supported in Lmod)
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/h/healpix.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def __init__(self, *args, **kwargs):
comp_fam = self.toolchain.comp_family()
if comp_fam == toolchain.INTELCOMP: # @UndefinedVariable
self.target_string = 'linux_icc'
elif comp_fam in [toolchain.DUMMY, toolchain.SYSTEM, toolchain.GCC]: # @UndefinedVariable
elif comp_fam in [toolchain.SYSTEM, toolchain.GCC]: # @UndefinedVariable

self.target_string = self.cfg['gcc_target']

Expand Down

0 comments on commit 387b071

Please sign in to comment.