.ansible-core.metadata

@@ -1,4 +1,8 @@
 560f248ccb0b98256c5b50c86a002c2c1e57edb6 SOURCES/Jinja2-3.1.2.tar.gz
 192b9f6598e1ae036301f72781973c6f46e50aa2 SOURCES/MarkupSafe-2.1.2.tar.gz
-206d3558bef217b0d3cd20a10bd55b00d8b61f43 SOURCES/ansible-core-2.14.9.tar.gz
+02fbb1496820e07068eeba988a02ca2626b296d2 SOURCES/ansible-core-2.15.3.tar.gz
-366ad8407df71776813faeff935da35d65967b33 SOURCES/ansible-documentation-2.14.9.tar.gz
+f220508f7a7e6f81422fe604035c56eb2532f383 SOURCES/ansible-documentation-2.15.3.tar.gz
+6e53dd117d09e6cd5d8596bf99a0dcbb202b8aad SOURCES/docutils-0.20.1.tar.gz
+b8caff3bec760723db6af4092c68075e22bdb769 SOURCES/packaging-21.3.tar.gz
+96464a9452e95e980c3a1fad1020fe00e29c0ae3 SOURCES/pyparsing-3.0.7.tar.gz
+2f587f4095bb70039c1d995635ae55af8eab08dc SOURCES/resolvelib-1.0.1.tar.gz

.gitignore

@@ -1,4 +1,8 @@
 SOURCES/Jinja2-3.1.2.tar.gz
 SOURCES/MarkupSafe-2.1.2.tar.gz
-SOURCES/ansible-core-2.14.9.tar.gz
+SOURCES/ansible-core-2.15.3.tar.gz
-SOURCES/ansible-documentation-2.14.9.tar.gz
+SOURCES/ansible-documentation-2.15.3.tar.gz
+SOURCES/docutils-0.20.1.tar.gz
+SOURCES/packaging-21.3.tar.gz
+SOURCES/pyparsing-3.0.7.tar.gz
+SOURCES/resolvelib-1.0.1.tar.gz

SOURCES/ansible-test-data-files.txt

@@ -1,2 +1 @@
 /usr/lib/python[0-9]+\.[0-9]+/site-packages/ansible_test/_data/.*
-/usr/lib/python[0-9]+\.[0-9]+/site-packages/ansible_test/_util/.*

SOURCES/remove-bundled-deps-from-requirements.patch

@@ -1,12 +1,21 @@
 diff --git a/requirements.txt b/requirements.txt
-index 20562c3e0f..b24f27b2ca 100644
+index a07aa98506..ef189d6594 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -3,7 +3,6 @@
+@@ -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)
 -jinja2 >= 3.0.0
  PyYAML >= 5.1  # PyYAML 5.1 is required for Python 3.8+ support
  cryptography
- packaging
+-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, < 1.1.0  # dependency resolver used by ansible-galaxy

SPECS/ansible-core.spec

@@ -1,3 +1,6 @@
+%global __python3 /usr/bin/python3.11
+%global python3_pkgversion 3.11
+
 # We need this because we are no longer noarch, since our bundled deps might
 # conceivably need to compile arch-specific things. But we currently have no
 # useful debuginfo stuff.
@@ -7,6 +10,10 @@
 # ansible-test munges the shebangs itself.
 %global __brp_mangle_shebangs_exclude_from_file %{SOURCE2}
 
+# NOTE(pabelanger): Don't auto add pwsh as Requires for ansible-test. We do
+# not wish to package it.
+%global __requires_exclude ^/usr/bin/pwsh$
+
 # RHEL and Fedora add -s to the shebang line.  We do *not* use -s -E -S or -I
 # with ansible because it has many optional features which users need to
 # install libraries on their own to use.  For instance, paramiko for the
@@ -20,15 +27,19 @@
 %define vendor_pip %{__python3} -m pip install --no-deps -v --no-build-isolation --no-binary :all: -t %{vendor_path}
 
 # These control which bundled dep versions we pin against
+%global docutils_version 0.20.1
 %global jinja2_version 3.1.2
 %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
