diff --git a/3.3.1.tar.gz b/3.3.1.tar.gz deleted file mode 100644 index be8451a703eb908ff59adc734bcc6304e824155b..0000000000000000000000000000000000000000 Binary files a/3.3.1.tar.gz and /dev/null differ diff --git a/3.3.3.tar.gz b/3.3.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8f310425e44f6a341ae9066b830889185e8137e7 Binary files /dev/null and b/3.3.3.tar.gz differ diff --git a/_bootlocale-removed.patch b/_bootlocale-removed.patch deleted file mode 100644 index 845520fb02ad901a9cecad124d797b0f8d194754..0000000000000000000000000000000000000000 --- a/_bootlocale-removed.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 112dddd8fa5fb9c285fb8ef2818abfef99365070 Mon Sep 17 00:00:00 2001 -From: Victor Stinner -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/import-from-the-new-abc-module.patch b/import-from-the-new-abc-module.patch deleted file mode 100644 index 25c64234fcb84ce8b02253153894d92cb24047d8..0000000000000000000000000000000000000000 --- a/import-from-the-new-abc-module.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d4f4de215094dc9c1f51427f3d24f66739115470 Mon Sep 17 00:00:00 2001 -From: houyingchao <1348375921@qq.com> -Date: Wed, 15 Jun 2022 14:04:57 +0800 -Subject: [PATCH] import-from-the-new-abc-module - ---- - Cheetah/NameMapper.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Cheetah/NameMapper.py b/Cheetah/NameMapper.py -index 3c16dff..d92cddd 100755 ---- a/Cheetah/NameMapper.py -+++ b/Cheetah/NameMapper.py -@@ -140,6 +140,10 @@ Cheetah uses the optimized C version (_namemapper.c) if it has - been compiled or falls back to the Python version if not. - """ - -+try: -+ from collections.abc import Mapping -+except ImportError: -+ from collections import Mapping - import inspect - from pprint import pformat - --- -2.23.0 - diff --git a/python-cheetah.spec b/python-cheetah.spec index 3ab09ca45bed08acf3ecbf4e0a3048c9e9c257ef..073b23abb533a23bb939f5b2816549f7b6ba1a8d 100644 --- a/python-cheetah.spec +++ b/python-cheetah.spec @@ -1,14 +1,12 @@ Name: python-cheetah -Version: 3.3.1 -Release: 2 +Version: 3.3.3 +Release: 1 Summary: The Python-Powered Template Engine License: MIT URL: http://cheetahtemplate.org/ -Source0: https://github.com/CheetahTemplate3/cheetah3/archive/refs/tags/3.3.1.tar.gz +Source0: https://github.com/CheetahTemplate3/cheetah3/archive/refs/tags/%{version}.tar.gz BuildRequires: gcc python3-devel python3-setuptools python3-markdown python3-pygments -Patch0001: resolve-run-test-Wrong-argument.patch - %description Cheetah3 is a free and open source template engine and code-generation tool written in Python. Cheetah can be used unto itself, or incorporated with other technologies and stacks regardless @@ -47,6 +45,9 @@ export PATH="%{buildroot}/%{_bindir}:$PATH" PYTHONPATH="%{buildroot}/%{python3_s %{python3_sitearch}/ %changelog +* Mon Sep 30 2024 wangkai <13474090681@163.com> - 3.3.3-1 +- Update to 3.3.3 + * Thu May 25 2023 caodongxia - 3.3.1-2 - Provide python3dist(cheetah3) to be compatible with older versions diff --git a/python-cheetah.yaml b/python-cheetah.yaml index f361a70904b259468e5100c825cd2d2a9bc576c0..badf3184481fd6bd893cb37e8270e48d80008a63 100644 --- a/python-cheetah.yaml +++ b/python-cheetah.yaml @@ -1,4 +1,4 @@ -version_control: pypi -src_repo: Cheetah3 -tag_prefix: "^v" -seperator: "." +version_control: github +src_repo: CheetahTemplate3/cheetah3 +tag_prefix: "" +separator: "." diff --git a/resolve-run-test-Wrong-argument.patch b/resolve-run-test-Wrong-argument.patch deleted file mode 100644 index e006319675b8908d2f38a744ca36d74e505150d4..0000000000000000000000000000000000000000 --- a/resolve-run-test-Wrong-argument.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d06581d7ecd75a97221f48aa2d0639772f171c0e Mon Sep 17 00:00:00 2001 -From: huangduirong -Date: Sat, 18 Feb 2023 04:12:19 -0500 -Subject: [PATCH] resolve run test Wrong argument - ---- - Cheetah/Tests/Test.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Cheetah/Tests/Test.py b/Cheetah/Tests/Test.py -index a3dfd41..08e79d4 100755 ---- a/Cheetah/Tests/Test.py -+++ b/Cheetah/Tests/Test.py -@@ -16,6 +16,8 @@ import sys - args_l = len(sys.argv) - if args_l == 1: - pass -+elif args_l == 2 and sys.argv[1] == 'test': -+ pass - elif args_l == 2 and sys.argv[1] == '--namemapper-pure': - try: - from Cheetah import _namemapper # noqa --- -2.35.1 -