[2.0] Fix ptest for python-jinja2 (#13029)

Author: Kanishk-Bansal

SPECS/python-jinja2/python-jinja2-testing-deps.patch

@@ -0,0 +1,78 @@
+From a7d0437cde633312d69215ce9494cc845f74e823 Mon Sep 17 00:00:00 2001
+From: Kanishk-Bansal <[email protected]>
+Date: Wed, 19 Mar 2025 06:03:11 +0000
+Subject: [PATCH] python-jinja2-testing-deps
+
+---
+ requirements/tests.txt | 20 +++++++++-----------
+ tests/test_loader.py   |  6 ++++--
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/requirements/tests.txt b/requirements/tests.txt
+index 02dd8e8..b6b592b 100644
+--- a/requirements/tests.txt
++++ b/requirements/tests.txt
+@@ -1,22 +1,20 @@
+ #
+-# This file is autogenerated by pip-compile with python 3.10
++# This file is autogenerated by pip-compile-multi
+ # To update, run:
+ #
+-#    pip-compile requirements/tests.in
++#    pip-compile-multi
+ #
+-attrs==21.2.0
++attrs==21.4.0
+     # via pytest
+-iniconfig==1.1.1
++exceptiongroup==1.1.1
+     # via pytest
+-packaging==21.2
++iniconfig==1.1.1
+     # via pytest
+-pluggy==1.0.0
++packaging==23.2
+     # via pytest
+-py==1.11.0
++pluggy==1.5.0
+     # via pytest
+-pyparsing==2.4.7
+-    # via packaging
+-pytest==6.2.5
++pytest==7.4.0
+     # via -r requirements/tests.in
+-toml==0.10.2
++tomli==2.0.1
+     # via pytest
+diff --git a/tests/test_loader.py b/tests/test_loader.py
+index b300c8f..cec2d63 100644
+--- a/tests/test_loader.py
++++ b/tests/test_loader.py
+@@ -174,6 +174,7 @@ class TestFileSystemLoader:
+ 
+ class TestModuleLoader:
+     archive = None
++    mod_env = None
+ 
+     def compile_down(self, prefix_loader, zip="deflated"):
+         log = []
+@@ -187,13 +188,14 @@ class TestModuleLoader:
+         self.mod_env = Environment(loader=loaders.ModuleLoader(self.archive))
+         return "".join(log)
+ 
+-    def teardown(self):
+-        if hasattr(self, "mod_env"):
++    def teardown_method(self):
++        if self.archive is not None:
+             if os.path.isfile(self.archive):
+                 os.remove(self.archive)
+             else:
+                 shutil.rmtree(self.archive)
+             self.archive = None
++            self.mod_env = None
+ 
+     def test_log(self, prefix_loader):
+         log = self.compile_down(prefix_loader)
+-- 
+2.45.2
+

SPECS/python-jinja2/python-jinja2.spec

@@ -1,7 +1,7 @@
 Summary:        A fast and easy to use template engine written in pure Python
 Name:           python-jinja2
 Version:        3.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -13,6 +13,7 @@ Patch1:         CVE-2024-34064.patch
 Patch2:         CVE-2024-56201.patch
 Patch3:         CVE-2024-56326.patch
 Patch4:         CVE-2025-27516.patch
+Patch5:         python-jinja2-testing-deps.patch
 BuildArch:      noarch
 
 %description
@@ -26,6 +27,7 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-xml
 %if 0%{?with_check}
 BuildRequires:  python3-pip
+BuildRequires:  python3-pytest
 %endif
 Requires:       python3
 Requires:       python3-markupsafe
@@ -48,8 +50,8 @@ sed -i 's/\r$//' LICENSE.rst # Fix wrong EOL encoding
 %py3_install
 
 %check
-pip3 install tox
-tox -e py%{python3_version_nodots}
+pip3 install tox packaging==23.2
+tox -v -e py%{python3_version_nodots} --
 
 %files -n python3-jinja2
 %defattr(-,root,root)
@@ -58,6 +60,9 @@ tox -e py%{python3_version_nodots}
 %{python3_sitelib}/Jinja2-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Wed Mar 19 2025 Kanishk Bansal <[email protected]> - 3.0.3-7
+- Add patch python-jinja2-testing-deps to fix ptest
+
 * Fri Mar 07 2025 Kanishk Bansal <[email protected]> - 3.0.3-6
 - Address CVE-2025-27516 with an upstream patch
 

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -518,7 +518,7 @@ python3-Cython-0.29.33-2.cm2.aarch64.rpm
 python3-debuginfo-3.9.19-11.cm2.aarch64.rpm
 python3-devel-3.9.19-11.cm2.aarch64.rpm
 python3-gpg-1.16.0-2.cm2.aarch64.rpm
-python3-jinja2-3.0.3-6.cm2.noarch.rpm
+python3-jinja2-3.0.3-7.cm2.noarch.rpm
 python3-libcap-ng-0.8.2-2.cm2.aarch64.rpm
 python3-libs-3.9.19-11.cm2.aarch64.rpm
 python3-libxml2-2.10.4-6.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -524,7 +524,7 @@ python3-Cython-0.29.33-2.cm2.x86_64.rpm
 python3-debuginfo-3.9.19-11.cm2.x86_64.rpm
 python3-devel-3.9.19-11.cm2.x86_64.rpm
 python3-gpg-1.16.0-2.cm2.x86_64.rpm
-python3-jinja2-3.0.3-6.cm2.noarch.rpm
+python3-jinja2-3.0.3-7.cm2.noarch.rpm
 python3-libcap-ng-0.8.2-2.cm2.x86_64.rpm
 python3-libs-3.9.19-11.cm2.x86_64.rpm
 python3-libxml2-2.10.4-6.cm2.x86_64.rpm