From c64d44e48519816f319fb48ea067df6861ba6f71 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 11 Sep 2025 10:51:14 +0200 Subject: [PATCH] python3-pbr: update 6.1.0 -> 7.0.1 Drop 0001-change-shebang-to-python3.patch (the change is made only to tests which aren't installed, and probably isn't necessary to begin with as upstream would've fixed it already). Merge .inc into .bb. Switch away from setuptools3 as pyproject.toml now exists. Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../0001-change-shebang-to-python3.patch | 39 ------------------- .../python/python3-pbr_6.1.0.bb | 4 -- .../{python-pbr.inc => python3-pbr_7.0.1.bb} | 6 +-- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch delete mode 100644 meta/recipes-devtools/python/python3-pbr_6.1.0.bb rename meta/recipes-devtools/python/{python-pbr.inc => python3-pbr_7.0.1.bb} (74%) diff --git a/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch deleted file mode 100644 index 218add1778e..00000000000 --- a/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch +++ /dev/null @@ -1,39 +0,0 @@ -From df0a8c56f03004738599e06a7b5a1d2b67189848 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 23 Apr 2020 09:28:58 +0000 -Subject: [PATCH] change shebang to python3 - -Upstream-Status: Pending - -Signed-off-by: Changqing Li ---- - pbr/tests/test_integration.py | 2 +- - pbr/tests/test_packaging.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pbr/tests/test_integration.py b/pbr/tests/test_integration.py -index cb4b5e5..4cbfb19 100644 ---- a/pbr/tests/test_integration.py -+++ b/pbr/tests/test_integration.py -@@ -171,7 +171,7 @@ class TestInstallWithoutPbr(base.BaseTestCase): - pkgs = { - 'pkgTest': { - 'setup.py': textwrap.dedent("""\ -- #!/usr/bin/env python -+ #!/usr/bin/env python3 - import setuptools - setuptools.setup( - name = 'pkgTest', -diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py -index dddf7ae..bec03ce 100644 ---- a/pbr/tests/test_packaging.py -+++ b/pbr/tests/test_packaging.py -@@ -219,7 +219,7 @@ class CreatePackages(fixtures.Fixture): - - defaults = { - 'setup.py': textwrap.dedent(six.u("""\ -- #!/usr/bin/env python -+ #!/usr/bin/env python3 - import setuptools - setuptools.setup( - setup_requires=['pbr'], diff --git a/meta/recipes-devtools/python/python3-pbr_6.1.0.bb b/meta/recipes-devtools/python/python3-pbr_6.1.0.bb deleted file mode 100644 index a58b491a825..00000000000 --- a/meta/recipes-devtools/python/python3-pbr_6.1.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit setuptools3 -require python-pbr.inc - -SRC_URI[sha256sum] = "788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24" diff --git a/meta/recipes-devtools/python/python-pbr.inc b/meta/recipes-devtools/python/python3-pbr_7.0.1.bb similarity index 74% rename from meta/recipes-devtools/python/python-pbr.inc rename to meta/recipes-devtools/python/python3-pbr_7.0.1.bb index f08d9fd3819..6878fa09671 100644 --- a/meta/recipes-devtools/python/python-pbr.inc +++ b/meta/recipes-devtools/python/python3-pbr_7.0.1.bb @@ -5,10 +5,10 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" -SRC_URI += "file://0001-change-shebang-to-python3.patch" - -inherit pypi +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "python3-pip" BBCLASSEXTEND = "native nativesdk" + +SRC_URI[sha256sum] = "3ecbcb11d2b8551588ec816b3756b1eb4394186c3b689b17e04850dfc20f7e57" -- 2.47.3