Update bundled jinja2 version to 3.1.2

Resolves: #2101462

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
This commit is contained in:
Dimitri Savineau 2022-06-27 10:51:56 -04:00
parent e2feb3ff33
commit 468b3b8dfa
No known key found for this signature in database
GPG Key ID: E00798C446FD75DE
3 changed files with 10 additions and 6 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/ansible-e9f633ec720fbd4367d2f694574dec101e22d3b9.tar.gz /ansible-e9f633ec720fbd4367d2f694574dec101e22d3b9.tar.gz
/jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4.tar.gz /jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4.tar.gz
/markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz /markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz
/jinja2-b08cd4bc64bb980df86ed2876978ae5735572280.tar.gz

View File

@ -26,7 +26,7 @@
%define vendor_pip /usr/bin/python3.9 -m pip install --no-deps -v --no-use-pep517 --no-binary :all: -t %{vendor_path} %define vendor_pip /usr/bin/python3.9 -m pip install --no-deps -v --no-use-pep517 --no-binary :all: -t %{vendor_path}
# These control which bundled dep versions we pin against # These control which bundled dep versions we pin against
%global jinja2_version 3.0.3 %global jinja2_version 3.1.2
%global markupsafe_version 2.1.0 %global markupsafe_version 2.1.0
%global packaging_version 20.4 %global packaging_version 20.4
%global pyparsing_version 2.4.7 %global pyparsing_version 2.4.7
@ -36,7 +36,7 @@
Name: ansible-core Name: ansible-core
Summary: SSH-based configuration management, deployment, and task execution system Summary: SSH-based configuration management, deployment, and task execution system
Version: 2.13.1 Version: 2.13.1
Release: 1%{?dist} Release: 2%{?dist}
Group: Development/Libraries Group: Development/Libraries
License: GPLv3+ License: GPLv3+
@ -44,7 +44,7 @@ Source0: ansible-%{commitId}.tar.gz
Source1: ansible-test-data-files.txt Source1: ansible-test-data-files.txt
# And bundled deps # And bundled deps
Source2: jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4.tar.gz Source2: jinja2-b08cd4bc64bb980df86ed2876978ae5735572280.tar.gz
Source3: markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz Source3: markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz
Source4: packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz Source4: packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz
Source5: pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz Source5: pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz
@ -115,7 +115,7 @@ This package installs the ansible-test command for testing modules and plugins
developed for ansible. developed for ansible.
%prep %prep
%setup -q -T -b 2 -n jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4 %setup -q -T -b 2 -n jinja2-b08cd4bc64bb980df86ed2876978ae5735572280
%setup -q -T -b 3 -n markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f %setup -q -T -b 3 -n markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f
%setup -q -T -b 4 -n packaging-ded06cedf6e20680eea0363fac894cb4a09e7831 %setup -q -T -b 4 -n packaging-ded06cedf6e20680eea0363fac894cb4a09e7831
%setup -q -T -b 5 -n pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605 %setup -q -T -b 5 -n pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605
@ -130,7 +130,7 @@ developed for ansible.
# Handle bundled deps: # Handle bundled deps:
%{vendor_pip} \ %{vendor_pip} \
../jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4/ \ ../jinja2-b08cd4bc64bb980df86ed2876978ae5735572280/ \
../markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f/ \ ../markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f/ \
../packaging-ded06cedf6e20680eea0363fac894cb4a09e7831/ \ ../packaging-ded06cedf6e20680eea0363fac894cb4a09e7831/ \
../pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605/ ../pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605/
@ -207,6 +207,9 @@ cp -p lib/ansible_core.egg-info/PKG-INFO .
%{python39_sitelib}/ansible_test %{python39_sitelib}/ansible_test
%changelog %changelog
* Mon Jun 27 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.1-2
- Update bundled jinja2 version to 3.1.2 (rhbz#2101462)
* Wed Jun 22 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.1-1 * Wed Jun 22 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.1-1
- ansible-core 2.13.1 release (rhbz#2100242) - ansible-core 2.13.1 release (rhbz#2100242)
- add bundled version of jinja2 and markupsafe - add bundled version of jinja2 and markupsafe

View File

@ -1,5 +1,5 @@
SHA512 (ansible-e9f633ec720fbd4367d2f694574dec101e22d3b9.tar.gz) = 25dc5b2eb17f35a5f1d6c564fdd39c97cd2fcc77a01ce23aa82c77f8aa296924c42ec59a4e5ccc22d3e7820dce143e88b44d71ab6d8322fa61648ba7ac5b4e7b SHA512 (ansible-e9f633ec720fbd4367d2f694574dec101e22d3b9.tar.gz) = 25dc5b2eb17f35a5f1d6c564fdd39c97cd2fcc77a01ce23aa82c77f8aa296924c42ec59a4e5ccc22d3e7820dce143e88b44d71ab6d8322fa61648ba7ac5b4e7b
SHA512 (jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4.tar.gz) = d77e907fa4128cf540f597ee662efea236cc90b66c4d1374cc24c35c5b49c97a3a66de0fa1416323ebcf0bef765d5d79c770b73d61004780fbbe9dd088c28305 SHA512 (jinja2-b08cd4bc64bb980df86ed2876978ae5735572280.tar.gz) = d596089beabdb4af4953fc2d0b786621f628232d2412b47b0baaa6e031b4bf693083a0e976b3df867451694c77817685c8ec5ffe80be6fb38709b4ae0819c984
SHA512 (markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz) = 5f454607c2d4eb0eab46305696636341a6725cc03ebde170c592f49a79b84fd51d1be82e0c22023772fda1dee09d2ae4f5867d189e2f0bdc1a0246962367fd08 SHA512 (markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz) = 5f454607c2d4eb0eab46305696636341a6725cc03ebde170c592f49a79b84fd51d1be82e0c22023772fda1dee09d2ae4f5867d189e2f0bdc1a0246962367fd08
SHA512 (packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz) = ceacb927289775fe901b2169053e3265db1531c8c22dc42329d28c24b64d021a791cf523044420e3a821fbbc251039796f951b21745a4870a8ec53e2eeac76a7 SHA512 (packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz) = ceacb927289775fe901b2169053e3265db1531c8c22dc42329d28c24b64d021a791cf523044420e3a821fbbc251039796f951b21745a4870a8ec53e2eeac76a7
SHA512 (pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz) = ad95ec904f35dce422e31c6fc5922ca5970757229463e9fc4d1cbb0e798b6b7c1c6f44dcb8aaccec47f106506e78e7482ffc40b21f2122ba9d83e4e27bd57118 SHA512 (pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz) = ad95ec904f35dce422e31c6fc5922ca5970757229463e9fc4d1cbb0e798b6b7c1c6f44dcb8aaccec47f106506e78e7482ffc40b21f2122ba9d83e4e27bd57118