commit: 336345316628860e8b25582f8d4745456461e776 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jan 11 09:29:58 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jan 11 09:35:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33634531
dev-python/jinja2: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/jinja2/Manifest | 1 - dev-python/jinja2/files/jinja2-3.1.4-py313.patch | 67 ------------------------ dev-python/jinja2/jinja2-3.1.4.ebuild | 51 ------------------ 3 files changed, 119 deletions(-) diff --git a/dev-python/jinja2/Manifest b/dev-python/jinja2/Manifest index b45554b87b91..e12212062b7c 100644 --- a/dev-python/jinja2/Manifest +++ b/dev-python/jinja2/Manifest @@ -1,2 +1 @@ -DIST jinja2-3.1.4.tar.gz 240245 BLAKE2B cb70699cea93ddf53b7c8876b9006cc70599d49f8c64ab615759a53db6829cab7b55ac673777bc4c8dc5dfc68efada29d37f47fe7cf449044721f659fe6a654d SHA512 d07d68a2687af68c705d3b7f5a2c67aca7b9d125316b15085888b9d0d6e769981af76f6f524728b89b5501bd671d518fcb2638f9ae112e57ca2bf2a53482cd89 DIST jinja2-3.1.5.tar.gz 244674 BLAKE2B 0b3f44e5d3a5f3d898d0b678035ddaaeb30f1f7ca09555da93adbb8d7f7159a3e192809f69f47c21ce5be6f4fb1cc91bc35d4d62f2c38c71582210085091b3d7 SHA512 75ad0094482c69d45fcd3aa8ee32e249931e53fee3f804f6ddfd5b6da0ed16962d8f1fced811e7dcb4d8401fadd828e77528d6d1280547a7d4f5f77cccf9bbd4 diff --git a/dev-python/jinja2/files/jinja2-3.1.4-py313.patch b/dev-python/jinja2/files/jinja2-3.1.4-py313.patch deleted file mode 100644 index b68091e5397a..000000000000 --- a/dev-python/jinja2/files/jinja2-3.1.4-py313.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 679af7f816ced8941ed5cf9b151a0cac543d0336 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 - ---- - src/jinja2/loaders.py | 32 ++++++++++++++++++++++++++------ - tests/test_loader.py | 2 +- - 2 files changed, 27 insertions(+), 7 deletions(-) - -diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py -index 9eaf647ba..8c2c86cd0 100644 ---- a/src/jinja2/loaders.py -+++ b/src/jinja2/loaders.py -@@ -238,6 +238,30 @@ def list_templates(self) -> t.List[str]: - 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 @@ def list_templates(self) -> t.List[str]: - 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 @@ def list_templates(self) -> t.List[str]: - ) - 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/dev-python/jinja2/jinja2-3.1.4.ebuild b/dev-python/jinja2/jinja2-3.1.4.ebuild deleted file mode 100644 index abbf2c5a1c94..000000000000 --- a/dev-python/jinja2/jinja2-3.1.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYPI_PN=jinja2 -PYTHON_COMPAT=( python3_{10..13} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 pypi - -DESCRIPTION="A full-featured template engine for Python" -HOMEPAGE=" - https://palletsprojects.com/p/jinja/ - https://github.com/pallets/jinja/ - https://pypi.org/project/Jinja2/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - -RDEPEND=" - >=dev-python/markupsafe-2.0[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs \ - dev-python/sphinx-issues \ - dev-python/pallets-sphinx-themes -distutils_enable_tests pytest - -# XXX: handle Babel better? - -src_prepare() { - local PATCHES=( - # https://github.com/pallets/jinja/pull/1979 - "${FILESDIR}/${P}-py313.patch" - ) - - # avoid unnecessary dep on extra sphinxcontrib modules - sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die - - distutils-r1_src_prepare -} - -pkg_postinst() { - if ! has_version dev-python/babel; then - elog "For i18n support, please emerge dev-python/babel." - fi -}