-Epoch: 1
+Version: 2.15.3
-Version: 2.14.9
 Release: 1%{?dist}
+ExcludeArch: i686
 
 Group: Development/Libraries
 License: GPLv3+
@@ -39,14 +50,20 @@ Source2: ansible-test-data-files.txt
 # And bundled deps
 Source3: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{jinja2_version}.tar.gz
 Source4: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{markupsafe_version}.tar.gz
+Source5: https://files.pythonhosted.org/packages/source/p/packaging/packaging-%{packaging_version}.tar.gz
+Source6: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{pyparsing_version}.tar.gz
+Source7: https://files.pythonhosted.org/packages/source/r/resolvelib/resolvelib-%{resolvelib_version}.tar.gz
+
+# Deps to build manpages
+Source8: https://sourceforge.net/projects/docutils/files/docutils/%{docutils_version}/docutils-%{docutils_version}.tar.gz
 
 Patch0: remove-bundled-deps-from-requirements.patch
 
 URL: http://ansible.com
 
-# We obsolete old ansible, and any version of ansible-base.
+# We conflict old ansible, and any version of ansible-base.
-Obsoletes: ansible < 2.10.0
+Conflicts: ansible < 2.10.0
-Obsoletes: ansible-base < 2.11.0
+Conflicts: ansible-base
 
 # ... and provide 'ansible' so that old packages still work without updated
 # spec files.
@@ -61,9 +78,11 @@ Provides: bundled(python-six) = 1.16.0
 # Things we explicitly bundle via src rpm, and put in ansible._vendor
 Provides: bundled(python-jinja2) = %{jinja2_version}
 Provides: bundled(python-markupsafe) = %{markupsafe_version}
+Provides: bundled(python-packaging) = %{packaging_version}
+Provides: bundled(python-pyparsing) = %{pyparsing_version}
+Provides: bundled(python-resolvelib) = %{resolvelib_version}
 
 BuildRequires: python%{python3_pkgversion}-devel
-BuildRequires: python%{python3_pkgversion}-docutils
 BuildRequires: python%{python3_pkgversion}-pip
 BuildRequires: python%{python3_pkgversion}-pyyaml
 BuildRequires: python%{python3_pkgversion}-rpm-macros
@@ -74,9 +93,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}-packaging
-Requires: python%{python3_pkgversion}-resolvelib >= 0.5.3
-Requires: python%{python3_pkgversion}-resolvelib < 0.9.0
 Requires: sshpass
 
 %description
@@ -88,7 +104,7 @@ are transferred to managed machines automatically.
 
 %package -n ansible-test
 Summary: Tool for testing ansible plugin and module code
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description -n ansible-test
 Ansible is a radically simple model-driven configuration management,
@@ -101,7 +117,7 @@ This package installs the ansible-test command for testing modules and plugins
 developed for ansible.
 
 %prep
-%setup -q -b1 -b3 -b4 -n ansible-core-%{version}
+%setup -q -b1 -b3 -b4 -b5 -b6 -b7 -b8 -n ansible-core-%{version}
 %patch0 -p1
 
 # Fix all Python shebangs recursively in ansible-test
@@ -116,7 +132,10 @@ developed for ansible.
 # Handle bundled deps:
 %{vendor_pip} \
   ../Jinja2-%{jinja2_version}/ \
-  ../MarkupSafe-%{markupsafe_version}/
+  ../MarkupSafe-%{markupsafe_version}/ \
+  ../packaging-%{packaging_version}/ \
+  ../pyparsing-%{pyparsing_version}/ \
+  ../resolvelib-%{resolvelib_version}
 
 # Create system directories that Ansible defines as default locations in
 # ansible/config/base.yml
