Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ansible: update to 7.1.0.
@ 2022-12-11 21:29 jcgruenhage
  2022-12-14  0:12 ` [PR PATCH] [Merged]: " Piraty
  0 siblings, 1 reply; 2+ messages in thread
From: jcgruenhage @ 2022-12-11 21:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/jcgruenhage/void-packages ansible-7.1.0_1
https://github.com/void-linux/void-packages/pull/41025

ansible: update to 7.1.0.
- python3-ansible-compat: update to 2.2.7.
- python3-ansible-lint: update to 6.9.1.
- ansible-core: update to 2.14.1.
- ansible: update to 7.1.0.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 3512c382e7f0128526c4798066ebb3b905d894e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 11 Dec 2022 22:28:36 +0100
Subject: [PATCH 1/4] python3-ansible-compat: update to 2.2.7.

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

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index bb288eeedd3b..6119c3bc6817 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
-version=2.2.5
+version=2.2.7
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/ansible/ansible-compat"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=28c7c545fd60ef9c3059cfb2fefd27f92db091ff6b5868f83f121ceb5e1fe1b5
+checksum=08deddcd0a1dc6baabe674b07c6ff882118492c123d281f56f01905271a7ffc4
 
 post_patch() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"

From 3ea909e970274f47724bf9a74fa4200449936609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 11 Dec 2022 22:28:44 +0100
Subject: [PATCH 2/4] python3-ansible-lint: update to 6.9.1.

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

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 9619bf1e305d..bee369e45645 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=6.9.0
+version=6.9.1
 revision=1
 build_style=python3-pep517
 make_install_target="dist/ansible_lint-*-*-*-*.whl"
@@ -18,7 +18,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/ansible/ansible-lint"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=14ef919920c4acc980547ded0bd423a7a27a0b2327738e593343f446f3b126c6
+checksum=4c85f0d61700042cab964dd7bdc9227137ba5490249f705acfd9de46eb00a07f
 # cba anymore, the list of failing tests changes with every update
 make_check="no"
 

From ea188e66221657b396e0b78a53bcddd0643e086d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 11 Dec 2022 22:28:51 +0100
Subject: [PATCH 3/4] ansible-core: update to 2.14.1.

---
 ...upport-resolvelib-0.5.3-0.10.0-79399.patch | 131 ++++++++++++++++++
 srcpkgs/ansible-core/template                 |   7 +-
 2 files changed, 135 insertions(+), 3 deletions(-)
 create 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
new file mode 100644
index 000000000000..43981e9bd801
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-ansible-galaxy-support-resolvelib-0.5.3-0.10.0-79399.patch
@@ -0,0 +1,131 @@
+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 5bd7677a0ff4..7ef4abca11c1 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,20 +1,21 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.14.0
+version=2.14.1
 revision=1
 hostmakedepends="python3-setuptools python3-wheel python3-packaging
  python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
 depends="python3-cryptography python3-Jinja2 python3-paramiko python3-yaml
  python3-packaging python3-resolvelib python3-pytz git"
 checkdepends="${depends} python3-pytest python3-pytest-xdist
- python3-pytest-forked unzip openssh python3-pytest-mock libselinux"
+ python3-pytest-forked unzip openssh python3-pytest-mock libselinux
+ python3-passlib"
 short_desc="Simple deployment, configuration management and execution framework"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 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=fa48b481cb623bf79bb903f223097681a0c13e1b4ec7e78e7dd7d858d36a34b2
+checksum=589257f2560fffd5d4465352cd4504e2cbfc418ba49e0c4265cd54e16070c938
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 

From 75c004f3d50e6d18162c257f21454d8fee4e2f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 11 Dec 2022 22:28:56 +0100
Subject: [PATCH 4/4] ansible: update to 7.1.0.

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

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 0c4dd2e84aac..80012a517c30 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=7.0.0
+version=7.1.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=73144e7e602715fab623005d2e71e503dddae86185e061fed861b2449c5618ea
+checksum=1e47238c4aa9e68c0c5367a3fd707ba6c3949b4aaf912b06440ad78dd2bf018d
 # Relevant tests happen in ansible-core
 make_check=no

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: ansible: update to 7.1.0.
  2022-12-11 21:29 [PR PATCH] ansible: update to 7.1.0 jcgruenhage
@ 2022-12-14  0:12 ` Piraty
  0 siblings, 0 replies; 2+ messages in thread
From: Piraty @ 2022-12-14  0:12 UTC (permalink / raw)
  To: ml

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

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

ansible: update to 7.1.0.
https://github.com/void-linux/void-packages/pull/41025

Description:
- python3-ansible-compat: update to 2.2.7.
- python3-ansible-lint: update to 6.9.1.
- ansible-core: update to 2.14.1.
- ansible: update to 7.1.0.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-12-14  0:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-11 21:29 [PR PATCH] ansible: update to 7.1.0 jcgruenhage
2022-12-14  0:12 ` [PR PATCH] [Merged]: " Piraty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).