Skip to contentSkip to conversation

Recipe Upgrades for AUH 15 Mar 2023 Run

PATCH In review Tim Orling 2 participants 7 messages Mar 16, 2023

lore
Share & tools
lore

Tim Orling

author
#0 lore raw

cover Recipe Upgrades for AUH 15 Mar 2023 Run

Build tested on qemux86-64 and qemuarm64
Basic run-time tested on qemux86-64

The following changes since commit 37b5d544d34c9caaf70def0a29dfb0cf896dc1b7:

scripts/combo-layer: Fix python deprecation warning (2023-03-14 17:13:11 +0000)

are available in the Git repository at:

https://git.yoctoproject.org/poky-contrib timo/recipe-upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=timo/recipe-upgrades

Tim Orling (5):
python3-pytest: upgrade 7.2.1 -> 7.2.2
python3-scons: upgrade 4.4.0 -> 4.5.1
python3-poetry-core: upgrade 1.5.1 -> 1.5.2
python3-urllib3: upgrade 1.26.14 -> 1.26.15
python3-wheel: upgrade 0.38.4 -> 0.40.0

 ..._1.5.1.bb => python3-poetry-core_1.5.2.bb} |   2 +-
 ...ytest_7.2.1.bb => python3-pytest_7.2.2.bb} |   2 +-
 ...-scons_4.4.0.bb => python3-scons_4.5.1.bb} |   2 +-
 ..._1.26.14.bb => python3-urllib3_1.26.15.bb} |   2 +-
 ...roject.toml-from-flit-backend-branch.patch | 100 ------------------
 ...heel_0.38.4.bb => python3-wheel_0.40.0.bb} |   6 +-
 6 files changed, 6 insertions(+), 108 deletions(-)
 rename meta/recipes-devtools/python/{python3-poetry-core_1.5.1.bb => python3-poetry-core_1.5.2.bb} (95%)
 rename meta/recipes-devtools/python/{python3-pytest_7.2.1.bb => python3-pytest_7.2.2.bb} (92%)
 rename meta/recipes-devtools/python/{python3-scons_4.4.0.bb => python3-scons_4.5.1.bb} (90%)
 rename meta/recipes-devtools/python/{python3-urllib3_1.26.14.bb => python3-urllib3_1.26.15.bb} (86%)
 delete mode 100644 meta/recipes-devtools/python/python3-wheel/0001-Backport-pyproject.toml-from-flit-backend-branch.patch
 rename meta/recipes-devtools/python/{python3-wheel_0.38.4.bb => python3-wheel_0.40.0.bb} (62%)
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH 1/5 python3-pytest: upgrade 7.2.1 -> 7.2.2

https://docs.pytest.org/en/stable/changelog.html#pytest-7-2-2-2023-03-03

pytest 7.2.2 (2023-03-03)

Bug Fixes
10533: Fixed pytest.approx() handling of dictionaries containing one or
more values of 0.0.
10592: Fixed crash if --cache-show and --help are passed at the same time. 10597: Fixed bug where a fixture method named teardown would be called as
part of nose teardown stage.
10626: Fixed crash if --fixtures and --help are passed at the same time. 10660: Fixed pytest.raises() to return a ‘ContextManager’ so that type-
checkers could narrow pytest.raises(...) if ... else nullcontext() down to ‘ContextManager’ rather than ‘object’.

Improved Documentation
10690: Added CI and BUILD_NUMBER environment variables to the documentation. 10721: Fixed entry-points declaration in the documentation example using
Hatch.
10753: Changed wording of the module level skip to be very explicit about
not collecting tests and not executing the rest of the module.

---
 .../python/{python3-pytest_7.2.1.bb => python3-pytest_7.2.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pytest_7.2.1.bb => python3-pytest_7.2.2.bb} (92%)
meta/recipes-devtools/python/python3-pytest_7.2.2.bb renamed from meta/recipes-devtools/python/python3-pytest_7.2.1.bb +1 -1
similarity index 92%
rename from meta/recipes-devtools/python/python3-pytest_7.2.1.bb
rename to meta/recipes-devtools/python/python3-pytest_7.2.2.bb
index c7610d440c1..4e2c86f641d 100644
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c"
 
-SRC_URI[sha256sum] = "d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42"
+SRC_URI[sha256sum] = "c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4"
 
 DEPENDS += "python3-setuptools-scm-native"
 