@@ -161,7 +180,10 @@ cp ../ansible-documentation-%{version}/examples/ansible.cfg %{buildroot}%{_sysco
 mkdir -p %{buildroot}/%{_mandir}/man1/
 
 mkdir -p docs/man/man1
-PYTHONPATH=%{vendor_path} %{__python3} packaging/cli-doc/build.py man --output-dir docs/man/man1
+mkdir -p /tmp/_docutils
+%{__python3} -m pip install ../docutils-%{docutils_version} -t /tmp/_docutils --no-build-isolation
+PYTHONPATH=%{vendor_path}:/tmp/_docutils %{__python3} packaging/cli-doc/build.py man --output-dir docs/man/man1
+rm -rf /tmp/_docutils
 
 cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/
 
@@ -187,118 +209,106 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
 %{_bindir}/ansible-test
 %{python3_sitelib}/ansible_test
 
-
 %changelog
-* Wed Aug 16 2023 Dimitri Savineau <dsavinea@redhat.com> - 1:2.14.9-1
+* Wed Aug 16 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.3-1
-- ansible-core 2.14.9 release (rhbz#2232432)
+- ansible-core 2.15.3 release (rhbz#2232431)
 - Use docs and examples from ansible-documentation project.
 - Build the manpages.
 
-* Mon Aug 14 2023 Dimitri Savineau <dsavinea@redhat.com> - 1:2.14.8-1
+* Mon Aug 14 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.2-1
-- ansible-core 2.14.8 release (rhbz#2231892)
+- ansible-core 2.15.2 release (rhbz#2231891)
 
-* Mon Jul 17 2023 Dimitri Savineau <dsavinea@redhat.com> - 1:2.14.7-1
+* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.15.1-1
-- ansible-core 2.14.7 release (rhbz#2221820)
+- Rebuilt for MSVSphere 8.8
-- rebuild with python 3.9 (rhbz#2221820)
-- remove bundled packaging, pyparsing and resolvelib.
 
 * Tue Jul 04 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.1-1
-- ansible-core 2.15.1 release (rhbz#2219619)
+- ansible-core 2.15.1 release (rhbz#2219620)
 
 * Mon May 15 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.0-1
-- ansible-core 2.15.0 release (rhbz#2204510)
+- ansible-core 2.15.0 release (rhbz#2204511)
 - 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
+* Tue Feb 14 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.14.2-3
-- rebuild with python 3.11 (rhbz#2169466)
+- rebuild with python 3.11 (rhbz#2169524)
-- remove bundled dependencies from requirements file (rhbz#2152615)
+- remove bundled dependencies from requirements file (rhbz#2143974)
-- add bundled version of resolvelib
+- use PyPi sources (rhbz#2160277)
-- use PyPi sources
 - remove straightplugin
-- add missing obsoletes constraint
 
-* Wed Feb 01 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.14.2-3
+* Thu Feb 02 2023 Christian Adams <chadams@redhat.com> - 2.14.2-2
-- fix debuginfo symbols from markupsafe dependency (rhbz#2166433)
+- fix debuginfo symbols from markupsafe dependency (rhbz#2166414)
 
-* Wed Feb 01 2023 Christian Adams <chadams@redhat.com> - 2.14.2-2
+* Wed Feb 01 2023 Christian Adams <chadams@redhat.com> - 2.14.2-1
-- fix bogus date in changelog (rhbz#2165763)
+- ansible-core 2.14.2 release (rhbz#2166414)
-
-* Tue Jan 31 2023 Christian Adams <chadams@redhat.com> - 2.14.2-1
-- ansible-core 2.14.2 release (rhbz#2165763)
 
 * Wed Dec 07 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.14.1-1
-- ansible-core 2.14.1 release (rhbz#2151593)
+- ansible-core 2.14.1 release (rhbz#2151594)
 
 * Tue Nov 08 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.14.0-1
-- ansible-core 2.14.0 release (rhbz#2141116)
+- ansible-core 2.14.0 release (rhbz#2141386)
 
 * Mon Nov 07 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.6-1
-- ansible-core 2.13.6 release (rhbz#2140778)
+- ansible-core 2.13.6 release (rhbz#2141109)
-- fix service_facts module parsing (rhbz#2128801)
+- fix service_facts module parsing (rhbz#2141111)
 
-* Tue Oct 11 2022 James Marshall <jamarsha@redhat.com> - 2.13.5-1
+* Wed Oct 12 2022 James Marshall <jamarsha@redhat.com> - 2.13.5-1
-- ansible-core 2.13.5 release (rhbz#2133912)
+- ansible-core 2.13.5 release (rhbz#2134116)
 
-* Thu Oct 06 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.4-1
+* Fri Oct 07 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.4-1
-- ansible-core 2.13.4 release (rhbz#2132807)
+- ansible-core 2.13.4 release (rhbz#2133024)
 
 * Mon Aug 15 2022 James Marshall <jamarsha@redhat.com> - 2.13.3-1
-- ansible-core 2.13.3 release (rhbz#2118458)
+- ansible-core 2.13.3 release (rhbz#2118475)
-
-* Mon Jul 18 2022 James Marshall <jamarsha@redhat.com> - 2.13.2-1
-- ansible-core 2.13.2 release (rhbz#2108229)
 
-* Mon Jun 27 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.1-2
+* Wed Jul 20 2022 James Marshall <jamarsha@redhat.com> - 2.13.2-1
-- Update bundled jinja2 version to 3.1.2 (rhbz#2101462)
+- ansible-core 2.13.2 release (rhbz#2109192)
 
-* Wed Jun 22 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.1-1
+* Mon Jul 04 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#2103699)
-- add bundled version of jinja2 and markupsafe
+- add bundled version of jinja2, markupsafe and resolvelib
+- rebuild with python 3.9
 
 * Mon Jun 20 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.7-1
-- ansible-core 2.12.7 release (rhbz#2099317)
+- ansible-core 2.12.7 release (rhbz#2099323)
-- remove legacy nightly configuration
+
+* Thu Jun 09 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.6-3
+- Build manpages (rhbz#2032809)
+- Remove legacy files
+
+* Tue Jun 07 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.6-2
+- switch from git to git-core dependency (rhbz#2094549)
 
 * Tue May 24 2022 James Marshall <jamarsha@redhat.com> - 2.12.6-1
 - ansible-core 2.12.6 release
 
-* Fri May 13 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.5-2
-- switch from git to git-core dependency (rhbz#2083386)
-
 * Mon May 09 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.5-1
 - ansible-core 2.12.5 release
 
-* Wed Apr 06 2022 James Marshall <jamarsha@redhat.com> - 2.12.4-1
+* Mon Apr 11 2022 James Marshall <jamarsha@redhat.com> - 2.12.4-1
 - ansible-core 2.12.4 release
 
 * Mon Mar 14 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.3-1
 - ansible-core 2.12.3 release
+- re-enable changelog and manpages
 
-* Tue Feb 01 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.2-1
+* Mon Mar 07 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.2-3
-- ansible-core 2.12.2 release
+- replace Obsolete to Conflicts
-
-* Tue Dec 07 2021 James Marshall <jamarsha@redhat.com> - 2.12.1-1
-- ansible-core 2.12.1-1
 
-* Mon Nov 08 2021 Dimitri Savineau <dsavinea@redhat.com> - 2.12.0-1
+* Wed Feb 02 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.2-2
-- ansible-core 2.12.0-1
+- fix ansible tarball setup
 
-* Tue Oct 12 2021 Christian Adams <chadams@redhat.com> - 2.11.6-1
+* Wed Feb 02 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.2-1
-- ansible-core 2.11.6-1, fix CVE-2021-3620, ansible-connection module
+- ansible-core 2.12.2 release
-  no long discloses sensitive info.
+- add gating and test files
-
-* Wed Oct 06 2021 Yanis Guenane <yguenane@redhat.com> - 2.11.5-3
-- ansible-core 2.11.5-3, add virtual provide for straightplugin
 
-* Wed Sep 15 2021 Josh Boyer <jwboyer@redhat.com> - 2.11.5-2
+* Wed Jan 19 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.1-2
-- ansible-core 2.11.5-2
+- Remove Provides on ansible
 
-* Mon Sep 13 2021 Josh Boyer <jwboyer@redhat.com> - 2.11.3-3
+* Thu Dec 16 2021 Yanis Guenane <yguenane@redhat.com> - 2.12.1-1
-- Bump for build
+- ansible-core 2.12.1-1
 
 * Wed Jul 21 2021 Paul Belanger <pabelanger@redhat.com> - 2.11.3-2
 - Add git dependency for ansible-galaxy CLI command.