[gentoo-commits] repo/gentoo:master commit in: dev-python/cheetah3/, dev-python/cheetah3/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/cheetah3/, dev-python/cheetah3/files/

[Michał Górny]

commit:     b5d2f62890c13559a006fbaac56a0c4530b1f07d
Author:     Arthur Zamarin <arthurzam <AT> gmail <DOT> com>
AuthorDate: Mon Aug  2 17:59:50 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug  5 18:07:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d2f628

dev-python/cheetah3: enable py3.10

Signed-off-by: Arthur Zamarin <arthurzam <AT> gmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/cheetah3/cheetah3-3.2.6.ebuild          |  8 +++++--
 .../files/cheetah3-3.2.6-fix-py3.10-tests.patch    | 27 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
index 750ee0a3732..c4cb900671d 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 00000000000..845520fb02a
--- /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']

[gentoo-commits] repo/gentoo:master commit in: dev-python/cheetah3/, dev-python/cheetah3/files/

[Michał Górny]

commit:     d9907d4b39689538ff390572478b4d68e3229a3a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 08:08:11 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 08:17:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9907d4b

dev-python/cheetah3: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/cheetah3/Manifest                       |  1 -
 dev-python/cheetah3/cheetah3-3.2.6.ebuild          | 45 ----------------------
 .../files/cheetah3-3.2.6-fix-py3.10-tests.patch    | 27 -------------
 3 files changed, 73 deletions(-)

diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 285b32d7ef70..e848f2352855 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,2 +1 @@
 DIST cheetah3-3.2.6.post2.tar.gz 316291 BLAKE2B d5dfaa958bc0cc41097d4a75abfe092d51379efd644daa01caac6ba1b789c21334a662904166b6069a0204e302c1d9e7bea74aa9f11082b9c8fce1c1c509f888 SHA512 b10d2569ce92181029b8f95d23602ec7b002400c8fdf4f6bb095ff40201154b97418fec19c9920f2f212f545633571aa32dc50a16a9ba81a9427303ca7938f29
-DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31

diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
deleted file mode 100644
index 77379adab8a1..000000000000
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
-SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-SLOT="0"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-	!dev-python/cheetah
-"
-BDEPEND="${RDEPEND}"
-
-DOCS=( ANNOUNCE.rst README.rst TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
-)
-
-python_prepare_all() {
-	# Disable broken tests.
-	sed \
-		-e "/Unicode/d" \
-		-e "s/if not sys.platform.startswith('java'):/if False:/" \
-		-e "/results =/a\\    sys.exit(not results.wasSuccessful())" \
-		-i Cheetah/Tests/Test.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r "${S}/Cheetah/Tests/ImportHooksTemplates" \
-		"${BUILD_DIR}/lib/Cheetah/Tests/ImportHooksTemplates" || die
-
-	"${EPYTHON}" Cheetah/Tests/Test.py || die "Tests fail with ${EPYTHON}"
-}

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
deleted file mode 100644
index 845520fb02ad..000000000000
--- a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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']