From f6f7c4c14f16beead8a8adb649eb1b1da524a860 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Apr 2025 08:49:05 +0000 Subject: [PATCH] python3-calver: upgrade 2022.6.26 -> 2025.04.01 Add tag to SRC_URI to verify SRCREV. Upstream improved their project.toml and removed much of setup.py meaning the patch was no longer needed. Signed-off-by: Richard Purdie --- .../0001-setup.py-hard-code-version.patch | 32 ------------------- ...2.6.26.bb => python3-calver_2025.04.01.bb} | 7 ++-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch rename meta/recipes-devtools/python/{python3-calver_2022.6.26.bb => python3-calver_2025.04.01.bb} (67%) diff --git a/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch b/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch deleted file mode 100644 index 43f8a78ef03..00000000000 --- a/meta/recipes-devtools/python/python3-calver/0001-setup.py-hard-code-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 390a233ed969f82b2ef209b23bfb523e785603f9 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin -Date: Tue, 9 May 2023 10:19:41 -0400 -Subject: [PATCH] setup.py: hard-code version - -setup.py is pulling the build version from the current date rather than -a release tag or other predictable method, causing reproducibility -issues in builds. Patch this to make reproducible builds work while -discussing this with upstream maintainer (or developing a patch that can -make calver rely on a more standard pyproject.toml solution). - -Upstream-Status: Inappropriate (configuration) - -Signed-off-by: Trevor Gamblin ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 73f6b10..2e27cf1 100644 ---- a/setup.py -+++ b/setup.py -@@ -42,5 +42,5 @@ setup( - "use_calver = calver.integration:version", - ], - }, -- version=calver_version(True), -+ version=calver_version("2022.6.26"), - ) --- -2.40.0 - diff --git a/meta/recipes-devtools/python/python3-calver_2022.6.26.bb b/meta/recipes-devtools/python/python3-calver_2025.04.01.bb similarity index 67% rename from meta/recipes-devtools/python/python3-calver_2022.6.26.bb rename to meta/recipes-devtools/python/python3-calver_2025.04.01.bb index b2e7e0769df..a05e7872016 100644 --- a/meta/recipes-devtools/python/python3-calver_2022.6.26.bb +++ b/meta/recipes-devtools/python/python3-calver_2025.04.01.bb @@ -3,11 +3,8 @@ HOMEPAGE = "https://github.com/di/calver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = " \ - git://github.com/di/calver;branch=master;protocol=https \ - file://0001-setup.py-hard-code-version.patch \ -" -SRCREV = "3268d8acf2c345f32a1c5f08ba25dc67f76cca81" +SRC_URI = "git://github.com/di/calver;branch=master;protocol=https;tag=${PV}" +SRCREV = "5b62e5127f9ad5bb56bd09ccd8c44283a23ddb60" inherit python_setuptools_build_meta ptest-python-pytest -- 2.47.2