From 537717741fb30be5a676ce59e7640accd27e3f31 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Mon, 21 Apr 2025 14:02:05 +0800 Subject: [PATCH] Fix ruamel.yaml package name in requrements files Please refer to the inline comment for the reason of this patch. --- Makefile | 11 +++++++---- requirements-test.txt | 6 +++--- requirements.txt | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index be981f9..37177a6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ .PHONY: compile/requirements compile/requirements: pip-compile --generate-hashes --output-file=requirements.txt pyproject.toml - -.PHONY: compile/requirements-test -compile/requirements-test: - pip-compile --extra=test --generate-hashes --output-file=requirements-test.txt pyproject.toml \ No newline at end of file + pip-compile --extra=test --generate-hashes --output-file=requirements-test.txt pyproject.toml + # Period is converted to dash during pip-compile. This is a workaround by reverting it back + # so that Renovate can include the updates correctly for ruamel.yaml package. + for req_file in requirements.txt requirements-test.txt; do \ + sed -i "s/ruamel-yaml-clib/ruamel.yaml.clib/" $$req_file; \ + sed -i "s/ruamel-yaml/ruamel.yaml/" $$req_file; \ + done diff --git a/requirements-test.txt b/requirements-test.txt index 2943d6b..f83e530 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -428,11 +428,11 @@ rpds-py==0.21.0 \ # via # jsonschema # referencing -ruamel-yaml==0.18.6 \ +ruamel.yaml==0.18.6 \ --hash=sha256:57b53ba33def16c4f3d807c0ccbc00f8a6081827e81ba2491691b76882d0c636 \ --hash=sha256:8b27e6a217e786c6fbe5634d8f3f11bc63e0f80f6a5890f28863d9c45aac311b # via pipeline-migration-tool (pyproject.toml) -ruamel-yaml-clib==0.2.12 \ +ruamel.yaml.clib==0.2.12 \ --hash=sha256:040ae85536960525ea62868b642bdb0c2cc6021c9f9d507810c0c604e66f5a7b \ --hash=sha256:0467c5965282c62203273b838ae77c0d29d7638c8a4e3a1c8bdd3602c10904e4 \ --hash=sha256:0b7e75b4965e1d4690e93021adfcecccbca7d61c7bddd8e22406ef2ff20d74ef \ @@ -474,7 +474,7 @@ ruamel-yaml-clib==0.2.12 \ --hash=sha256:f66efbc1caa63c088dead1c4170d148eabc9b80d95fb75b6c92ac0aad2437d76 \ --hash=sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987 \ --hash=sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df - # via ruamel-yaml + # via ruamel.yaml tox==4.21.2 \ --hash=sha256:13d996adcd792e7c82994b0e116d85efd84f0c6d185254d83d156f73f86b2038 \ --hash=sha256:49381ff102296753e378fa5ff30e42a35e695f149b4dbf8a2c49d15fdb5797b2 diff --git a/requirements.txt b/requirements.txt index 174676f..31fa951 100644 --- a/requirements.txt +++ b/requirements.txt @@ -245,11 +245,11 @@ rpds-py==0.21.0 \ # via # jsonschema # referencing -ruamel-yaml==0.18.6 \ +ruamel.yaml==0.18.6 \ --hash=sha256:57b53ba33def16c4f3d807c0ccbc00f8a6081827e81ba2491691b76882d0c636 \ --hash=sha256:8b27e6a217e786c6fbe5634d8f3f11bc63e0f80f6a5890f28863d9c45aac311b # via pipeline-migration-tool (pyproject.toml) -ruamel-yaml-clib==0.2.12 \ +ruamel.yaml.clib==0.2.12 \ --hash=sha256:040ae85536960525ea62868b642bdb0c2cc6021c9f9d507810c0c604e66f5a7b \ --hash=sha256:0467c5965282c62203273b838ae77c0d29d7638c8a4e3a1c8bdd3602c10904e4 \ --hash=sha256:0b7e75b4965e1d4690e93021adfcecccbca7d61c7bddd8e22406ef2ff20d74ef \ @@ -281,7 +281,7 @@ ruamel-yaml-clib==0.2.12 \ --hash=sha256:f66efbc1caa63c088dead1c4170d148eabc9b80d95fb75b6c92ac0aad2437d76 \ --hash=sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987 \ --hash=sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df - # via ruamel-yaml + # via ruamel.yaml urllib3==2.2.3 \ --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \ --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9