diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /dev-python/cheetah3 | |
parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) |
gentoo resync : 07.08.2021
Diffstat (limited to 'dev-python/cheetah3')
-rw-r--r-- | dev-python/cheetah3/Manifest | 5 | ||||
-rw-r--r-- | dev-python/cheetah3/cheetah3-3.2.6.ebuild | 8 | ||||
-rw-r--r-- | dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch | 27 | ||||
-rw-r--r-- | dev-python/cheetah3/metadata.xml | 1 |
4 files changed, 37 insertions, 4 deletions
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest index ffb496a1a564..2a90fb4168fb 100644 --- a/dev-python/cheetah3/Manifest +++ b/dev-python/cheetah3/Manifest @@ -1,3 +1,4 @@ +AUX cheetah3-3.2.6-fix-py3.10-tests.patch 1082 BLAKE2B 5e418f22d9067208c038ddcbd35ef5942c09bc92a14a9a28c7ed996496c419b41b772d1fafd3ac01b524aea0dd70706ea69815db0f6fbb3de26abd95b416c3c4 SHA512 1adcc664bfd580fcd62156591b52375e3f01a5107a995ad6a8c01baf8e604c2114451be7cd13775bdf2bcc2d16998d86fd5d0db38c85d4ff6e52bd314fb3c264 DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31 -EBUILD cheetah3-3.2.6.ebuild 1116 BLAKE2B 39fcd02539cf2a09afd27e91276481bcbe6fea3fa8a31b7b9189e37d195e57797d84ebaff1231a3d8495f54b8649f68c21f538a46824ded381cdee727c934694 SHA512 75794dec4df190a31c2ee9019b66bcd6c9cbbef165e444929b6191edfc0eaa5904c4c9a1f28c9355a5d603add708faa6e5db1c7c5cba499590029363571bbc21 -MISC metadata.xml 662 BLAKE2B 3dfe6898c1c2b60050da8427fd4e51a07ba7870120ce491166b9fd222bbaa49e7df7ba3afafe8b159a7b60f781da67dc0dfdf03f085e813cb3f6d59169ecc526 SHA512 b15fac64b057cc9216aaa21002332ec348e89a618ba4c32dd8b9622afd17d7d8db6ef6c3e7c645ad0a03b306c50b79322f5ad1866db93f1033e69b1c7d6130a1 +EBUILD cheetah3-3.2.6.ebuild 1141 BLAKE2B 32148f9cfe925c3b88dccbec20e7c3f555f150b5628dd98394c6df15c21dba364c5b53dbad36b5e3e5e8ebfa0cbfc4c727de63f2a513926ea015dfedfddddfb9 SHA512 74f937845d14930953a5bf9f3286a637470cb1bdf3fb1b7af9f7f42f8cbef44033ec8da166b9ee1c69dce95921f66b3f68398c8eda51d45df244b5df04dc48bf +MISC metadata.xml 727 BLAKE2B ccbc87781409c89177a8c5e53e21ecf4ebef72351194cd45686e2ac0275b081bb349450f8f66618526d7fbd3038189919d94dd6ea8fc811fa26b09b0d02335a1 SHA512 5fe5a3f3f22238e7c1b9b0ce54d68266678a6078b34ea1472bd140f7f065a9aa658e5c2605c59b31707e1c275b88ee20481443aaf2970f956d1c0a2d5c472874 diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild index 750ee0a37321..c4cb900671de 100644 --- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild +++ b/dev-python/cheetah3/cheetah3-3.2.6.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) -DISTUTILS_USE_SETUPTOOLS=bdepend + +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 DESCRIPTION="Python-powered template engine and code generator" @@ -22,6 +22,10 @@ BDEPEND="${RDEPEND}" DOCS=( ANNOUNCE.rst README.rst TODO ) +PATCHES=( + "${FILESDIR}/${P}-fix-py3.10-tests.patch" +) + python_prepare_all() { # Disable broken tests. sed \ diff --git a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch new file mode 100644 index 000000000000..845520fb02ad --- /dev/null +++ b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch @@ -0,0 +1,27 @@ +From 112dddd8fa5fb9c285fb8ef2818abfef99365070 Mon Sep 17 00:00:00 2001 +From: Victor Stinner <vstinner@python.org> +Date: Tue, 19 Jan 2021 11:19:15 +0100 +Subject: [PATCH] Skip test_import_bootlocale() on Python 3.10 + +The _bootlocale module has been removed from Python 3.10: +https://github.com/python/cpython/commit/b62bdf71ea0cd52041d49691d8ae3dc645bd48e1 +https://bugs.python.org/issue42208 +--- + Cheetah/Tests/ImportHooks.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Cheetah/Tests/ImportHooks.py b/Cheetah/Tests/ImportHooks.py +index d7b5f5d..bc0239c 100644 +--- a/Cheetah/Tests/ImportHooks.py ++++ b/Cheetah/Tests/ImportHooks.py +@@ -87,7 +87,9 @@ def test_import_builtin(self): + return + raise self.fail("All builtin modules are imported") + +- if not PY2: ++ # _bootlocale was removed in Python 3.10: ++ # https://bugs.python.org/issue42208 ++ if not PY2 and sys.version_info < (3, 10): + def test_import_bootlocale(self): + if '_bootlocale' in sys.modules: + del sys.modules['_bootlocale'] diff --git a/dev-python/cheetah3/metadata.xml b/dev-python/cheetah3/metadata.xml index 52f8ccc1f81d..c6b648884ee0 100644 --- a/dev-python/cheetah3/metadata.xml +++ b/dev-python/cheetah3/metadata.xml @@ -11,5 +11,6 @@ are its principle user group, but it has many potential uses and is also being used to generate C++ game code, Java, SQL, form emails, and even Python code.</longdescription> <upstream> <remote-id type="pypi">Cheetah3</remote-id> + <remote-id type="github">CheetahTemplate3/cheetah3</remote-id> </upstream> </pkgmetadata> |