ansible-core 2.15.0

- Update bundled markupsafe to 2.1.2.
- Update bundled packaging to 21.3.
- Update bundled pyparsing to 3.0.7.
- Update bundled resolvelib to 1.0.1.
- Remove six runtime dependency.

Resolves: #2204510

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

.gitignore

@@ -31,3 +31,8 @@
 /packaging-20.4.tar.gz
 /pyparsing-2.4.7.tar.gz
 /resolvelib-0.5.4.tar.gz
+/MarkupSafe-2.1.2.tar.gz
+/ansible-core-2.15.0.tar.gz
+/packaging-21.3.tar.gz
+/pyparsing-3.0.7.tar.gz
+/resolvelib-1.0.1.tar.gz

ansible-core.spec

@@ -24,16 +24,16 @@
 
 # These control which bundled dep versions we pin against
 %global jinja2_version 3.1.2
-%global markupsafe_version 2.1.0
-%global packaging_version 20.4
-%global pyparsing_version 2.4.7
-%global resolvelib_version 0.5.4
+%global markupsafe_version 2.1.2
+%global packaging_version 21.3
+%global pyparsing_version 3.0.7
+%global resolvelib_version 1.0.1
 
 
 Name: ansible-core
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 2.14.2
-Release: 4%{?dist}
+Version: 2.15.0
+Release: 1%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
@@ -83,7 +83,6 @@ BuildRequires: make git-core gcc
 Requires: git-core
 Requires: python%{python3_pkgversion}-PyYAML >= 5.1
 Requires: python%{python3_pkgversion}-cryptography
-Requires: python%{python3_pkgversion}-six
 Requires: sshpass
 
 %description
@@ -195,6 +194,14 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
 
 
 %changelog
+* Mon May 15 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.0-1
+- ansible-core 2.15.0 release (rhbz#2204510)
+- update bundled markupsafe to 2.1.2.
+- update bundled packaging to 21.3.
+- update bundled pyparsing to 3.0.7.
+- update bundled resolvelib to 1.0.1.
+- remove six runtime dependency.
+
 * Mon Feb 13 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.14.2-4
 - rebuild with python 3.11 (rhbz#2169466)
 - remove bundled dependencies from requirements file (rhbz#2152615)

remove-bundled-deps-from-requirements.patch

@@ -1,8 +1,8 @@
 diff --git a/requirements.txt b/requirements.txt
-index 20562c3e0f..792daa209a 100644
+index a07aa98506..ef189d6594 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -3,13 +3,5 @@
+@@ -3,16 +3,8 @@
  # packages.  Thus, this should be the loosest set possible (only required
  # packages, not optional ones, and with the widest range of versions that could
  # be suitable)
@@ -10,9 +10,12 @@ index 20562c3e0f..792daa209a 100644
  PyYAML >= 5.1  # PyYAML 5.1 is required for Python 3.8+ support
  cryptography
 -packaging
+ # importlib.resources in stdlib for py3.9 is lacking native hooks for
+ # importlib.resources.files
+ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
 -# NOTE: resolvelib 0.x version bumps should be considered major/breaking
 -# NOTE: and we should update the upper cap with care, at least until 1.0
 -# NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
 -# NOTE: When updating the upper bound, also update the latest version used
 -# NOTE: in the ansible-galaxy-collection test suite.
--resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
+-resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy

sources

@@ -1,6 +1,6 @@
-SHA512 (ansible-core-2.14.2.tar.gz) = 210dcd32b3a7faa50028200cc7f2ef4b8a8c5ee90fdfdf31cb61d2bc6d03c86aeb644a751e0c14aea3c1a95ea9e18703de1de304beeedcda4a98780f3e79cfec
+SHA512 (ansible-core-2.15.0.tar.gz) = aebb43840380854e7759656a0b08579a8fbdddbf2d204c47fb16cdb73ffd540df5ad56e5bf4a78a338804a3d40f9b042ea50b2b1853aaef6b7c2f0aab7a95432
 SHA512 (Jinja2-3.1.2.tar.gz) = 5dfe122c1beef5305b34d25f22f96607bd3a6cba098b03091850ea36fefe62b645a7218d7584b35bea252393ac922c9bb3654a9e90f23bcfb273e811fcf2f2c1
-SHA512 (MarkupSafe-2.1.0.tar.gz) = 2a340f4f4cc7de0638cc32bf04f0daa8a0db579ebe7b514b296498c5c05ea0e36e164bfcce929a92bea9051e8211b6683602431dac1aaf490bc0e279dee520a6
-SHA512 (packaging-20.4.tar.gz) = d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
-SHA512 (pyparsing-2.4.7.tar.gz) = 0b9f8f18907f65cb3af1b48ed57989e183f28d71646f2b2f820e772476f596ca15ee1a689f3042f18458206457f4683d10daa6e73dfd3ae82d5e4405882f9dd2
-SHA512 (resolvelib-0.5.4.tar.gz) = cb027c5478c217f6f8288b42a933665aaf6e59280e7aa88a25f6594e589e34ac2b75734764e331d0889ad9cf0c60b8cbdfa14b01dce023a76870bb21cfc4d926
+SHA512 (MarkupSafe-2.1.2.tar.gz) = 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b
+SHA512 (packaging-21.3.tar.gz) = 2e3aa276a4229ac7dc0654d586799473ced9761a83aa4159660d37ae1a2a8f30e987248dd0e260e2834106b589f259a57ce9936eef0dcc3c430a99ac6b663e05
+SHA512 (pyparsing-3.0.7.tar.gz) = 1e692f4cdaa6b6e8ca2729d0a3e2ba16d978f1957c538b6de3a4220ec7d996bdbe87c41c43abab851fffa3b0498a05841373e435602917b8c095042e273badb5
+SHA512 (resolvelib-1.0.1.tar.gz) = 52c872fb2a22c47de022a661dc4d8de8c6af450f1cff6f2b99cd91bf7eccae5b6ee223793f50b9679c1c6caedbd8bb63330915ee6f10533b1a0ed239d068b36f