[07/16] python3-pbr: update 6.1.0 -> 7.0.1

Message ID	20250911085123.1551425-7-alex.kanavin@gmail.com
State	New
Headers	show Return-Path: <alex.kanavin@gmail.com> ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) From: Alexander Kanavin <alex.kanavin@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin <alex@linutronix.de> Subject: [PATCH 07/16] python3-pbr: update 6.1.0 -> 7.0.1 Date: Thu, 11 Sep 2025 10:51:14 +0200 Message-Id: <20250911085123.1551425-7-alex.kanavin@gmail.com> In-Reply-To: <20250911085123.1551425-1-alex.kanavin@gmail.com> References: <20250911085123.1551425-1-alex.kanavin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/16] gnupg: update 2.5.5 -> 2.5.11 \| expand [01/16] gnupg: update 2.5.5 -> 2.5.11 [02/16] ovmf-shell-image: move .wks file to its own directory [03/16] ovmf: update 202502 -> 202508 [04/16] librepo: update 1.19.0 -> 1.20.0 [05/16] pypi.bbclass: add / to UPSTREAM_CHECK_URI value [06/16] python3-booleanpy: update 4.0 -> 5.0 [07/16] python3-pbr: update 6.1.0 -> 7.0.1 [08/16] python3-pip: update 25.1.1 -> 25.2 [09/16] cargo-c: update 0.10.14 -> 0.10.15 [10/16] which: update 2.21 -> 2.23 [11/16] cwautomacros: delete the recipe [12/16] fontconfig: update 2.15.0 -> 2.17.1 [13/16] igt-gpu-tools: update 1.30 -> 2.1 [14/16] pango: update 1.56.4 -> 1.57.0 [15/16] xkeyboard-config: update 2.44 -> 2.45 [16/16] ffmpeg: update 7.1.1 -> 8.0

Message ID

20250911085123.1551425-7-alex.kanavin@gmail.com

State

New

Headers

From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 07/16] python3-pbr: update 6.1.0 -> 7.0.1
Date: Thu, 11 Sep 2025 10:51:14 +0200
Message-Id: <20250911085123.1551425-7-alex.kanavin@gmail.com>
In-Reply-To: <20250911085123.1551425-1-alex.kanavin@gmail.com>
References: <20250911085123.1551425-1-alex.kanavin@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/16] gnupg: update 2.5.5 -> 2.5.11 | expand

Commit Message

Alexander Kanavin Sept. 11, 2025, 8:51 a.m. UTC

From: Alexander Kanavin <alex@linutronix.de>

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 <alex@linutronix.de>
---
 .../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 <changqing.li@windriver.com>
-Date: Thu, 23 Apr 2020 09:28:58 +0000
-Subject: [PATCH] change shebang to python3
-
-Upstream-Status: Pending
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- 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"

[07/16] python3-pbr: update 6.1.0 -> 7.0.1

Commit Message

Patch