python3-click: update 8.1.7 -> 8.1.8
PATCH v2 1/2 python3-click: update 8.1.7 -> 8.1.8
From: Alexander Kanavin <[email protected]>
License-Update: renamed file
Convert from setuptools to flit.
Signed-off-by Alexander Kanavin <[email protected]>
---
.../{python3-click_8.1.7.bb => python3-click_8.1.8.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python/{python3-click_8.1.7.bb => python3-click_8.1.8.bb} (73%)meta/recipes-devtools/python/python3-click_8.1.8.bb renamed from meta/recipes-devtools/python/python3-click_8.1.7.bb +4 -4
@@ -6,11 +6,11 @@ Line Interface Creation Kit". It's highly configurable but comes with \ sensible defaults out of the box." HOMEPAGE = "http://click.pocoo.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fa98232fd645608937a0fdc82e999b8" -SRC_URI[sha256sum] = "ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" +SRC_URI[sha256sum] = "ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a" -inherit pypi setuptools3 ptest-python-pytest +inherit pypi python_flit_core ptest-python-pytest RDEPENDS:${PN}-ptest += " \ python3-pytest \
@@ -19,7 +19,7 @@ RDEPENDS:${PN}-ptest += " \ " do_install_ptest:append() { - cp -rf ${S}/setup.cfg ${D}${PTEST_PATH}/ + cp -rf ${S}/pyproject.toml ${D}${PTEST_PATH}/ cp -rf ${S}/docs ${D}${PTEST_PATH}/ }
Signature · 1 line
2.39.5
PATCH v2 2/2 python3-jinja2: upgrade 3.1.4 -> 3.1.5
From: Alexander Kanavin <[email protected]>
Signed-off-by Alexander Kanavin <[email protected]>
---
.../python/python3-jinja2/fix-3.13.patch | 87 -------------------
...inja2_3.1.4.bb => python3-jinja2_3.1.5.bb} | 9 +-
2 files changed, 5 insertions(+), 91 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch
rename meta/recipes-devtools/python/{python3-jinja2_3.1.4.bb => python3-jinja2_3.1.5.bb} (74%)meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch deleted +0 -87
@@ -1,87 +0,0 @@ -From cf6ba7732b49ab4637aa747186cf1d1572688584 Mon Sep 17 00:00:00 2001 -From: Thomas Grainger <[email protected]> -Date: Mon, 13 May 2024 18:02:35 +0100 -Subject: [PATCH] fix test_package_zip_list on 3.13 - -Upstream-Status: Backport [https://github.com/pallets/jinja/pull/1979] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - src/jinja2/loaders.py | 32 ++++++++++++++++++++++++++------ - tests/test_loader.py | 4 ++-- - 2 files changed, 28 insertions(+), 8 deletions(-) - -diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py -index 9eaf647..8c2c86c 100644 ---- a/src/jinja2/loaders.py -+++ b/src/jinja2/loaders.py -@@ -238,6 +238,30 @@ class FileSystemLoader(BaseLoader): - return sorted(found) - - -+if sys.version_info >= (3, 13): -+ -+ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]: -+ try: -+ get_files = z._get_files -+ except AttributeError as e: -+ raise TypeError( -+ "This zip import does not have the required" -+ " metadata to list templates." -+ ) from e -+ return get_files() -+else: -+ -+ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]: -+ try: -+ files = z._files -+ except AttributeError as e: -+ raise TypeError( -+ "This zip import does not have the required" -+ " metadata to list templates." -+ ) from e -+ return files # type: ignore[no-any-return] -+ -+ - class PackageLoader(BaseLoader): - """Load templates from a directory in a Python package. - -@@ -382,11 +406,7 @@ class PackageLoader(BaseLoader): - for name in filenames - ) - else: -- if not hasattr(self._loader, "_files"): -- raise TypeError( -- "This zip import does not have the required" -- " metadata to list templates." -- ) -+ files = _get_zipimporter_files(self._loader) - - # Package is a zip file. - prefix = ( -@@ -395,7 +415,7 @@ class PackageLoader(BaseLoader): - ) - offset = len(prefix) - -- for name in self._loader._files.keys(): -+ for name in files: - # Find names under the templates directory that aren't directories. - if name.startswith(prefix) and name[-1] != os.path.sep: - results.append(name[offset:].replace(os.path.sep, "/")) -diff --git a/tests/test_loader.py b/tests/test_loader.py -index 77d686e..e0683e4 100644 ---- a/tests/test_loader.py -+++ b/tests/test_loader.py -@@ -364,8 +364,8 @@ def test_package_zip_source(package_zip_loader, template, expect): - - - @pytest.mark.xfail( -- platform.python_implementation() == "PyPy", -- reason="PyPy's zipimporter doesn't have a '_files' attribute.", -+ sys.implementation.name == "pypy", -+ reason="zipimporter doesn't have a '_files' attribute", - raises=TypeError, - ) - def test_package_zip_list(package_zip_loader): --- -2.39.5 -
meta/recipes-devtools/python/python3-jinja2_3.1.5.bb renamed from meta/recipes-devtools/python/python3-jinja2_3.1.4.bb +5 -4
@@ -4,7 +4,7 @@ HOMEPAGE = "https://pypi.org/project/Jinja2/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[sha256sum] = "4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369" +SRC_URI[sha256sum] = "8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb" PYPI_PACKAGE = "jinja2"
@@ -14,9 +14,10 @@ CLEANBROKEN = "1" inherit pypi python_flit_core ptest-python-pytest -SRC_URI += " \ - file://fix-3.13.patch \ -" +do_install_ptest:append() { + # test_async items require trio module + rm -f ${D}${PTEST_PATH}/tests/test_async.py ${D}${PTEST_PATH}/tests/test_async_filters.py +} RDEPENDS:${PN}-ptest += " \ python3-unixadmin \
Signature · 1 line
2.39.5