1 |
commit: d9907d4b39689538ff390572478b4d68e3229a3a |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 23 08:08:11 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 23 08:17:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9907d4b |
7 |
|
8 |
dev-python/cheetah3: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/cheetah3/Manifest | 1 - |
13 |
dev-python/cheetah3/cheetah3-3.2.6.ebuild | 45 ---------------------- |
14 |
.../files/cheetah3-3.2.6-fix-py3.10-tests.patch | 27 ------------- |
15 |
3 files changed, 73 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest |
18 |
index 285b32d7ef70..e848f2352855 100644 |
19 |
--- a/dev-python/cheetah3/Manifest |
20 |
+++ b/dev-python/cheetah3/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST cheetah3-3.2.6.post2.tar.gz 316291 BLAKE2B d5dfaa958bc0cc41097d4a75abfe092d51379efd644daa01caac6ba1b789c21334a662904166b6069a0204e302c1d9e7bea74aa9f11082b9c8fce1c1c509f888 SHA512 b10d2569ce92181029b8f95d23602ec7b002400c8fdf4f6bb095ff40201154b97418fec19c9920f2f212f545633571aa32dc50a16a9ba81a9427303ca7938f29 |
23 |
-DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31 |
24 |
|
25 |
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild |
26 |
deleted file mode 100644 |
27 |
index 77379adab8a1..000000000000 |
28 |
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,45 +0,0 @@ |
31 |
-# Copyright 1999-2022 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=7 |
35 |
- |
36 |
-PYTHON_COMPAT=( python3_{8..10} ) |
37 |
-inherit distutils-r1 |
38 |
- |
39 |
-DESCRIPTION="Python-powered template engine and code generator" |
40 |
-HOMEPAGE="https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/" |
41 |
-SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
42 |
- |
43 |
-LICENSE="MIT" |
44 |
-KEYWORDS="amd64 arm arm64 ~riscv x86" |
45 |
-SLOT="0" |
46 |
- |
47 |
-RDEPEND=" |
48 |
- dev-python/markdown[${PYTHON_USEDEP}] |
49 |
- !dev-python/cheetah |
50 |
-" |
51 |
-BDEPEND="${RDEPEND}" |
52 |
- |
53 |
-DOCS=( ANNOUNCE.rst README.rst TODO ) |
54 |
- |
55 |
-PATCHES=( |
56 |
- "${FILESDIR}/${P}-fix-py3.10-tests.patch" |
57 |
-) |
58 |
- |
59 |
-python_prepare_all() { |
60 |
- # Disable broken tests. |
61 |
- sed \ |
62 |
- -e "/Unicode/d" \ |
63 |
- -e "s/if not sys.platform.startswith('java'):/if False:/" \ |
64 |
- -e "/results =/a\\ sys.exit(not results.wasSuccessful())" \ |
65 |
- -i Cheetah/Tests/Test.py || die "sed failed" |
66 |
- |
67 |
- distutils-r1_python_prepare_all |
68 |
-} |
69 |
- |
70 |
-python_test() { |
71 |
- cp -r "${S}/Cheetah/Tests/ImportHooksTemplates" \ |
72 |
- "${BUILD_DIR}/lib/Cheetah/Tests/ImportHooksTemplates" || die |
73 |
- |
74 |
- "${EPYTHON}" Cheetah/Tests/Test.py || die "Tests fail with ${EPYTHON}" |
75 |
-} |
76 |
|
77 |
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 |
78 |
deleted file mode 100644 |
79 |
index 845520fb02ad..000000000000 |
80 |
--- a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch |
81 |
+++ /dev/null |
82 |
@@ -1,27 +0,0 @@ |
83 |
-From 112dddd8fa5fb9c285fb8ef2818abfef99365070 Mon Sep 17 00:00:00 2001 |
84 |
-From: Victor Stinner <vstinner@××××××.org> |
85 |
-Date: Tue, 19 Jan 2021 11:19:15 +0100 |
86 |
-Subject: [PATCH] Skip test_import_bootlocale() on Python 3.10 |
87 |
- |
88 |
-The _bootlocale module has been removed from Python 3.10: |
89 |
-https://github.com/python/cpython/commit/b62bdf71ea0cd52041d49691d8ae3dc645bd48e1 |
90 |
-https://bugs.python.org/issue42208 |
91 |
---- |
92 |
- Cheetah/Tests/ImportHooks.py | 4 +++- |
93 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
94 |
- |
95 |
-diff --git a/Cheetah/Tests/ImportHooks.py b/Cheetah/Tests/ImportHooks.py |
96 |
-index d7b5f5d..bc0239c 100644 |
97 |
---- a/Cheetah/Tests/ImportHooks.py |
98 |
-+++ b/Cheetah/Tests/ImportHooks.py |
99 |
-@@ -87,7 +87,9 @@ def test_import_builtin(self): |
100 |
- return |
101 |
- raise self.fail("All builtin modules are imported") |
102 |
- |
103 |
-- if not PY2: |
104 |
-+ # _bootlocale was removed in Python 3.10: |
105 |
-+ # https://bugs.python.org/issue42208 |
106 |
-+ if not PY2 and sys.version_info < (3, 10): |
107 |
- def test_import_bootlocale(self): |
108 |
- if '_bootlocale' in sys.modules: |
109 |
- del sys.modules['_bootlocale'] |