From 8bd0c871b276f06191cd1d539796eba2f81a02d0 Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Thu, 8 May 2025 16:26:52 -0400 Subject: [PATCH 1/2] Remove two small just-added tests We decided on a different behavior, no-op instead of outright failure. --- tests/scripts/pulp_rpm/test_rpm_sync_publish.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh b/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh index 935ce8ba7..b9c72ec9f 100755 --- a/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh +++ b/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh @@ -106,12 +106,6 @@ then expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --checksum-type sha512 expect_fail pulp rpm repository update --name "cli_test_rpm_repository" --checksum-type sha1 - - if pulp debug has-plugin --name "rpm" --specifier ">=3.30.0" - then - expect_fail pulp rpm repository update --name "cli_test_rpm_repository" --package-checksum-type sha256 - expect_fail pulp rpm repository update --name "cli_test_rpm_repository" --metadata-checksum-type sha256 - fi else expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --metadata-checksum-type sha1 expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --package-checksum-type sha1 From d1bbf589f0b6d20a087c6220f4a290b3fc5f1744 Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Sun, 11 May 2025 23:56:38 -0400 Subject: [PATCH 2/2] Fix a lint error caused by click deprecating __version__ --- .ci/scripts/check_click_for_mypy.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/check_click_for_mypy.py b/.ci/scripts/check_click_for_mypy.py index a905be7ef..2941277ea 100755 --- a/.ci/scripts/check_click_for_mypy.py +++ b/.ci/scripts/check_click_for_mypy.py @@ -1,9 +1,12 @@ #!/bin/env python3 -import click +from importlib.metadata import version + from packaging.version import parse -if parse(click.__version__) < parse("8.1.1") or parse(click.__version__) >= parse("8.2"): +click_version = version("click") + +if parse(click_version) < parse("8.1.1") or parse(click_version) >= parse("8.2"): print("🚧 Linting with mypy is currently only supported with click~=8.1.1. 🚧") print("🔧 Please run `pip install click~=8.1.1` first. 🔨") exit(1)