summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2023-02-03 09:50:25 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-04 17:02:10 +0000
commit7aeaa145586c18b8157522ec2297f9ec11ecda4b (patch)
treecc63d94e41e5f60aa259731a39e23aa4714fd3ee
parente958163345825dc79e1e1deb8ccafb3978702753 (diff)
downloadpoky-7aeaa145586c18b8157522ec2297f9ec11ecda4b.tar.gz
python3-poetry-core: upgrade 1.4.0 -> 1.5.0
* Drop deterministic.patch; merged https://github.com/python-poetry/poetry-core/pull/545 * Drop vendored pyparsing LICENSE; no longer vendored https://github.com/python-poetry/poetry-core/blob/main/CHANGELOG.md#150---2023-01-27 (From OE-Core rev: 32921155acf776c91ee2fb002660b419512f0932) Signed-off-by: Tim Orling <tim.orling@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-poetry-core/deterministic.patch23
-rw-r--r--meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb (renamed from meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb)5
2 files changed, 1 insertions, 27 deletions
diff --git a/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch b/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch
deleted file mode 100644
index 402ee53094..0000000000
--- a/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1builders/wheel: Ensure dist-info is written determinisically
2
3glob() returns values in "on disk" order. To make the RECORD file
4deterministic and consistent between builds we need to sort the
5data before adding to the records list.
6
7Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8
9Upstream-Status: Submitted [https://github.com/python-poetry/poetry-core/pull/545]
10
11Index: builders/wheel.py
12===================================================================
13--- a/src/poetry/core/masonry/builders/wheel.py
14+++ b/src/poetry/core/masonry/builders/wheel.py
15@@ -294,7 +294,7 @@ class WheelBuilder(Builder):
16
17 def _copy_dist_info(self, wheel: zipfile.ZipFile, source: Path) -> None:
18 dist_info = Path(self.dist_info)
19- for file in source.glob("**/*"):
20+ for file in sorted(source.glob("**/*") ):
21 if not file.is_file():
22 continue
23
diff --git a/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb b/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb
index 8a95022012..03db426b39 100644
--- a/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb
+++ b/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb
@@ -14,20 +14,17 @@ LIC_FILES_CHKSUM = "\
14 file://src/poetry/core/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ 14 file://src/poetry/core/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \
15 file://src/poetry/core/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ 15 file://src/poetry/core/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \
16 file://src/poetry/core/_vendor/packaging/LICENSE.BSD;md5=7bef9bf4a8e4263634d0597e7ba100b8 \ 16 file://src/poetry/core/_vendor/packaging/LICENSE.BSD;md5=7bef9bf4a8e4263634d0597e7ba100b8 \
17 file://src/poetry/core/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \
18 file://src/poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=b695eb9c6e7a6fb1b1bc2d193c42776e \ 17 file://src/poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=b695eb9c6e7a6fb1b1bc2d193c42776e \
19 file://src/poetry/core/_vendor/tomlkit/LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82 \ 18 file://src/poetry/core/_vendor/tomlkit/LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82 \
20 file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \ 19 file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \
21" 20"
22 21
23SRC_URI[sha256sum] = "514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9" 22SRC_URI[sha256sum] = "253521bb7104e1df81f64d7b49ea1825057c91fa156d7d0bd752fefdad6f8c7a"
24 23
25inherit python_poetry_core pypi 24inherit python_poetry_core pypi
26PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}" 25PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}"
27S = "${WORKDIR}/poetry_core-${PV}" 26S = "${WORKDIR}/poetry_core-${PV}"
28 27
29SRC_URI += "file://deterministic.patch"
30
31RDEPENDS:${PN}:append:class-target = "\ 28RDEPENDS:${PN}:append:class-target = "\
32 python3-compression \ 29 python3-compression \
33 python3-core \ 30 python3-core \