From patchwork Wed Jan 8 16:49:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55244 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 E167FE77199 for ; Wed, 8 Jan 2025 16:49:32 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.24577.1736354964534087318 for ; Wed, 08 Jan 2025 08:49:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Nfb2rVUs; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43618283dedso345205e9.3 for ; Wed, 08 Jan 2025 08:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736354963; x=1736959763; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6qtrVdNxnRSGBcj1+fPkU6Kjoft+8MABe5a76fpW/jI=; b=Nfb2rVUsoHgwKwipxerG6fvEumDWOiRDVYx7nWyOXgb6wuV9e6KqtMenNuDNo8BUfJ W91bIBpBDxMpAMTCYPUG5/taz80uQlfyrpo4Xi/pvrdI1l1D0pVMnaW6pzA6RS4+HDdu y2GmuL4cdpZQyBatXKlwNGK21+A+jyCWpdR+A83XBUwsRmS5DRD2KOY9rIay7cpUnlT5 1LFBQ3hl6RXfmTV1qszf0sA6CGWkVVcaj4JAg/S20jJT8jDIs6rX4nBVedfgD8uwF2W+ h32Efm0YIAE3nAjNrCLxaZznvjVxGW3NJepIDnTlTQ3q5m4EBO8cdiGJmIOF/rYgNwbm MHzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736354963; x=1736959763; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6qtrVdNxnRSGBcj1+fPkU6Kjoft+8MABe5a76fpW/jI=; b=qdZkzn4FLq/DUoegYapkIKxTlQvGBk0+pl9NJ3mZ7NbAO+T8I3zpe5ZwmONS0rrUVb 2C5WGKBq24+Pz+Sxp3tGP2ba+kHyLzffEf2V+HMbgtpE+vhZAQnlKIbxNXWTLiEZWNTD TN8OvfQ0C2yvDX8Bew/7U9v4CqE/DJL/oNtYdtpViyBUBjlR47eKBqGHEVQ3xdQZMR4m 7ziP2ZeLj0OGqB3GUKIHLsrTPOd7Bu6UrPhwKnnjbB6jUaijS8uRODGnG8x0XyJjjvsv hJj0OEVwaSGLFPVWBpkYAQxYXrBVCqQCmcXz/v4xcXlLepNNF/8e+H1lQdumPyqQm97U s/Qw== X-Gm-Message-State: AOJu0YwOM3VYNAjB1j4qmXD17DdmU2VzId9Q8/6xpAJLifWKzz2HukG6 SiIUHai9VfCSBIL5bXTDHsCbe7zqVflIpD86xbg8KQ7GJzB8dwmzZF3w9A== X-Gm-Gg: ASbGnctHLucGMnc36l2ry7U9g5+0K5w36DmZCX+jyZj/T60B6O8E1Shd5EZ59EN27h0 PLoErOY4iZaFP2Kg+Hrt1zE5461KXKVM4zomiiNUsnwmedvYBl6szbgVMGC6z12aJYXLD1uOaQY 5dGN3H1VKOKXGCKTckfx9G7GOWsu2Ct+mO49iKuQB20962q5a/0Luq6Iq3wfTHQngc1x4yDjL4Q d2h6ydd96eIT7YR5pGaA2IEycXp7ZPkDb4ZSi7Yt+KwQ4ywOoLqKTdr4G/VSvfvb7skFrBgnKMP k8apW531jV2ZEM8JpQ== X-Google-Smtp-Source: AGHT+IFMGekJQn2l4/Se83mLFTN3GIXtFqjPNcSYEZDb6XFts9fV+pYOYxoyqbRjyLvRNKgjbCePmA== X-Received: by 2002:a05:600c:45c3:b0:434:a90b:94fe with SMTP id 5b1f17b1804b1-436e26c3c3fmr35121135e9.10.1736354962474; Wed, 08 Jan 2025 08:49:22 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2dc12dasm26649075e9.10.2025.01.08.08.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 08:49:22 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH v2 1/2] python3-click: update 8.1.7 -> 8.1.8 Date: Wed, 8 Jan 2025 17:49:15 +0100 Message-Id: <20250108164916.2671907-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 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, 08 Jan 2025 16:49:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209582 From: Alexander Kanavin License-Update: renamed file Convert from setuptools to flit. Signed-off-by: Alexander Kanavin --- .../{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%) diff --git a/meta/recipes-devtools/python/python3-click_8.1.7.bb b/meta/recipes-devtools/python/python3-click_8.1.8.bb similarity index 73% rename from meta/recipes-devtools/python/python3-click_8.1.7.bb rename to meta/recipes-devtools/python/python3-click_8.1.8.bb index e8eeec36e8b..7be3d735460 100644 --- a/meta/recipes-devtools/python/python3-click_8.1.7.bb +++ b/meta/recipes-devtools/python/python3-click_8.1.8.bb @@ -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}/ } From patchwork Wed Jan 8 16:49:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55245 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 EB655E7719A for ; Wed, 8 Jan 2025 16:49:32 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.24578.1736354965196728237 for ; Wed, 08 Jan 2025 08:49:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iDo9+gFm; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-386329da1d9so8036767f8f.1 for ; Wed, 08 Jan 2025 08:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736354963; x=1736959763; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I5Zg9v5iAvtyfTGqp4HBkpjyGnfMuZ9z0UIUKrrbQxI=; b=iDo9+gFmoe/FWcpw/db8Sj23HUSGh7fYNAg7DI6W1pe2KmsuQtSmFajadnfVtycF2W A31CHPTYdmxdsiwx+4JES6mqzqqIPhATqHSVgq8kV/texSu7SoVZdmmdl/CMCK3Jp0oW +Ui3zOi/CaIce2MAgACmIL0Me+ECWYJb8VMi6YTwMAG1pOIv7V7TJkSKUn9YGU6WQU8f EWyA0k22/luvs5iGytcv4cZyIUN+ioa2KN6yCbXC2fLnXUafxvtniYqc7G+BOla9taDs 7ldn/Oo3bqfekY7xovQwdBX8tOGUajMmJ+7JPssTE/BvA9QP7zrXyMzO4wFrG9RB+q7a o5qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736354963; x=1736959763; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I5Zg9v5iAvtyfTGqp4HBkpjyGnfMuZ9z0UIUKrrbQxI=; b=vk3uzNF/rq3/J1R0RZfwjKgi/BDl7YhqpkXyDCY5neRmOErC184h6R/on1OVujEQN8 CgUEBIWL5Z41Eij91GfNqVWq6KUyW70ltzmOlIBY3qKgMm4OOYCpV9pitgyPO9IM9fhh tZoJzhMWGdVcCnd3ORO1zgaAEw7MfsdnbTf5ZNFeyhp/BCSYpr1yOV0l3i7zR2SWPGLi rMkOSFt797UDNtY9f3BPsRXMwbkLLNUVYyZstrgmIJ39F4r8NM2KTTdjHz9JW1rdp0eR v3qCtfXqdzVjwHwnrOrpBmgI8RYLYW9kraUbnvxlC/fh4mWltl5gxnKrn6NkjU9uQFyW aq2Q== X-Gm-Message-State: AOJu0YxUV88w22DHIdhPvwC6CUTPxUbi3lDlNUhzw+Cd3Oi3VZwF6tBu eVzFCrFicSg1ATJQiLISbtrlVU6EL05Bs3TStuHDvt1B6BeNHzqy15C4Bg== X-Gm-Gg: ASbGnctoQghgdMShTYlcut1AJc6F8sX+QAZ2RHjKk0Rt1Mze//JGYYP3Z0hwEoo/CLt p1XjGRLO9+kx5WKsuaTm/RtFbjlcHb09txzNnnSLo+v6zmqKgyxGGS0PDSWLS0HVu53LAH544Aj tegi5ttU3ONVUHQ0TH1LgD6q1g6CeNPxW7paR4d0RMGSUQQFcsZS8dJTeBWqaUVSGcOZGO+lHwi yxB57U+BSr9XWjpprJ0VQSxWzwJlhYb7rkndJI8r9Nxha+h5TD0LRrPRndvxzNx6uCoa7Ai925d 9UN2GjpCN2ENppffSQ== X-Google-Smtp-Source: AGHT+IGIsIm66dGGUIx6Hcq4+N+uWrhBO9o+soBcWymRhxudPTYk5yy1oWcisI2QedI17CwLpGp/gw== X-Received: by 2002:a05:6000:1fa1:b0:388:caf4:e909 with SMTP id ffacd0b85a97d-38a872e8bc4mr3134604f8f.25.1736354963285; Wed, 08 Jan 2025 08:49:23 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2dc12dasm26649075e9.10.2025.01.08.08.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 08:49:22 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH v2 2/2] python3-jinja2: upgrade 3.1.4 -> 3.1.5 Date: Wed, 8 Jan 2025 17:49:16 +0100 Message-Id: <20250108164916.2671907-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108164916.2671907-1-alex.kanavin@gmail.com> References: <20250108164916.2671907-1-alex.kanavin@gmail.com> MIME-Version: 1.0 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, 08 Jan 2025 16:49:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209583 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../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%) 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 34ecd15176c..00000000000 --- 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 74% 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 84c40796c63..b9ef57f5991 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,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 \