[PR PATCH] ansible-core: update to 2.15.0

[PR PATCH] ansible-core: update to 2.15.0

[pascal-huber]

[-- Attachment #1: Type: text/plain, Size: 770 bytes --]

There is a new pull request by pascal-huber against master on the void-packages repository

https://github.com/pascal-huber/void-packages ansible-core
https://github.com/void-linux/void-packages/pull/43918

ansible-core: update to 2.15.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86-64_glibc

#### Notes
- With the previous version (2.14.4) `ansible-galaxy` doesn't work as it depends on `python3-resolvelib<=0.10.0`. It now depends on `resolvelib< 1.1.0` [upstream commit](https://github.com/ansible/ansible/commit/016b7f71b10539c90ddbb3246f19f9cbf0e65428).


A patch file from https://github.com/void-linux/void-packages/pull/43918.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-core-43918.patch --]
[-- Type: text/x-diff, Size: 7654 bytes --]

From 8c771655eefafdd89d95bc04f15b998e05248758 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Wed, 17 May 2023 19:02:30 +0200
Subject: [PATCH] ansible-core: update to 2.15.0

---
 ...upport-resolvelib-0.5.3-0.10.0-79399.patch | 131 ------------------
 srcpkgs/ansible-core/template                 |   4 +-
 2 files changed, 2 insertions(+), 133 deletions(-)
 delete mode 100644 srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch

diff --git a/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch b/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch
deleted file mode 100644
index 43981e9bd801..000000000000
--- a/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From d61d1b2a750d4d23c9ea086b9de85f15a26b4071 Mon Sep 17 00:00:00 2001
-From: Wong Hoi Sing Edison <hswong3i@gmail.com>
-Date: Wed, 23 Nov 2022 21:57:24 +0800
-Subject: [PATCH] ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0``
- (#79399)
-
-* Upgrade `resolvelib >= 0.5.3, < 0.10.0`
-
-https://pypi.org/project/resolvelib/0.9.0/ released on 2022-11-17:
-
-  * https://github.com/sarugaku/resolvelib/blob/master/CHANGELOG.rst#090-2022-11-17
-  * https://github.com/sarugaku/resolvelib/releases/tag/0.9.0
-
-Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
-(cherry picked from commit b148fd8dd74c8599f809f71117a86577ccfb0638)
----
- changelogs/fragments/79399-resolvelib_lt_0_10_0.yml   | 2 ++
- lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++--
- requirements.txt                                      | 2 +-
- test/lib/ansible_test/_data/requirements/ansible.txt  | 2 +-
- test/sanity/code-smell/docs-build.requirements.in     | 2 +-
- test/sanity/code-smell/docs-build.requirements.txt    | 2 +-
- test/sanity/code-smell/package-data.requirements.in   | 2 +-
- test/sanity/code-smell/package-data.requirements.txt  | 2 +-
- 8 files changed, 10 insertions(+), 8 deletions(-)
- create mode 100644 changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-
-diff --git a/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml b/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-new file mode 100644
-index 0000000000..91b7f517d3
---- /dev/null
-+++ b/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-@@ -0,0 +1,2 @@
-+minor_changes:
-+  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0``.
-diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
-index 817a1eb227..d52006b24d 100644
---- a/lib/ansible/galaxy/dependency_resolution/providers.py
-+++ b/lib/ansible/galaxy/dependency_resolution/providers.py
-@@ -42,7 +42,7 @@ except ImportError:
- 
- # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
- RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
--RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
-+RESOLVELIB_UPPERBOUND = SemanticVersion("0.10.0")
- RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
- 
- 
-@@ -220,7 +220,7 @@ class CollectionDependencyProviderBase(AbstractProvider):
-             Mapping of identifier, list of named tuple pairs.
-             The named tuples have the entries ``requirement`` and ``parent``.
- 
--        resolvelib >=0.8.0, <= 0.8.1
-+        resolvelib >=0.8.0, <= 0.9.0
- 
-         :param identifier: The value returned by ``identify()``.
- 
-diff --git a/requirements.txt b/requirements.txt
-index 20562c3e0f..b92e9ad4fb 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -12,4 +12,4 @@ packaging
- # 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, < 0.10.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
-index 20562c3e0f..b92e9ad4fb 100644
---- a/test/lib/ansible_test/_data/requirements/ansible.txt
-+++ b/test/lib/ansible_test/_data/requirements/ansible.txt
-@@ -12,4 +12,4 @@ packaging
- # 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, < 0.10.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in
-index 02c3bfc946..736450071d 100644
---- a/test/sanity/code-smell/docs-build.requirements.in
-+++ b/test/sanity/code-smell/docs-build.requirements.in
-@@ -1,6 +1,6 @@
- jinja2
- pyyaml
--resolvelib < 0.9.0
-+resolvelib < 0.10.0
- sphinx == 4.2.0
- sphinx-notfound-page
- sphinx-ansible-theme
-diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt
-index 7e30a73287..69b4e062ce 100644
---- a/test/sanity/code-smell/docs-build.requirements.txt
-+++ b/test/sanity/code-smell/docs-build.requirements.txt
-@@ -27,7 +27,7 @@ pyparsing==3.0.9
- pytz==2022.2.1
- PyYAML==6.0
- requests==2.28.1
--resolvelib==0.8.1
-+resolvelib==0.9.0
- rstcheck==3.5.0
- semantic-version==2.10.0
- sh==1.14.3
-diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in
-index 6b58f7557a..4d5e098428 100644
---- a/test/sanity/code-smell/package-data.requirements.in
-+++ b/test/sanity/code-smell/package-data.requirements.in
-@@ -1,7 +1,7 @@
- docutils < 0.18  # match version required by sphinx in the docs-build sanity test
- jinja2
- pyyaml  # ansible-core requirement
--resolvelib < 0.9.0
-+resolvelib < 0.10.0
- rstcheck < 4  # match version used in other sanity tests
- straight.plugin
- antsibull-changelog
-diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt
-index 94ad68fd09..ea35932ce3 100644
---- a/test/sanity/code-smell/package-data.requirements.txt
-+++ b/test/sanity/code-smell/package-data.requirements.txt
-@@ -6,7 +6,7 @@ MarkupSafe==2.1.1
- packaging==21.3
- pyparsing==3.0.9
- PyYAML==6.0
--resolvelib==0.8.1
-+resolvelib==0.9.0
- rstcheck==3.5.0
- semantic-version==2.10.0
- straight.plugin==1.5.0
--- 
-2.38.1
-
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 1e0f701fb0b7..42b973a4052b 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.14.4
+version=2.15.0
 revision=1
 hostmakedepends="python3-setuptools python3-wheel python3-packaging
  python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst"
 distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=90b260bc264901d35fb1f0753f2b650813f54cfe6476540afbc6b25ef541ef14
+checksum=cf690fd4ebb40590e00c5acdc0624758ca4c58d1e4b2b02ec026a034070ebf4d
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 

Re: ansible-core: update to 2.15.0

[pascal-huber]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by pascal-huber on void-packages repository

https://github.com/void-linux/void-packages/pull/43918#issuecomment-1551789783

Comment:
ping maintainer @jcgruenhage  

Re: [PR PATCH] [Updated] ansible-core: update to 2.15.0

[pascal-huber]

[-- Attachment #1: Type: text/plain, Size: 774 bytes --]

There is an updated pull request by pascal-huber against master on the void-packages repository

https://github.com/pascal-huber/void-packages ansible-core
https://github.com/void-linux/void-packages/pull/43918

ansible-core: update to 2.15.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86-64_glibc

#### Notes
- With the previous version (2.14.4) `ansible-galaxy` doesn't work as it depends on `python3-resolvelib<=0.10.0`. It now depends on `resolvelib<1.1.0` [upstream commit](https://github.com/ansible/ansible/commit/016b7f71b10539c90ddbb3246f19f9cbf0e65428).


A patch file from https://github.com/void-linux/void-packages/pull/43918.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-core-43918.patch --]
[-- Type: text/x-diff, Size: 7799 bytes --]

From 8d29de49d64219fca293af795326221bb1488814 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Wed, 17 May 2023 19:02:30 +0200
Subject: [PATCH] ansible-core: update to 2.15.0

---
 ...upport-resolvelib-0.5.3-0.10.0-79399.patch | 131 ------------------
 srcpkgs/ansible-core/template                 |   6 +-
 2 files changed, 3 insertions(+), 134 deletions(-)
 delete mode 100644 srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch

diff --git a/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch b/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch
deleted file mode 100644
index 43981e9bd801..000000000000
--- a/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From d61d1b2a750d4d23c9ea086b9de85f15a26b4071 Mon Sep 17 00:00:00 2001
-From: Wong Hoi Sing Edison <hswong3i@gmail.com>
-Date: Wed, 23 Nov 2022 21:57:24 +0800
-Subject: [PATCH] ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0``
- (#79399)
-
-* Upgrade `resolvelib >= 0.5.3, < 0.10.0`
-
-https://pypi.org/project/resolvelib/0.9.0/ released on 2022-11-17:
-
-  * https://github.com/sarugaku/resolvelib/blob/master/CHANGELOG.rst#090-2022-11-17
-  * https://github.com/sarugaku/resolvelib/releases/tag/0.9.0
-
-Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
-(cherry picked from commit b148fd8dd74c8599f809f71117a86577ccfb0638)
----
- changelogs/fragments/79399-resolvelib_lt_0_10_0.yml   | 2 ++
- lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++--
- requirements.txt                                      | 2 +-
- test/lib/ansible_test/_data/requirements/ansible.txt  | 2 +-
- test/sanity/code-smell/docs-build.requirements.in     | 2 +-
- test/sanity/code-smell/docs-build.requirements.txt    | 2 +-
- test/sanity/code-smell/package-data.requirements.in   | 2 +-
- test/sanity/code-smell/package-data.requirements.txt  | 2 +-
- 8 files changed, 10 insertions(+), 8 deletions(-)
- create mode 100644 changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-
-diff --git a/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml b/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-new file mode 100644
-index 0000000000..91b7f517d3
---- /dev/null
-+++ b/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-@@ -0,0 +1,2 @@
-+minor_changes:
-+  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0``.
-diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
-index 817a1eb227..d52006b24d 100644
---- a/lib/ansible/galaxy/dependency_resolution/providers.py
-+++ b/lib/ansible/galaxy/dependency_resolution/providers.py
-@@ -42,7 +42,7 @@ except ImportError:
- 
- # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
- RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
--RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
-+RESOLVELIB_UPPERBOUND = SemanticVersion("0.10.0")
- RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
- 
- 
-@@ -220,7 +220,7 @@ class CollectionDependencyProviderBase(AbstractProvider):
-             Mapping of identifier, list of named tuple pairs.
-             The named tuples have the entries ``requirement`` and ``parent``.
- 
--        resolvelib >=0.8.0, <= 0.8.1
-+        resolvelib >=0.8.0, <= 0.9.0
- 
-         :param identifier: The value returned by ``identify()``.
- 
-diff --git a/requirements.txt b/requirements.txt
-index 20562c3e0f..b92e9ad4fb 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -12,4 +12,4 @@ packaging
- # 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, < 0.10.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
-index 20562c3e0f..b92e9ad4fb 100644
---- a/test/lib/ansible_test/_data/requirements/ansible.txt
-+++ b/test/lib/ansible_test/_data/requirements/ansible.txt
-@@ -12,4 +12,4 @@ packaging
- # 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, < 0.10.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in
-index 02c3bfc946..736450071d 100644
---- a/test/sanity/code-smell/docs-build.requirements.in
-+++ b/test/sanity/code-smell/docs-build.requirements.in
-@@ -1,6 +1,6 @@
- jinja2
- pyyaml
--resolvelib < 0.9.0
-+resolvelib < 0.10.0
- sphinx == 4.2.0
- sphinx-notfound-page
- sphinx-ansible-theme
-diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt
-index 7e30a73287..69b4e062ce 100644
---- a/test/sanity/code-smell/docs-build.requirements.txt
-+++ b/test/sanity/code-smell/docs-build.requirements.txt
-@@ -27,7 +27,7 @@ pyparsing==3.0.9
- pytz==2022.2.1
- PyYAML==6.0
- requests==2.28.1
--resolvelib==0.8.1
-+resolvelib==0.9.0
- rstcheck==3.5.0
- semantic-version==2.10.0
- sh==1.14.3
-diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in
-index 6b58f7557a..4d5e098428 100644
---- a/test/sanity/code-smell/package-data.requirements.in
-+++ b/test/sanity/code-smell/package-data.requirements.in
-@@ -1,7 +1,7 @@
- docutils < 0.18  # match version required by sphinx in the docs-build sanity test
- jinja2
- pyyaml  # ansible-core requirement
--resolvelib < 0.9.0
-+resolvelib < 0.10.0
- rstcheck < 4  # match version used in other sanity tests
- straight.plugin
- antsibull-changelog
-diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt
-index 94ad68fd09..ea35932ce3 100644
---- a/test/sanity/code-smell/package-data.requirements.txt
-+++ b/test/sanity/code-smell/package-data.requirements.txt
-@@ -6,7 +6,7 @@ MarkupSafe==2.1.1
- packaging==21.3
- pyparsing==3.0.9
- PyYAML==6.0
--resolvelib==0.8.1
-+resolvelib==0.9.0
- rstcheck==3.5.0
- semantic-version==2.10.0
- straight.plugin==1.5.0
--- 
-2.38.1
-
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 1e0f701fb0b7..d6dd76d06ce7 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.14.4
+version=2.15.0
 revision=1
 hostmakedepends="python3-setuptools python3-wheel python3-packaging
  python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst"
 distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=90b260bc264901d35fb1f0753f2b650813f54cfe6476540afbc6b25ef541ef14
+checksum=cf690fd4ebb40590e00c5acdc0624758ca4c58d1e4b2b02ec026a034070ebf4d
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 
@@ -24,7 +24,7 @@ do_build() {
 }
 
 do_check() {
-	TEST_FLAGS="${make_check_args}" make tests-py3
+	bin/ansible-test units
 }
 
 do_install() {

Re: [PR PATCH] [Updated] ansible-core: update to 2.15.0

[pascal-huber]

[-- Attachment #1: Type: text/plain, Size: 774 bytes --]

There is an updated pull request by pascal-huber against master on the void-packages repository

https://github.com/pascal-huber/void-packages ansible-core
https://github.com/void-linux/void-packages/pull/43918

ansible-core: update to 2.15.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86-64_glibc

#### Notes
- With the previous version (2.14.4) `ansible-galaxy` doesn't work as it depends on `python3-resolvelib<=0.10.0`. It now depends on `resolvelib<1.1.0` [upstream commit](https://github.com/ansible/ansible/commit/016b7f71b10539c90ddbb3246f19f9cbf0e65428).


A patch file from https://github.com/void-linux/void-packages/pull/43918.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-core-43918.patch --]
[-- Type: text/x-diff, Size: 8868 bytes --]

From 8d29de49d64219fca293af795326221bb1488814 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Wed, 17 May 2023 19:02:30 +0200
Subject: [PATCH 1/2] ansible-core: update to 2.15.0

---
 ...upport-resolvelib-0.5.3-0.10.0-79399.patch | 131 ------------------
 srcpkgs/ansible-core/template                 |   6 +-
 2 files changed, 3 insertions(+), 134 deletions(-)
 delete mode 100644 srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch

diff --git a/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch b/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch
deleted file mode 100644
index 43981e9bd801..000000000000
--- a/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From d61d1b2a750d4d23c9ea086b9de85f15a26b4071 Mon Sep 17 00:00:00 2001
-From: Wong Hoi Sing Edison <hswong3i@gmail.com>
-Date: Wed, 23 Nov 2022 21:57:24 +0800
-Subject: [PATCH] ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0``
- (#79399)
-
-* Upgrade `resolvelib >= 0.5.3, < 0.10.0`
-
-https://pypi.org/project/resolvelib/0.9.0/ released on 2022-11-17:
-
-  * https://github.com/sarugaku/resolvelib/blob/master/CHANGELOG.rst#090-2022-11-17
-  * https://github.com/sarugaku/resolvelib/releases/tag/0.9.0
-
-Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
-(cherry picked from commit b148fd8dd74c8599f809f71117a86577ccfb0638)
----
- changelogs/fragments/79399-resolvelib_lt_0_10_0.yml   | 2 ++
- lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++--
- requirements.txt                                      | 2 +-
- test/lib/ansible_test/_data/requirements/ansible.txt  | 2 +-
- test/sanity/code-smell/docs-build.requirements.in     | 2 +-
- test/sanity/code-smell/docs-build.requirements.txt    | 2 +-
- test/sanity/code-smell/package-data.requirements.in   | 2 +-
- test/sanity/code-smell/package-data.requirements.txt  | 2 +-
- 8 files changed, 10 insertions(+), 8 deletions(-)
- create mode 100644 changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-
-diff --git a/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml b/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-new file mode 100644
-index 0000000000..91b7f517d3
---- /dev/null
-+++ b/changelogs/fragments/79399-resolvelib_lt_0_10_0.yml
-@@ -0,0 +1,2 @@
-+minor_changes:
-+  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 0.10.0``.
-diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
-index 817a1eb227..d52006b24d 100644
---- a/lib/ansible/galaxy/dependency_resolution/providers.py
-+++ b/lib/ansible/galaxy/dependency_resolution/providers.py
-@@ -42,7 +42,7 @@ except ImportError:
- 
- # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
- RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
--RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
-+RESOLVELIB_UPPERBOUND = SemanticVersion("0.10.0")
- RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
- 
- 
-@@ -220,7 +220,7 @@ class CollectionDependencyProviderBase(AbstractProvider):
-             Mapping of identifier, list of named tuple pairs.
-             The named tuples have the entries ``requirement`` and ``parent``.
- 
--        resolvelib >=0.8.0, <= 0.8.1
-+        resolvelib >=0.8.0, <= 0.9.0
- 
-         :param identifier: The value returned by ``identify()``.
- 
-diff --git a/requirements.txt b/requirements.txt
-index 20562c3e0f..b92e9ad4fb 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -12,4 +12,4 @@ packaging
- # 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, < 0.10.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
-index 20562c3e0f..b92e9ad4fb 100644
---- a/test/lib/ansible_test/_data/requirements/ansible.txt
-+++ b/test/lib/ansible_test/_data/requirements/ansible.txt
-@@ -12,4 +12,4 @@ packaging
- # 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, < 0.10.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in
-index 02c3bfc946..736450071d 100644
---- a/test/sanity/code-smell/docs-build.requirements.in
-+++ b/test/sanity/code-smell/docs-build.requirements.in
-@@ -1,6 +1,6 @@
- jinja2
- pyyaml
--resolvelib < 0.9.0
-+resolvelib < 0.10.0
- sphinx == 4.2.0
- sphinx-notfound-page
- sphinx-ansible-theme
-diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt
-index 7e30a73287..69b4e062ce 100644
---- a/test/sanity/code-smell/docs-build.requirements.txt
-+++ b/test/sanity/code-smell/docs-build.requirements.txt
-@@ -27,7 +27,7 @@ pyparsing==3.0.9
- pytz==2022.2.1
- PyYAML==6.0
- requests==2.28.1
--resolvelib==0.8.1
-+resolvelib==0.9.0
- rstcheck==3.5.0
- semantic-version==2.10.0
- sh==1.14.3
-diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in
-index 6b58f7557a..4d5e098428 100644
---- a/test/sanity/code-smell/package-data.requirements.in
-+++ b/test/sanity/code-smell/package-data.requirements.in
-@@ -1,7 +1,7 @@
- docutils < 0.18  # match version required by sphinx in the docs-build sanity test
- jinja2
- pyyaml  # ansible-core requirement
--resolvelib < 0.9.0
-+resolvelib < 0.10.0
- rstcheck < 4  # match version used in other sanity tests
- straight.plugin
- antsibull-changelog
-diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt
-index 94ad68fd09..ea35932ce3 100644
---- a/test/sanity/code-smell/package-data.requirements.txt
-+++ b/test/sanity/code-smell/package-data.requirements.txt
-@@ -6,7 +6,7 @@ MarkupSafe==2.1.1
- packaging==21.3
- pyparsing==3.0.9
- PyYAML==6.0
--resolvelib==0.8.1
-+resolvelib==0.9.0
- rstcheck==3.5.0
- semantic-version==2.10.0
- straight.plugin==1.5.0
--- 
-2.38.1
-
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 1e0f701fb0b7..d6dd76d06ce7 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.14.4
+version=2.15.0
 revision=1
 hostmakedepends="python3-setuptools python3-wheel python3-packaging
  python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst"
 distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=90b260bc264901d35fb1f0753f2b650813f54cfe6476540afbc6b25ef541ef14
+checksum=cf690fd4ebb40590e00c5acdc0624758ca4c58d1e4b2b02ec026a034070ebf4d
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 
@@ -24,7 +24,7 @@ do_build() {
 }
 
 do_check() {
-	TEST_FLAGS="${make_check_args}" make tests-py3
+	bin/ansible-test units
 }
 
 do_install() {

From 8a707a0e432af23e5f3adb508c62d8fc913ace80 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Fri, 19 May 2023 11:00:46 +0200
Subject: [PATCH 2/2] ansible: update to 7.5.0

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 23a243ce9ad3..b1161f4a9312 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=7.4.0
+version=7.5.0
 revision=1
 build_style="python3-pep517"
 hostmakedepends="python3-setuptools python3-wheel"
@@ -10,6 +10,6 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=0964d6ec7b363d2d559f245c39b01798c720a85b207672ec2c9d83cf61564b90
+checksum=4f08ca25bb29005c1afc4125e837882ad7a2c67ff0cc9d1a361b89ad09cf8c44
 # Relevant tests happen in ansible-core
 make_check=no

Re: ansible-core: update to 2.15.0

[jcgruenhage]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/43918#issuecomment-1554282801

Comment:
I've fetched this locally and rebased it on master. Built just fine, and ran a few playbooks without any problems. LGTM!

Re: ansible-core: update to 2.15.0

[jcgruenhage]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/43918#issuecomment-1554282801

Comment:
I've fetched this locally and rebased it on master. Built just fine, and ran a few playbooks without any problems. LGTM!

Re: [PR PATCH] [Merged]: ansible-core: update to 2.15.0

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

There's a merged pull request on the void-packages repository

ansible-core: update to 2.15.0
https://github.com/void-linux/void-packages/pull/43918

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86-64_glibc

#### Notes
- With the previous version (2.14.4) `ansible-galaxy` doesn't work as it depends on `python3-resolvelib<=0.10.0`. It now depends on `resolvelib<1.1.0` [upstream commit](https://github.com/ansible/ansible/commit/016b7f71b10539c90ddbb3246f19f9cbf0e65428).