Signature · 1 line
2.30.2
author
#2 lore raw

PATCH 2/5 python3-scons: upgrade 4.4.0 -> 4.5.1

In reply to Tim Orling

https://github.com/SCons/scons/blob/rel_4.5.1/CHANGES.txt
https://github.com/SCons/scons/blob/rel_4.5.0/CHANGES.txt

---
 .../python/{python3-scons_4.4.0.bb => python3-scons_4.5.1.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-scons_4.4.0.bb => python3-scons_4.5.1.bb} (90%)
meta/recipes-devtools/python/python3-scons_4.5.1.bb renamed from meta/recipes-devtools/python/python3-scons_4.4.0.bb +1 -1
similarity index 90%
rename from meta/recipes-devtools/python/python3-scons_4.4.0.bb
rename to meta/recipes-devtools/python/python3-scons_4.5.1.bb
index ad1149597f3..279347ac9ca 100644
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d903b0b8027f461402bac9b5169b36f7"
 
 SRC_URI += " file://0001-Fix-man-page-installation.patch"
-SRC_URI[sha256sum] = "7703c4e9d2200b4854a31800c1dbd4587e1fa86e75f58795c740bcfa7eca7eaa"
+SRC_URI[sha256sum] = "9daeabe4d87ba2bd4ea15410765fc1ed2d931b723e4dc730a487a3911b9a1738"
 
 PYPI_PACKAGE = "SCons"
 
Signature · 1 line
2.30.2
author
#3 lore raw

PATCH 3/5 python3-poetry-core: upgrade 1.5.1 -> 1.5.2

In reply to Tim Orling

https://github.com/python-poetry/poetry-core/blob/main/CHANGELOG.md#152---2023-03-13

1.5.2 - 2023-03-13
Fixed
* Fix an issue where wheels built on Windows could contain duplicate entries in the RECORD file (#555).

https://github.com/python-poetry/poetry-core/pull/555

---
 ...ython3-poetry-core_1.5.1.bb => python3-poetry-core_1.5.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-poetry-core_1.5.1.bb => python3-poetry-core_1.5.2.bb} (95%)
meta/recipes-devtools/python/python3-poetry-core_1.5.2.bb renamed from meta/recipes-devtools/python/python3-poetry-core_1.5.1.bb +1 -1
similarity index 95%
rename from meta/recipes-devtools/python/python3-poetry-core_1.5.1.bb
rename to meta/recipes-devtools/python/python3-poetry-core_1.5.2.bb
index 952ffef99da..738b9786900 100644
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "\
     file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \
 "
 
-SRC_URI[sha256sum] = "41887261358863f25831fa0ad1fe7e451fc32d1c81fcf7710ba5174cc0047c6d"
+SRC_URI[sha256sum] = "c6556c3b1ec5b8668e6ef5a4494726bc41d31907339425e194e78a6178436c14"
 
 inherit python_poetry_core pypi
 PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}"
Signature · 1 line
2.30.2
author
#4 lore raw

PATCH 4/5 python3-urllib3: upgrade 1.26.14 -> 1.26.15

In reply to Tim Orling

https://github.com/urllib3/urllib3/blob/1.26.x/CHANGES.rst#12615-2023-03-10

