Skip to content

Commit 099fc5b

Browse files
committed
Allow dicts of checksums outside of other dicts for backwards compatibility
Not sure if that makes sense but at least for EB 4.x we need this.
1 parent 86ec6d0 commit 099fc5b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

easybuild/framework/easyconfig/types.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,11 +631,15 @@ def ensure_iterable_license_specs(specs):
631631
'key_types': [str],
632632
}
633633
))
634+
# At the top-level we allow tuples/lists containing a dict
635+
CHECKSUM_LIST_W_DICT = (list, as_hashable({'elem_types': [str, CHECKSUM_AND_TYPE, CHECKSUM_DICT]}))
636+
CHECKSUM_TUPLE_W_DICT = (tuple, as_hashable({'elem_types': [str, CHECKSUM_AND_TYPE, CHECKSUM_DICT]}))
634637

635638
CHECKSUMS = (list, as_hashable({'elem_types': [type(None), str, CHECKSUM_AND_TYPE,
636-
CHECKSUM_LIST, CHECKSUM_TUPLE, CHECKSUM_DICT]}))
639+
CHECKSUM_LIST_W_DICT, CHECKSUM_TUPLE_W_DICT, CHECKSUM_DICT]}))
637640

638-
CHECKABLE_TYPES = [CHECKSUM_AND_TYPE, CHECKSUM_LIST, CHECKSUM_TUPLE, CHECKSUM_DICT, CHECKSUMS,
641+
CHECKABLE_TYPES = [CHECKSUM_AND_TYPE, CHECKSUM_LIST, CHECKSUM_TUPLE,
642+
CHECKSUM_LIST_W_DICT, CHECKSUM_TUPLE_W_DICT, CHECKSUM_DICT, CHECKSUMS,
639643
DEPENDENCIES, DEPENDENCY_DICT, LIST_OF_STRINGS,
640644
SANITY_CHECK_PATHS_DICT, SANITY_CHECK_PATHS_ENTRY, STRING_DICT, STRING_OR_TUPLE_LIST,
641645
STRING_OR_TUPLE_DICT, STRING_OR_TUPLE_OR_DICT_LIST, TOOLCHAIN_DICT, TUPLE_OF_STRINGS]

0 commit comments

Comments
 (0)