From e7df4c0da5909bbaa9d8bd4a07c5197b1760245e Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Sat, 8 Jan 2022 14:12:06 +0100 Subject: [PATCH 1/2] Fix check_consistent for versioned dependencies --- tests/check_consistent.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/check_consistent.py b/tests/check_consistent.py index 105d838b0c44..882de8e7edaa 100755 --- a/tests/check_consistent.py +++ b/tests/check_consistent.py @@ -180,10 +180,10 @@ def check_metadata(): stripped, relation, dep_version = _strip_dep_version(dep) if relation: msg = f"Bad version in dependency {dep}" - assert relation in {"==", ">", ">=", "<", "<="}, msg - assert version.count(".") <= 2, msg - for part in version.split("."): - assert part.isnumeric(), msg + assert relation in {"==", ">", ">=", "<", "<="}, f"Bad relation '{relation}' in dependency {dep}" + assert dep_version.count(".") <= 2, f"Bad version '{dep_version}' in dependency {dep}" + for part in dep_version.split("."): + assert part.isnumeric(), f"Bad version '{part}' in dependency {dep}" if __name__ == "__main__": From ea5cc2923491bf05201cae516c0c7006217b5a0e Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Sat, 8 Jan 2022 14:13:08 +0100 Subject: [PATCH 2/2] Remove dead code --- tests/check_consistent.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/check_consistent.py b/tests/check_consistent.py index 882de8e7edaa..cf1d4ac21f44 100755 --- a/tests/check_consistent.py +++ b/tests/check_consistent.py @@ -179,7 +179,6 @@ def check_metadata(): assert ";" not in dep, f"Semicolons in dependencies are not supported, got {dep}" stripped, relation, dep_version = _strip_dep_version(dep) if relation: - msg = f"Bad version in dependency {dep}" assert relation in {"==", ">", ">=", "<", "<="}, f"Bad relation '{relation}' in dependency {dep}" assert dep_version.count(".") <= 2, f"Bad version '{dep_version}' in dependency {dep}" for part in dep_version.split("."):