From patchwork Wed Jan 1 09:32:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 54846 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 533D1C02192 for ; Wed, 1 Jan 2025 09:32:36 +0000 (UTC) Received: from a27-31.smtp-out.us-west-2.amazonses.com (a27-31.smtp-out.us-west-2.amazonses.com [54.240.27.31]) by mx.groups.io with SMTP id smtpd.web10.11488.1735723937672143311 for ; Wed, 01 Jan 2025 01:32:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=RgtNtFfC; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=3Lp3ZkPg; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.31, mailfrom: 0101019421358da3-d32cbedf-2fb1-45f1-8694-f43e34bb8596-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1735723945; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=3YzsBXp10Zc4o7/TnYjVWt7N5AC6URiG7+GVsucjbN0=; b=RgtNtFfCWRVcRxijjW9Lq8ZKS6nQfc/ozmcqJvqRqghgYoAZZOl1xm0wYP4y9AFp K7Ngw5r0rDbDIcsXRXUa29Sh8QRi5VdHIK0rTlVqd5Q4j8Pf9iyVYcp0jofgiQZYlUG TMu/PNCq1Q7lT+NCo3r/viJcVF0LRT1kAWu4Kmes= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1735723945; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=3YzsBXp10Zc4o7/TnYjVWt7N5AC6URiG7+GVsucjbN0=; b=3Lp3ZkPgMWLC7+ZI4zcwyunH1WTV9hhtXN7y51ISDrllFXPDT8s9VQDzxbHaWLLx y+bNU1QQrbiIgvcCLYYEzSopoLF5Vd7GUZqTOTgSh1PaqOk1u9yFV1QC70Qi8MSiQJ+ aJIW/TPxrZ442Jjta+5yv2hZuncqY1PPWtoe43Ko= MIME-Version: 1.0 From: auh@yoctoproject.org To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: [AUH] python3-jinja2: upgrading to 3.1.5 SUCCEEDED Message-ID: <0101019421358da3-d32cbedf-2fb1-45f1-8694-f43e34bb8596-000000@us-west-2.amazonses.com> Date: Wed, 1 Jan 2025 09:32:25 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.01.01-54.240.27.31 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 01 Jan 2025 09:32:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209213 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *python3-jinja2* to *3.1.5* has Succeeded. Next steps: - apply the patch: git am 0001-python3-jinja2-upgrade-3.1.4-3.1.5.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From c46bb9d47eff5793ce4d4ff9fa244c497e735c8e Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Wed, 1 Jan 2025 07:02:12 +0000 Subject: [PATCH] python3-jinja2: upgrade 3.1.4 -> 3.1.5 --- .../python/python3-jinja2/fix-3.13.patch | 87 ------------------- ...inja2_3.1.4.bb => python3-jinja2_3.1.5.bb} | 7 +- 2 files changed, 2 insertions(+), 92 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} (85%) diff --git a/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch b/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch deleted file mode 100644 index 34ecd15176..0000000000 --- a/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch +++ /dev/null @@ -1,87 +0,0 @@ -From cf6ba7732b49ab4637aa747186cf1d1572688584 Mon Sep 17 00:00:00 2001 -From: Thomas Grainger -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 ---- - 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 - diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.5.bb similarity index 85% rename from meta/recipes-devtools/python/python3-jinja2_3.1.4.bb rename to meta/recipes-devtools/python/python3-jinja2_3.1.5.bb index fd0afc1cb1..e5212e7ffc 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.5.bb @@ -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,10 +14,7 @@ CLEANBROKEN = "1" inherit pypi python_flit_core ptest -SRC_URI += " \ - file://run-ptest \ - file://fix-3.13.patch \ -" +SRC_URI += "file://run-ptest" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests