From 7c12ae907e17cae4a5477dcfa0c978d9106edac9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 17 2022 10:12:16 +0000 Subject: import python-jinja2-2.11.3-4.el9 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3676349 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/Jinja2-2.11.3.tar.gz diff --git a/.python-jinja2.metadata b/.python-jinja2.metadata new file mode 100644 index 0000000..3a4d536 --- /dev/null +++ b/.python-jinja2.metadata @@ -0,0 +1 @@ +034173d87c9c5d1c2000f337be45b582dc0eb172 SOURCES/Jinja2-2.11.3.tar.gz diff --git a/SOURCES/0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch b/SOURCES/0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch new file mode 100644 index 0000000..7840d4f --- /dev/null +++ b/SOURCES/0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch @@ -0,0 +1,27 @@ +From 9a99db929323f60553b391c80d0395821121d593 Mon Sep 17 00:00:00 2001 +From: Thomas Moschny +Date: Tue, 19 Jan 2021 21:01:18 +0100 +Subject: [PATCH] add 'linetable' to the preserved CodeType attributes (#1334) + +add 'linetable' to the preserved CodeType attributes + +co_linetable replaces co_lnotab as part of PEP 626 in Python 3.10. +--- + src/jinja2/debug.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/jinja2/debug.py b/src/jinja2/debug.py +index 5d8aec3..e256617 100644 +--- a/src/jinja2/debug.py ++++ b/src/jinja2/debug.py +@@ -137,6 +137,7 @@ def fake_traceback(exc_value, tb, filename, lineno): + "lnotab", + "freevars", + "cellvars", ++ "linetable", # Python 3.10 + ): + if isinstance(attr, tuple): + # Replace with given value. +-- +2.29.2 + diff --git a/SOURCES/0002-native_concat-pass-only-strings-to-literal_eval.patch b/SOURCES/0002-native_concat-pass-only-strings-to-literal_eval.patch new file mode 100644 index 0000000..3e0e76a --- /dev/null +++ b/SOURCES/0002-native_concat-pass-only-strings-to-literal_eval.patch @@ -0,0 +1,49 @@ +From 58250a709532ccb3e6d92ca65b3d305d1464cb68 Mon Sep 17 00:00:00 2001 +From: Martin Krizek +Date: Thu, 28 Jan 2021 10:08:50 +0100 +Subject: [PATCH] native_concat: pass only strings to literal_eval + +If there is only single node and it is not a string, there is no point +in passing it into ``literal_eval``, just return it immediately. + +One of the examples where passing a non-string node into +``literal_eval`` would actually cause problems is when the node is +``Undefined``. On Python 3.10 this would cause ``UndefinedError`` +instead of just ``Undefined`` being returned. + +Fixes #1335 +--- + CHANGES.rst | 3 +++ + src/jinja2/nativetypes.py | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/CHANGES.rst b/CHANGES.rst +index 511b22b..a8a66ea 100644 +--- a/CHANGES.rst ++++ b/CHANGES.rst +@@ -8,6 +8,9 @@ Released 2021-01-31 + - Improve the speed of the ``urlize`` filter by reducing regex + backtracking. Email matching requires a word character at the start + of the domain part, and only word characters in the TLD. :pr:`1343` ++- Fix UndefinedError incorrectly being thrown on an undefined variable ++ instead of ``Undefined`` being returned on ++ ``NativeEnvironment`` on Python 3.10. :issue:`1335` + + + Version 2.11.2 +diff --git a/src/jinja2/nativetypes.py b/src/jinja2/nativetypes.py +index a9ead4e..2fee17f 100644 +--- a/src/jinja2/nativetypes.py ++++ b/src/jinja2/nativetypes.py +@@ -26,6 +26,8 @@ def native_concat(nodes): + + if len(head) == 1: + raw = head[0] ++ if not isinstance(raw, str): ++ return raw + else: + raw = u"".join([text_type(v) for v in chain(head, nodes)]) + +-- +2.29.2 + diff --git a/SPECS/python-jinja2.spec b/SPECS/python-jinja2.spec new file mode 100644 index 0000000..7242139 --- /dev/null +++ b/SPECS/python-jinja2.spec @@ -0,0 +1,463 @@ +%global srcname Jinja2 + +Name: python-jinja2 +Version: 2.11.3 +Release: 4%{?dist} +Summary: General purpose template engine +License: BSD +URL: https://palletsprojects.com/p/jinja/ +Source0: %{pypi_source} +# cherry-picked patches to build with Python 3.10 (#1907442) +Patch1: 0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch +Patch2: 0002-native_concat-pass-only-strings-to-literal_eval.patch + +%if 0%{?fedora} || 0%{?rhel} > 7 +# Enable python3 build by default +%bcond_without python3 +%else +%bcond_with python3 +%endif + +%if 0%{?fedora} > 33 || 0%{?rhel} > 7 +# Disable python2 build by default +%bcond_with python2 +%else +%bcond_without python2 +%endif + +# No docs in RHEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=1944567 +%bcond_with docs + +%if 0%{?fedora} || 0%{?rhel} > 7 +%bcond_without async +%else +%bcond_with async +%endif + +BuildArch: noarch + +%description +Jinja2 is a template engine written in pure Python. It provides a +Django inspired non-XML syntax but supports inline expressions and an +optional sandboxed environment. + +If you have any exposure to other text-based template languages, such +as Smarty or Django, you should feel right at home with Jinja2. It's +both designer and developer friendly by sticking to Python's +principles and adding functionality useful for templating +environments. + + +%if %{with python2} +%package -n python2-jinja2 +Summary: General purpose template engine for python2 +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-babel >= 0.8 +BuildRequires: python2-markupsafe >= 0.23 +Requires: python2-babel >= 0.8 +Requires: python2-markupsafe >= 0.23 +Requires: python2-setuptools +%{?python_provide:%python_provide python2-jinja2} + +%description -n python2-jinja2 +Jinja2 is a template engine written in pure Python. It provides a +Django inspired non-XML syntax but supports inline expressions and an +optional sandboxed environment. + +If you have any exposure to other text-based template languages, such +as Smarty or Django, you should feel right at home with Jinja2. It's +both designer and developer friendly by sticking to Python's +principles and adding functionality useful for templating +environments. +%endif # with python2 + + +%if %{with python3} +%package -n python3-jinja2 +Summary: General purpose template engine for python3 +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-babel >= 0.8 +BuildRequires: python3-markupsafe >= 0.23 +BuildRequires: python3-pytest +%if %{with docs} +BuildRequires: %{_bindir}/sphinx-build-3 +BuildRequires: make +BuildRequires: python3-Pallets-Sphinx-Themes +BuildRequires: python3-sphinxcontrib-log-cabinet +BuildRequires: python3-sphinx-issues +%endif +Requires: python3-babel >= 0.8 +Requires: python3-markupsafe >= 0.23 +Requires: python3-setuptools +%{?python_provide:%python_provide python3-jinja2} + +%description -n python3-jinja2 +Jinja2 is a template engine written in pure Python. It provides a +Django inspired non-XML syntax but supports inline expressions and an +optional sandboxed environment. + +If you have any exposure to other text-based template languages, such +as Smarty or Django, you should feel right at home with Jinja2. It's +both designer and developer friendly by sticking to Python's +principles and adding functionality useful for templating +environments. +%endif # with python3 + + +%prep +%autosetup -p1 -n %{srcname}-%{version} + +# cleanup +find . -name '*.pyo' -o -name '*.pyc' -delete + +%build +%if %{with python2} +%py2_build +%endif # with python2 + +%if %{with python3} +%py3_build +%if %{with docs} +make -C docs html PYTHONPATH=$(pwd)/src SPHINXBUILD=sphinx-build-3 +# remove hidden file +rm -rf docs/_build/html/.buildinfo +%endif # with docs +%endif # with python3 + + +%install +%if %{with python2} +%py2_install + +# these files are valid only on Python 3.6+ +rm %{buildroot}%{python2_sitelib}/jinja2/asyncsupport.py +rm %{buildroot}%{python2_sitelib}/jinja2/asyncfilters.py +%endif # with python2 + +%if %{with python3} +%py3_install + +%if ! %{with async} +# these files are valid only on Python 3.6+ +rm %{buildroot}%{python3_sitelib}/jinja2/asyncsupport.py +rm %{buildroot}%{python3_sitelib}/jinja2/asyncfilters.py +%endif # ! with async +%endif # with python3 + + +%check +%if %{with python3} +PYTHONPATH=$(pwd)/src %{__python3} -m pytest tests +%endif # with python3 + + +%if %{with python2} +%files -n python2-jinja2 +%doc CHANGES.rst +%doc ext +%doc examples +%license LICENSE.rst +%if %{with docs} +%doc docs/_build/html +%endif +%{python2_sitelib}/jinja2/ +%{python2_sitelib}/Jinja2-*.egg-info/ +%endif # with python2 + + +%if %{with python3} +%files -n python3-jinja2 +%doc CHANGES.rst +%doc ext +%doc examples +%license LICENSE.rst +%if %{with docs} +%doc docs/_build/html +%endif +%{python3_sitelib}/jinja2/ +%{python3_sitelib}/Jinja2-*.egg-info/ +%endif # with python3 + + +%changelog +* Tue Aug 10 2021 Mohan Boddu - 2.11.3-4 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Apr 16 2021 Mohan Boddu - 2.11.3-3 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Apr 13 2021 Miro Hrončok - 2.11.3-2 +- Disable documentation +- Resolves: rhbz#1944567 + +* Sat Feb 6 2021 Thomas Moschny - 2.11.3-1 +- Update to 2.11.3. +- Add patches to build with Python 3.10 (#1907442). + +* Wed Jan 27 2021 Fedora Release Engineering - 2.11.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 21 2020 Miro Hrončok - 2.11.2-7 +- Drop python2-jinja2 on Fedora 34+ + +* Wed Jul 29 2020 Fedora Release Engineering - 2.11.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Miro Hrončok - 2.11.2-5 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 2.11.2-4 +- Bootstrap for Python 3.9 + +* Fri May 22 2020 Thomas Moschny - 2.11.2-3 +- Re-add python2 subpackage (#1832057). + +* Wed May 6 2020 Thomas Moschny - 2.11.2-2 +- Drop python2 subpackage from F33 on (#1832057). + +* Wed Apr 15 2020 Thomas Moschny - 2.11.2-1 +- Re-add dependency on python-setuptools. + +* Wed Apr 15 2020 Dan Horák - 2.11.2-1 +- Update to 2.11.2 + +* Mon Apr 06 2020 Igor Raits - 2.11.1-2 +- Drop unneeded R: pythonX-setuptools + +* Sat Feb 8 2020 Thomas Moschny - 2.11.1-1 +- Update to 2.11.1. + +* Thu Jan 30 2020 Fedora Release Engineering - 2.10.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 20 2019 Thomas Moschny - 2.10.3-2 +- Add missing BR on make. + +* Mon Nov 11 2019 Lumír Balhar - 2.10.3-1 +- New upstream version (2.10.3) + +* Thu Oct 03 2019 Miro Hrončok - 2.10.1-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Sat Aug 17 2019 Miro Hrončok - 2.10.1-4 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 2.10.1-3 +- Bootstrap for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 2.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Apr 10 2019 Thomas Moschny - 2.10.1-1 +- Update to 2.10.1. +- Update specfile. + +* Wed Feb 27 2019 Phil Wyett - 2.10-8 +- Fix FTBS due to bad conditional +- Add version requirement for markupsafe + +* Sat Feb 02 2019 Fedora Release Engineering - 2.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Miro Hrončok - 2.10-5 +- Rebuilt for Python 3.7 + +* Thu Jun 14 2018 Miro Hrončok - 2.10-4 +- Bootstrap for Python 3.7 + +* Mon Apr 16 2018 Charalampos Stratakis - 2.10-3 +- Don't build the Python 2 subpackage on EL > 7 + +* Fri Feb 09 2018 Fedora Release Engineering - 2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Nov 16 2017 Thomas Moschny - 2.10-1 +- Update to 2.10. +- Use %%bcond. +- Move BRs to their respective subpackages. + +* Fri Oct 20 2017 Troy Dawson - 2.9.6-4 +- Really cleanup spec file conditionals + +* Fri Sep 29 2017 Troy Dawson - 2.9.6-3 +- Cleanup spec file conditionals + +* Thu Jul 27 2017 Fedora Release Engineering - 2.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Apr 5 2017 Thomas Moschny - 2.9.6-1 +- Update to 2.9.6. + +* Sat Feb 11 2017 Fedora Release Engineering - 2.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Jan 29 2017 Thomas Moschny - 2.9.5-1 +- Update to 2.9.5. + +* Fri Jan 13 2017 Thomas Moschny - 2.9.4-1 +- Update to 2.9.4. + +* Sat Dec 31 2016 Thomas Moschny - 2.8.1-1 +- Update to 2.8.1. + +* Fri Dec 09 2016 Charalampos Stratakis - 2.8-8 +- Rebuild for Python 3.6 + +* Thu Sep 22 2016 Orion Poplawski - 2.8-7 +- Ship python2-jinja2 (bug #1378519) +- Modernize spec + +* Tue Jul 19 2016 Fedora Release Engineering - 2.8-6 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Feb 5 2016 Thomas Moschny - 2.8-5 +- Do not call py.test, there are currently no tests in the tarball. + +* Thu Feb 04 2016 Fedora Release Engineering - 2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Oct 12 2015 Robert Kuska - 2.8-3 +- Rebuilt for Python3.5 rebuild + +* Mon Jul 27 2015 Thomas Moschny - 2.8-2 +- Apply updates Python packaging guidelines. +- Mark LICENSE with %%license. + +* Sun Jul 26 2015 Haïkel Guémar - 2.8-1 +- Upstream 2.8 + +* Thu Jun 18 2015 Fedora Release Engineering - 2.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Dec 2 2014 Orion Poplawski - 2.7.3-2 +- Add Requires python(3)-setuptools (bug #1168774) + +* Sat Jun 7 2014 Thomas Moschny - 2.7.3-1 +- Update to 2.7.3. +- Reenable docs. + +* Sat May 10 2014 Orion Poplawski - 2.7.2-2 +- Bootstrap (without docs) build for Python 3.4 + +* Fri Jan 10 2014 Thomas Moschny - 2.7.2-1 +- Update to 2.7.2. +- Update python3 conditional. + +* Fri Aug 16 2013 Thomas Moschny - 2.7.1-1 +- Update to 2.7.1. + +* Thu Jul 25 2013 Orion Poplawski - 2.7-1 +- Update to 2.7 +- spec cleanup + +* Thu Feb 14 2013 Fedora Release Engineering - 2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Aug 04 2012 David Malcolm - 2.6-5 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + +* Fri Aug 3 2012 David Malcolm - 2.6-4 +- remove rhel logic from with_python3 conditional + +* Sat Jul 21 2012 Fedora Release Engineering - 2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jul 25 2011 Thomas Moschny - 2.6-1 +- Update to 2.6. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.5.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Thomas Moschny - 2.5.5-3 +- Re-enable html doc generation. +- Remove conditional for F-12 and below. +- Do not silently fail the testsuite for with py3k. + +* Mon Nov 1 2010 Michel Salim - 2.5.5-2 +- Move python3 runtime requirements to python3 subpackage + +* Wed Oct 27 2010 Thomas Moschny - 2.5.5-1 +- Update to 2.5.5. + +* Wed Aug 25 2010 Thomas Moschny - 2.5.2-4 +- Revert to previous behavior: fail the build on failed test. +- Rebuild for Python 3.2. + +* Wed Aug 25 2010 Dan Horák - 2.5.2-3 +- %%ifnarch doesn't work on noarch package so don't fail the build on failed tests + +* Wed Aug 25 2010 Dan Horák - 2.5.2-2 +- disable the testsuite on s390(x) + +* Thu Aug 19 2010 Thomas Moschny - 2.5.2-1 +- Update to upstream version 2.5.2. +- Package depends on python-markupsafe and is noarch now. + +* Thu Jul 22 2010 David Malcolm - 2.5-4 +- add explicit build-requirement on python-setuptools +- fix doc disablement for python3 subpackage + +* Thu Jul 22 2010 David Malcolm - 2.5-3 +- support disabling documentation in the build to break a circular build-time +dependency with python-sphinx; disable docs for now + +* Thu Jul 22 2010 David Malcolm - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Jul 13 2010 Thomas Moschny - 2.5-1 +- Update to upstream version 2.5. +- Create python3 subpackage. +- Minor specfile fixes. +- Add examples directory. +- Thanks to Gareth Armstrong for additional hints. + +* Wed Apr 21 2010 Thomas Moschny - 2.4.1-1 +- Update to 2.4.1. + +* Tue Apr 13 2010 Thomas Moschny - 2.4-1 +- Update to 2.4. + +* Tue Feb 23 2010 Thomas Moschny - 2.3.1-1 +- Update to 2.3.1. +- Docs are built using Sphinx now. +- Run the testsuite. + +* Sat Sep 19 2009 Thomas Moschny - 2.2.1-1 +- Update to 2.2.1, mainly a bugfix release. +- Remove patch no longer needed. +- Remove conditional for FC-8. +- Compilation of speedup module has to be explicitly requested now. + +* Sun Jul 26 2009 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 10 2009 Thomas Moschny - 2.1.1-1 +- Update to 2.1.1 (bugfix release). + +* Thu Dec 18 2008 Thomas Moschny - 2.1-1 +- Update to 2.1, which fixes a number of bugs. + See http://jinja.pocoo.org/2/documentation/changelog#version-2-1. + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.0-3 +- Rebuild for Python 2.6 + +* Tue Jul 22 2008 Thomas Moschny - 2.0-2 +- Use rpm buildroot macro instead of RPM_BUILD_ROOT. + +* Sun Jul 20 2008 Thomas Moschny - 2.0-1 +- Upstream released 2.0. + +* Sun Jun 29 2008 Thomas Moschny - 2.0-0.1.rc1 +- Modified specfile from the existing python-jinja package.