1.26.15 (2023-03-10)
* Fix socket timeout value when HTTPConnection is reused (#2645)
* Remove "!" character from the unreserved characters in IPv6 Zone ID parsing (#2899)
* Fix IDNA handling of 'x80' byte (#2901)

https://github.com/urllib3/urllib3/issues/2645
https://github.com/urllib3/urllib3/issues/2899
https://github.com/urllib3/urllib3/issues/2901

---
 .../{python3-urllib3_1.26.14.bb => python3-urllib3_1.26.15.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-urllib3_1.26.14.bb => python3-urllib3_1.26.15.bb} (86%)
meta/recipes-devtools/python/python3-urllib3_1.26.15.bb renamed from meta/recipes-devtools/python/python3-urllib3_1.26.14.bb +1 -1
similarity index 86%
rename from meta/recipes-devtools/python/python3-urllib3_1.26.14.bb
rename to meta/recipes-devtools/python/python3-urllib3_1.26.15.bb
index f35a141df26..d2de7c4c022 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c"
 
-SRC_URI[sha256sum] = "076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"
+SRC_URI[sha256sum] = "8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305"
 
 inherit pypi setuptools3
 
Signature · 1 line
2.30.2
author
#5 lore raw

PATCH 5/5 python3-wheel: upgrade 0.38.4 -> 0.40.0

In reply to Tim Orling

* Drop pyproject.toml patch, merged upstream

https://wheel.readthedocs.io/en/stable/news.html#release-notes

0.40.0 (2023-03-14)
* Added a wheel tags command to modify tags on an existing wheel (PR by Henry Schreiner)
* Updated vendored packaging to 23.0
* wheel unpack now preserves the executable attribute of extracted files
* Fixed spaces in platform names not being converted to underscores (PR by David Tucker)
* Fixed RECORD files in generated wheels missing the regular file attribute
* Fixed DeprecationWarning about the use of the deprecated pkg_resources API (PR by Thomas Grainger)
* Wheel now uses flit-core as a build backend (PR by Henry Schreiner)

License-Update: use LICENSE.txt for LIC_FILES_CHKSUM instead of PKG-INFO

---
 ...roject.toml-from-flit-backend-branch.patch | 100 ------------------
 ...heel_0.38.4.bb => python3-wheel_0.40.0.bb} |   6 +-
 2 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-wheel/0001-Backport-pyproject.toml-from-flit-backend-branch.patch
 rename meta/recipes-devtools/python/{python3-wheel_0.38.4.bb => python3-wheel_0.40.0.bb} (62%)
meta/recipes-devtools/python/python3-wheel/0001-Backport-pyproject.toml-from-flit-backend-branch.patch deleted +0 -100
deleted file mode 100644
index 023de0e6a88..00000000000
@@ -1,100 +0,0 @@
-From f00dd220346773bc088d403847ee7f06f2b4c30a Mon Sep 17 00:00:00 2001
-From: Tim Orling <[email protected]>
-Date: Fri, 18 Feb 2022 11:09:16 -0800
-Subject: [PATCH] Backport pyproject.toml from flit-backend branch
-
-This allows us to bootstrap wheels and PEP-517 packaging.
-
-Upstream-Status: Backport from flit-backend branch
-https://raw.githubusercontent.com/pypa/wheel/4f6ba78fede38a8d9e35a14e38377a121033afb3/pyproject.toml
-
-Signed-off-by: Tim Orling <[email protected]>
----
- pyproject.toml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 78 insertions(+)
- create mode 100644 pyproject.toml
-
-diff --git a/pyproject.toml b/pyproject.toml
-new file mode 100644
-index 0000000..749b8de
---- /dev/null
-+++ b/pyproject.toml
-@@ -0,0 +1,78 @@
-+[build-system]
-+requires = ["flit_core >=3.2,<4"]
-+build-backend = "flit_core.buildapi"
-+
-+[project]
-+name = "wheel"
-+description = "A built-package format for Python"
-+readme = "README.rst"
-+classifiers = [
-+    "Development Status :: 5 - Production/Stable",
-+    "Intended Audience :: Developers",
-+    "Topic :: System :: Archiving :: Packaging",
-+    "License :: OSI Approved :: MIT License",
-+    "Programming Language :: Python",
-+    "Programming Language :: Python :: 3 :: Only",
-+    "Programming Language :: Python :: 3.7",
-+    "Programming Language :: Python :: 3.8",
-+    "Programming Language :: Python :: 3.9",
-+    "Programming Language :: Python :: 3.10"
-+]
-+authors = [{name = "Daniel Holth", email = "[email protected]"}]
-+maintainers = [{name = "Alex Grönholm", email = "[email protected]"}]
-+keywords = ["wheel", "packaging"]
-+license = {file = "LICENSE.txt"}
-+requires-python = ">=3.7"
-+dependencies = [
-+    "setuptools >= 45.2.0"
-+]
-+dynamic = ["version"]
-+
-+[project.urls]
-+Documentation = "https://wheel.readthedocs.io/"
-+Changelog = "https://wheel.readthedocs.io/en/stable/news.html"
-+"Issue Tracker" = "https://github.com/pypa/wheel/issues"
-+
-+[project.scripts]
-+wheel = "wheel.cli:main"
-+
-+[project.entry-points."distutils.commands"]
-+bdist_wheel = "wheel.bdist_wheel:bdist_wheel"
-+
-+[project.optional-dependencies]
-+test = [
-+    "pytest >= 3.0.0"
-+]
-+
-+[tool.flit.sdist]
-+exclude = [
-+    ".cirrus.yml",
-+    ".github/*",
-+    ".gitignore",
-+    ".pre-commit-config.yaml",
-+    ".readthedocs.yml"
-+]
-+
-+[tool.black]
-+target-version = ['py37']
-+extend-exclude = '''
-+^/src/wheel/vendored/
-+'''
-+
-+[tool.isort]
-+src_paths = ["src"]
-+profile = "black"
-+skip_gitignore = true
-+
-+[tool.flake8]
-+max-line-length = 88
-+
-+[tool.pytest.ini_options]
-+testpaths = "tests"
-+
-+[tool.coverage.run]
-+source = ["wheel"]
-+omit = ["*/vendored/*"]
-+
-+[tool.coverage.report]
-+show_missing = true
meta/recipes-devtools/python/python3-wheel_0.40.0.bb renamed from meta/recipes-devtools/python/python3-wheel_0.38.4.bb +2 -4
similarity index 62%
rename from meta/recipes-devtools/python/python3-wheel_0.38.4.bb
rename to meta/recipes-devtools/python/python3-wheel_0.40.0.bb
index 6263cbc45c7..2b8111d544b 100644
@@ -2,14 +2,12 @@ SUMMARY = "The official binary distribution format for Python "
 HOMEPAGE = "https://github.com/pypa/wheel"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=8227180126797a0148f94f483f3e1489"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ffb0db04527cfe380e4f2726bd05ebf"
 
-SRC_URI[sha256sum] = "965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac"
+SRC_URI[sha256sum] = "cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873"
 
 inherit python_flit_core pypi
 
-SRC_URI += " file://0001-Backport-pyproject.toml-from-flit-backend-branch.patch"
-
 BBCLASSEXTEND = "native nativesdk"
 
 # This used to use the bootstrap install which didn't compile. Until we bump the
Signature · 1 line
2.30.2
#6 lore raw

Re: [OE-core] [PATCH 5/5] python3-wheel: upgrade 0.38.4 -> 0.40.0

Quoted 1 line · Tim Orling

Content-Type: text/plain; charset=y

You replied 'y' to the encoding question where you should have been more careful and simply press enter ;) (and so the patch doesn't apply without manually editing it)

Quoted 171 lines

Content-Transfer-Encoding: 8bit

* Drop pyproject.toml patch, merged upstream

https://wheel.readthedocs.io/en/stable/news.html#release-notes

0.40.0 (2023-03-14)
* Added a wheel tags command to modify tags on an existing wheel (PR by Henry Schreiner)
* Updated vendored packaging to 23.0
* wheel unpack now preserves the executable attribute of extracted files
* Fixed spaces in platform names not being converted to underscores (PR by David Tucker)
* Fixed RECORD files in generated wheels missing the regular file attribute
* Fixed DeprecationWarning about the use of the deprecated pkg_resources API (PR by Thomas Grainger)
* Wheel now uses flit-core as a build backend (PR by Henry Schreiner)

License-Update: use LICENSE.txt for LIC_FILES_CHKSUM instead of PKG-INFO

---
 ...roject.toml-from-flit-backend-branch.patch | 100 ------------------
 ...heel_0.38.4.bb => python3-wheel_0.40.0.bb} |   6 +-
 2 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-wheel/0001-Backport-pyproject.toml-from-flit-backend-branch.patch
 rename meta/recipes-devtools/python/{python3-wheel_0.38.4.bb => python3-wheel_0.40.0.bb} (62%)
meta/recipes-devtools/python/python3-wheel/0001-Backport-pyproject.toml-from-flit-backend-branch.patch deleted +0 -100
deleted file mode 100644
index 023de0e6a88..00000000000
@@ -1,100 +0,0 @@
-From f00dd220346773bc088d403847ee7f06f2b4c30a Mon Sep 17 00:00:00 2001
-From: Tim Orling <[email protected]>
-Date: Fri, 18 Feb 2022 11:09:16 -0800
-Subject: [PATCH] Backport pyproject.toml from flit-backend branch
-
-This allows us to bootstrap wheels and PEP-517 packaging.
-
-Upstream-Status: Backport from flit-backend branch
-https://raw.githubusercontent.com/pypa/wheel/4f6ba78fede38a8d9e35a14e38377a121033afb3/pyproject.toml
-
-Signed-off-by: Tim Orling <[email protected]>
----
- pyproject.toml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 78 insertions(+)
- create mode 100644 pyproject.toml
-
-diff --git a/pyproject.toml b/pyproject.toml
-new file mode 100644
-index 0000000..749b8de
---- /dev/null
-+++ b/pyproject.toml
-@@ -0,0 +1,78 @@
-+[build-system]
-+requires = ["flit_core >=3.2,<4"]
-+build-backend = "flit_core.buildapi"
-+
-+[project]
-+name = "wheel"
-+description = "A built-package format for Python"
-+readme = "README.rst"
-+classifiers = [
-+    "Development Status :: 5 - Production/Stable",
-+    "Intended Audience :: Developers",
-+    "Topic :: System :: Archiving :: Packaging",
-+    "License :: OSI Approved :: MIT License",
-+    "Programming Language :: Python",
-+    "Programming Language :: Python :: 3 :: Only",
-+    "Programming Language :: Python :: 3.7",
-+    "Programming Language :: Python :: 3.8",
-+    "Programming Language :: Python :: 3.9",
-+    "Programming Language :: Python :: 3.10"
-+]
-+authors = [{name = "Daniel Holth", email = "[email protected]"}]
-+maintainers = [{name = "Alex Gr�nholm", email = "[email protected]"}]
-+keywords = ["wheel", "packaging"]
-+license = {file = "LICENSE.txt"}
-+requires-python = ">=3.7"
-+dependencies = [
-+    "setuptools >= 45.2.0"
-+]
-+dynamic = ["version"]
-+
-+[project.urls]
-+Documentation = "https://wheel.readthedocs.io/"
-+Changelog = "https://wheel.readthedocs.io/en/stable/news.html"
-+"Issue Tracker" = "https://github.com/pypa/wheel/issues"
-+
-+[project.scripts]
-+wheel = "wheel.cli:main"
-+
-+[project.entry-points."distutils.commands"]
-+bdist_wheel = "wheel.bdist_wheel:bdist_wheel"
-+
-+[project.optional-dependencies]
-+test = [
-+    "pytest >= 3.0.0"
-+]
-+
-+[tool.flit.sdist]
-+exclude = [
-+    ".cirrus.yml",
-+    ".github/*",
-+    ".gitignore",
-+    ".pre-commit-config.yaml",
-+    ".readthedocs.yml"
-+]
-+
-+[tool.black]
-+target-version = ['py37']
-+extend-exclude = '''
-+^/src/wheel/vendored/
-+'''
-+
-+[tool.isort]
-+src_paths = ["src"]
-+profile = "black"
-+skip_gitignore = true
-+
-+[tool.flake8]
-+max-line-length = 88
-+
-+[tool.pytest.ini_options]
-+testpaths = "tests"
-+
-+[tool.coverage.run]
-+source = ["wheel"]
-+omit = ["*/vendored/*"]
-+
-+[tool.coverage.report]
-+show_missing = true
meta/recipes-devtools/python/python3-wheel_0.40.0.bb renamed from meta/recipes-devtools/python/python3-wheel_0.38.4.bb +2 -4
similarity index 62%
rename from meta/recipes-devtools/python/python3-wheel_0.38.4.bb
rename to meta/recipes-devtools/python/python3-wheel_0.40.0.bb
index 6263cbc45c7..2b8111d544b 100644
@@ -2,14 +2,12 @@ SUMMARY = "The official binary distribution format for Python "
 HOMEPAGE = "https://github.com/pypa/wheel"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=8227180126797a0148f94f483f3e1489"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ffb0db04527cfe380e4f2726bd05ebf"
 
-SRC_URI[sha256sum] = "965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac"
+SRC_URI[sha256sum] = "cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873"
 
 inherit python_flit_core pypi
 
-SRC_URI += " file://0001-Backport-pyproject.toml-from-flit-backend-branch.patch"
-
 BBCLASSEXTEND = "native nativesdk"
 
 # This used to use the bootstrap install which didn't compile. Until we bump the
Signature · 11 lines
2.30.2



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178670): https://lists.openembedded.org/g/openembedded-core/message/178670
Mute This Topic: https://lists.openembedded.org/mt/97641809/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com