zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

schema/modules.py: remove lmod props from tcl schema (#49220)

Browse Source
This commit is contained in:
Harmen Stoppels 2025-02-27 10:48:22 +01:00 committed by GitHub
parent 61c54ed28b
commit 5da4f18188
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/spack/spack/schema/modules.py
View File

@ -48,30 +48,33 @@
projections_scheme = spack.schema.projections.properties["projections"] projections_scheme = spack.schema.projections.properties["projections"]
module_type_configuration: Dict = { common_props = {
"verbose": {"type": "boolean", "default": False},
"hash_length": {"type": "integer", "minimum": 0, "default": 7},
"include": array_of_strings,
"exclude": array_of_strings,
"exclude_implicits": {"type": "boolean", "default": False},
"defaults": array_of_strings,
"hide_implicits": {"type": "boolean", "default": False},
"naming_scheme": {"type": "string"},
"projections": projections_scheme,
"all": module_file_configuration,
}
tcl_configuration = {
"type": "object",
"default": {},
"validate_spec": True,
"properties": {**common_props},
"additionalProperties": module_file_configuration,
}
lmod_configuration = {
"type": "object", "type": "object",
"default": {}, "default": {},
"validate_spec": True, "validate_spec": True,
"properties": { "properties": {
"verbose": {"type": "boolean", "default": False}, **common_props,
"hash_length": {"type": "integer", "minimum": 0, "default": 7},
"include": array_of_strings,
"exclude": array_of_strings,
"exclude_implicits": {"type": "boolean", "default": False},
"defaults": array_of_strings,
"hide_implicits": {"type": "boolean", "default": False},
"naming_scheme": {"type": "string"},
"projections": projections_scheme,
"all": module_file_configuration,
},
"additionalProperties": module_file_configuration,
}
tcl_configuration = module_type_configuration.copy()
lmod_configuration = module_type_configuration.copy()
lmod_configuration["properties"].update(
{
"core_compilers": array_of_strings, "core_compilers": array_of_strings,
"hierarchy": array_of_strings, "hierarchy": array_of_strings,
"core_specs": array_of_strings, "core_specs": array_of_strings,
@ -80,8 +83,9 @@
"validate_spec": True, "validate_spec": True,
"additionalProperties": array_of_strings, "additionalProperties": array_of_strings,
}, },
} },
) "additionalProperties": module_file_configuration,
}
module_config_properties = { module_config_properties = {
"use_view": {"anyOf": [{"type": "string"}, {"type": "boolean"}]}, "use_view": {"anyOf": [{"type": "string"}, {"type": "boolean"}]},