* [PR PATCH] Ansible 6.0.0
@ 2022-06-30 11:07 jcgruenhage
2022-06-30 12:31 ` [PR PATCH] [Updated] " jcgruenhage
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 11:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 4846 bytes --]
From 525c4bb6c3e3b037136877b5f3118b2f7684ab77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From 6d0eb42f473bab38ee376a488a5f4c52363ac6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
srcpkgs/ansible-core/template | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..2e92c5e9ce94 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,27 +1,38 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging python3-straight.plugin python3-docutils"
+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"
+#make_check_args="--exclude test/units/galaxy/test_collection_install.py::test_concrete_artifact_manager_scm_no_executable"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
# Tests are currently broken for ansible on python 3.10
# See https://github.com/ansible/ansible/issues/74658
# and https://github.com/ansible/ansible/issues/74660
-make_check=no
+#make_check=no
-post_install() {
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
vsconf examples/ansible.cfg
vsconf examples/hosts
+ make docs
for m in docs/man/man1/*.1; do
vman ${m}
done
From 0769693cd695f752815ab8efd1972725eb7fd9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..dbe0fcde7b00 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
# Tests are currently broken for ansible on python 3.10
# See https://github.com/ansible/ansible/issues/74658
# and https://github.com/ansible/ansible/issues/74660
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
@ 2022-06-30 12:31 ` jcgruenhage
2022-06-30 14:47 ` jcgruenhage
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO** (Well, I've tested it and it's broken, so not sure what to put here)
Tests blocked(-ish) on https://github.com/ansible/ansible/issues/78169
<!-- 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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 5132 bytes --]
From 33de11b21ea16d78fd1b8d817e1110b25c51c7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From 25f3570be75de44707a434768b9f4e0d850a6b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
srcpkgs/ansible-core/template | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..52874d9eb5f6 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,27 +1,36 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+# See https://github.com/ansible/ansible/issues/78169. Test case is broken because bin==sbin on void
+make_check_args="--exclude test/units/galaxy/test_collection_install.py"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging python3-straight.plugin python3-docutils which"
+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"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
vsconf examples/ansible.cfg
vsconf examples/hosts
+ make docs
+
for m in docs/man/man1/*.1; do
vman ${m}
done
From 03be69941e40ebed449ed90b1fc5f8718bad9ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
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/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
2022-06-30 12:31 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-06-30 14:47 ` jcgruenhage
2022-06-30 15:08 ` jcgruenhage
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO** (Well, I've tested it and it's broken, so not sure what to put here)
Tests blocked(-ish) on https://github.com/ansible/ansible/issues/78169
<!-- 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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 8693 bytes --]
From 33de11b21ea16d78fd1b8d817e1110b25c51c7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From 14eb8d3e4cd2e52edbf548709d9dc5ea15094700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 +++++++++++++++
...et_bin_path-should-only-look-at-PATH.patch | 39 +++++++++++++++++++
srcpkgs/ansible-core/template | 29 ++++++++------
3 files changed, 89 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..93cb25f91237
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From ebb46e78c763836d45cbc82b963946a7cf59b3f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
new file mode 100644
index 000000000000..7c2f0c1d597b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
@@ -0,0 +1,39 @@
+From 9e273f9d1151d1c43b7b0206e902905140d15c6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:37:16 +0200
+Subject: [PATCH 2/2] fix: get_bin_path should only look at $PATH
+
+get_bin_path, according to it's documentation, is looking for a binary
+in the $PATH. It actually also checks in /sbin, /usr/sbin and
+/usr/local/sbin, which breaks stuff if you explicitly need to not look
+in those directories either
+---
+ lib/ansible/module_utils/common/process.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/lib/ansible/module_utils/common/process.py b/lib/ansible/module_utils/common/process.py
+index f128cd9800..970dd99852 100644
+--- a/lib/ansible/module_utils/common/process.py
++++ b/lib/ansible/module_utils/common/process.py
+@@ -20,17 +20,12 @@ def get_bin_path(arg, opt_dirs=None, required=None):
+ '''
+ opt_dirs = [] if opt_dirs is None else opt_dirs
+
+- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
+ paths = []
+ for d in opt_dirs:
+ if d is not None and os.path.exists(d):
+ paths.append(d)
+ paths += os.environ.get('PATH', '').split(os.pathsep)
+ bin_path = None
+- # mangle PATH to include /sbin dirs
+- for p in sbin_paths:
+- if p not in paths and os.path.exists(p):
+- paths.append(p)
+ for d in paths:
+ if not d:
+ continue
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..bca229a5460b 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,27 +1,34 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging python3-straight.plugin python3-docutils"
+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"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
vsconf examples/ansible.cfg
vsconf examples/hosts
+ make docs
+
for m in docs/man/man1/*.1; do
vman ${m}
done
From 60f7ab619928900beebe31e85d16ff4ac4188ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
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/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
2022-06-30 12:31 ` [PR PATCH] [Updated] " jcgruenhage
2022-06-30 14:47 ` jcgruenhage
@ 2022-06-30 15:08 ` jcgruenhage
2022-06-30 15:13 ` jcgruenhage
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 15:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO** (Well, I've tested it and it's broken, so not sure what to put here)
Tests blocked(-ish) on https://github.com/ansible/ansible/issues/78169
<!-- 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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 8995 bytes --]
From 42e4d2b5ea7c6c7e190ca7aa3419e30f5a4100f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From ec24430983f6b09179779633e26c7770a8e297fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 +++++++++++++
...et_bin_path-should-only-look-at-PATH.patch | 39 +++++++++++++++
srcpkgs/ansible-core/template | 48 +++++++++++++------
3 files changed, 105 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..93cb25f91237
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From ebb46e78c763836d45cbc82b963946a7cf59b3f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
new file mode 100644
index 000000000000..7c2f0c1d597b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
@@ -0,0 +1,39 @@
+From 9e273f9d1151d1c43b7b0206e902905140d15c6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:37:16 +0200
+Subject: [PATCH 2/2] fix: get_bin_path should only look at $PATH
+
+get_bin_path, according to it's documentation, is looking for a binary
+in the $PATH. It actually also checks in /sbin, /usr/sbin and
+/usr/local/sbin, which breaks stuff if you explicitly need to not look
+in those directories either
+---
+ lib/ansible/module_utils/common/process.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/lib/ansible/module_utils/common/process.py b/lib/ansible/module_utils/common/process.py
+index f128cd9800..970dd99852 100644
+--- a/lib/ansible/module_utils/common/process.py
++++ b/lib/ansible/module_utils/common/process.py
+@@ -20,17 +20,12 @@ def get_bin_path(arg, opt_dirs=None, required=None):
+ '''
+ opt_dirs = [] if opt_dirs is None else opt_dirs
+
+- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
+ paths = []
+ for d in opt_dirs:
+ if d is not None and os.path.exists(d):
+ paths.append(d)
+ paths += os.environ.get('PATH', '').split(os.pathsep)
+ bin_path = None
+- # mangle PATH to include /sbin dirs
+- for p in sbin_paths:
+- if p not in paths and os.path.exists(p):
+- paths.append(p)
+ for d in paths:
+ if not d:
+ continue
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..7b825fdb71c1 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,30 +1,50 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging"
+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"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends="${pkgname}"
+else
+ hostmakedepends=" python3-straight.plugin python3-docutils"
+fi
+
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
+
+ if [ -z "$CROSS_BUILD" ]; then
+ make docs
+ for page in docs/man/man1/*.1; do
+ vman ${m}
+ done
+ else
+ for page in /usr/share/man/man1/ansible*; do
+ vman $page
+ done
+ fi
+
vsconf examples/ansible.cfg
vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
}
ansible-base_package() {
From 4c26d8d068fa6b9483f1a80c2a6cd21e868c8626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
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/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
` (2 preceding siblings ...)
2022-06-30 15:08 ` jcgruenhage
@ 2022-06-30 15:13 ` jcgruenhage
2022-06-30 15:29 ` jcgruenhage
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO** (Well, I've tested it and it's broken, so not sure what to put here)
Tests blocked(-ish) on https://github.com/ansible/ansible/issues/78169
<!-- 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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 8998 bytes --]
From 42e4d2b5ea7c6c7e190ca7aa3419e30f5a4100f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From dd576dd913321a749df0af800fc9ef2abb4855f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 +++++++++++++
...et_bin_path-should-only-look-at-PATH.patch | 39 +++++++++++++++
srcpkgs/ansible-core/template | 48 +++++++++++++------
3 files changed, 105 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..93cb25f91237
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From ebb46e78c763836d45cbc82b963946a7cf59b3f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
new file mode 100644
index 000000000000..7c2f0c1d597b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
@@ -0,0 +1,39 @@
+From 9e273f9d1151d1c43b7b0206e902905140d15c6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:37:16 +0200
+Subject: [PATCH 2/2] fix: get_bin_path should only look at $PATH
+
+get_bin_path, according to it's documentation, is looking for a binary
+in the $PATH. It actually also checks in /sbin, /usr/sbin and
+/usr/local/sbin, which breaks stuff if you explicitly need to not look
+in those directories either
+---
+ lib/ansible/module_utils/common/process.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/lib/ansible/module_utils/common/process.py b/lib/ansible/module_utils/common/process.py
+index f128cd9800..970dd99852 100644
+--- a/lib/ansible/module_utils/common/process.py
++++ b/lib/ansible/module_utils/common/process.py
+@@ -20,17 +20,12 @@ def get_bin_path(arg, opt_dirs=None, required=None):
+ '''
+ opt_dirs = [] if opt_dirs is None else opt_dirs
+
+- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
+ paths = []
+ for d in opt_dirs:
+ if d is not None and os.path.exists(d):
+ paths.append(d)
+ paths += os.environ.get('PATH', '').split(os.pathsep)
+ bin_path = None
+- # mangle PATH to include /sbin dirs
+- for p in sbin_paths:
+- if p not in paths and os.path.exists(p):
+- paths.append(p)
+ for d in paths:
+ if not d:
+ continue
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..b363945ffb69 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,30 +1,50 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging"
+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"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" ${pkgname}"
+else
+ hostmakedepends+=" python3-straight.plugin python3-docutils"
+fi
+
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
+
+ if [ -z "$CROSS_BUILD" ]; then
+ make docs
+ for page in docs/man/man1/*.1; do
+ vman ${m}
+ done
+ else
+ for page in /usr/share/man/man1/ansible*; do
+ vman $page
+ done
+ fi
+
vsconf examples/ansible.cfg
vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
}
ansible-base_package() {
From eed80c078b823fb146e014bc57ef6f6e773c8f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
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/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
` (3 preceding siblings ...)
2022-06-30 15:13 ` jcgruenhage
@ 2022-06-30 15:29 ` jcgruenhage
2022-06-30 19:48 ` jcgruenhage
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 15:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO** (Well, I've tested it and it's broken, so not sure what to put here)
Tests blocked(-ish) on https://github.com/ansible/ansible/issues/78169
<!-- 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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 9003 bytes --]
From 42e4d2b5ea7c6c7e190ca7aa3419e30f5a4100f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From f902a4651cc4daaf6b72fd85de757d478c895065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 +++++++++++++
...et_bin_path-should-only-look-at-PATH.patch | 39 +++++++++++++++
srcpkgs/ansible-core/template | 48 +++++++++++++------
3 files changed, 105 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..93cb25f91237
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From ebb46e78c763836d45cbc82b963946a7cf59b3f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
new file mode 100644
index 000000000000..7c2f0c1d597b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-fix-get_bin_path-should-only-look-at-PATH.patch
@@ -0,0 +1,39 @@
+From 9e273f9d1151d1c43b7b0206e902905140d15c6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:37:16 +0200
+Subject: [PATCH 2/2] fix: get_bin_path should only look at $PATH
+
+get_bin_path, according to it's documentation, is looking for a binary
+in the $PATH. It actually also checks in /sbin, /usr/sbin and
+/usr/local/sbin, which breaks stuff if you explicitly need to not look
+in those directories either
+---
+ lib/ansible/module_utils/common/process.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/lib/ansible/module_utils/common/process.py b/lib/ansible/module_utils/common/process.py
+index f128cd9800..970dd99852 100644
+--- a/lib/ansible/module_utils/common/process.py
++++ b/lib/ansible/module_utils/common/process.py
+@@ -20,17 +20,12 @@ def get_bin_path(arg, opt_dirs=None, required=None):
+ '''
+ opt_dirs = [] if opt_dirs is None else opt_dirs
+
+- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
+ paths = []
+ for d in opt_dirs:
+ if d is not None and os.path.exists(d):
+ paths.append(d)
+ paths += os.environ.get('PATH', '').split(os.pathsep)
+ bin_path = None
+- # mangle PATH to include /sbin dirs
+- for p in sbin_paths:
+- if p not in paths and os.path.exists(p):
+- paths.append(p)
+ for d in paths:
+ if not d:
+ continue
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..4237749c044b 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,30 +1,50 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging"
+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"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" ${pkgname}"
+else
+ hostmakedepends+=" python3-straight.plugin python3-docutils"
+fi
+
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
+
+ if [ -z "$CROSS_BUILD" ]; then
+ make docs
+ for page in docs/man/man1/*.1; do
+ vman ${page}
+ done
+ else
+ for page in /usr/share/man/man1/ansible*; do
+ vman ${page}
+ done
+ fi
+
vsconf examples/ansible.cfg
vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
}
ansible-base_package() {
From 819f7cfefae1edef899dbeebcfc46ebab0139f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
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/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
` (4 preceding siblings ...)
2022-06-30 15:29 ` jcgruenhage
@ 2022-06-30 19:48 ` jcgruenhage
2022-06-30 21:29 ` jcgruenhage
2022-07-01 6:40 ` [PR PATCH] [Merged]: " the-maldridge
7 siblings, 0 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 19:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO** (Well, I've tested it and it's broken, so not sure what to put here)
Tests blocked(-ish) on https://github.com/ansible/ansible/issues/78169
<!-- 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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 9441 bytes --]
From a5684065068ead955ea8566d4641b32c42215ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From c8feabd90f6da9b679c5037972d36a720e54ca8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 +++++++++++++
...or-missing-git-executable-more-gener.patch | 38 +++++++++++++++
srcpkgs/ansible-core/template | 48 +++++++++++++------
3 files changed, 104 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..a6ec631de778
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From 40acbda0805b0a43d723a1cc73fba8b40b624940 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
new file mode 100644
index 000000000000..6fa9cfbaec5b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
@@ -0,0 +1,38 @@
+From 9d0ab3aa9d0dd1a3d3885b44448acb262396a57d Mon Sep 17 00:00:00 2001
+From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com>
+Date: Thu, 30 Jun 2022 13:19:44 -0400
+Subject: [PATCH 2/2] Make unit test for missing git executable more generic
+ (#78173)
+
+* Make unit test for missing git executable more generic
+
+* use MagicMock side_effect to raise exception instead
+---
+ test/units/galaxy/test_collection_install.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py
+index 7525a194ca..d83fe42054 100644
+--- a/test/units/galaxy/test_collection_install.py
++++ b/test/units/galaxy/test_collection_install.py
+@@ -181,13 +181,14 @@ def test_concrete_artifact_manager_scm_no_executable(monkeypatch):
+ monkeypatch.setattr(collection.concrete_artifact_manager.subprocess, 'check_call', mock_subprocess_check_call)
+ mock_mkdtemp = MagicMock(return_value='')
+ monkeypatch.setattr(collection.concrete_artifact_manager, 'mkdtemp', mock_mkdtemp)
++ mock_get_bin_path = MagicMock(side_effect=[ValueError('Failed to find required executable')])
++ monkeypatch.setattr(collection.concrete_artifact_manager, 'get_bin_path', mock_get_bin_path)
+
+ error = re.escape(
+ "Could not find git executable to extract the collection from the Git repository `https://github.com/org/repo`"
+ )
+- with mock.patch.dict(os.environ, {"PATH": ""}):
+- with pytest.raises(AnsibleError, match=error):
+- collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
++ with pytest.raises(AnsibleError, match=error):
++ collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
+
+
+ @pytest.mark.parametrize(
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..4237749c044b 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,30 +1,50 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging"
+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"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" ${pkgname}"
+else
+ hostmakedepends+=" python3-straight.plugin python3-docutils"
+fi
+
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
+
+ if [ -z "$CROSS_BUILD" ]; then
+ make docs
+ for page in docs/man/man1/*.1; do
+ vman ${page}
+ done
+ else
+ for page in /usr/share/man/man1/ansible*; do
+ vman ${page}
+ done
+ fi
+
vsconf examples/ansible.cfg
vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
}
ansible-base_package() {
From aef6a71d56b047d4871ce7fa085ad79f9b1fcaea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
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/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
` (5 preceding siblings ...)
2022-06-30 19:48 ` jcgruenhage
@ 2022-06-30 21:29 ` jcgruenhage
2022-07-01 6:40 ` [PR PATCH] [Merged]: " the-maldridge
7 siblings, 0 replies; 9+ messages in thread
From: jcgruenhage @ 2022-06-30 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages ansible-6.0.0_1
https://github.com/void-linux/void-packages/pull/37758
Ansible 6.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO** (Well, I've tested it and it's broken, so not sure what to put here)
Tests blocked(-ish) on https://github.com/ansible/ansible/issues/78169
<!-- 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/37758.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ansible-6.0.0_1-37758.patch --]
[-- Type: text/x-diff, Size: 9261 bytes --]
From a5684065068ead955ea8566d4641b32c42215ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 1/3] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From 70082961ca2b324b8e1c0d4eda148c190b73dab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 2/3] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 ++++++++++++++++
...or-missing-git-executable-more-gener.patch | 38 +++++++++++++++++++
srcpkgs/ansible-core/template | 38 ++++++++++++-------
3 files changed, 94 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..a6ec631de778
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From 40acbda0805b0a43d723a1cc73fba8b40b624940 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
new file mode 100644
index 000000000000..6fa9cfbaec5b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
@@ -0,0 +1,38 @@
+From 9d0ab3aa9d0dd1a3d3885b44448acb262396a57d Mon Sep 17 00:00:00 2001
+From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com>
+Date: Thu, 30 Jun 2022 13:19:44 -0400
+Subject: [PATCH 2/2] Make unit test for missing git executable more generic
+ (#78173)
+
+* Make unit test for missing git executable more generic
+
+* use MagicMock side_effect to raise exception instead
+---
+ test/units/galaxy/test_collection_install.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py
+index 7525a194ca..d83fe42054 100644
+--- a/test/units/galaxy/test_collection_install.py
++++ b/test/units/galaxy/test_collection_install.py
+@@ -181,13 +181,14 @@ def test_concrete_artifact_manager_scm_no_executable(monkeypatch):
+ monkeypatch.setattr(collection.concrete_artifact_manager.subprocess, 'check_call', mock_subprocess_check_call)
+ mock_mkdtemp = MagicMock(return_value='')
+ monkeypatch.setattr(collection.concrete_artifact_manager, 'mkdtemp', mock_mkdtemp)
++ mock_get_bin_path = MagicMock(side_effect=[ValueError('Failed to find required executable')])
++ monkeypatch.setattr(collection.concrete_artifact_manager, 'get_bin_path', mock_get_bin_path)
+
+ error = re.escape(
+ "Could not find git executable to extract the collection from the Git repository `https://github.com/org/repo`"
+ )
+- with mock.patch.dict(os.environ, {"PATH": ""}):
+- with pytest.raises(AnsibleError, match=error):
+- collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
++ with pytest.raises(AnsibleError, match=error):
++ collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
+
+
+ @pytest.mark.parametrize(
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..23124e9fb613 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,30 +1,40 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+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"
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/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
+
+ make docs
+ for page in docs/man/man1/*.1; do
+ vman ${page}
+ done
+
vsconf examples/ansible.cfg
vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
}
ansible-base_package() {
From d28db860d28eb2bba69623e8bd5180ce89af7299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 3/3] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
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/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: Ansible 6.0.0
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
` (6 preceding siblings ...)
2022-06-30 21:29 ` jcgruenhage
@ 2022-07-01 6:40 ` the-maldridge
7 siblings, 0 replies; 9+ messages in thread
From: the-maldridge @ 2022-07-01 6:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There's a merged pull request on the void-packages repository
Ansible 6.0.0
https://github.com/void-linux/void-packages/pull/37758
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
First patch has been merged upstream and will become available in 2.14, second patch has been merged upstream and a backport attempt was started as well, so it might arrive in 2.13.2 already.
We finally have tests running on ansible-core again, which surfaced https://github.com/ansible/ansible/issues/78169, which was fixed in under half a day by upstream, so yay :)
<!-- 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] 9+ messages in thread
end of thread, other threads:[~2022-07-01 6:40 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-30 11:07 [PR PATCH] Ansible 6.0.0 jcgruenhage
2022-06-30 12:31 ` [PR PATCH] [Updated] " jcgruenhage
2022-06-30 14:47 ` jcgruenhage
2022-06-30 15:08 ` jcgruenhage
2022-06-30 15:13 ` jcgruenhage
2022-06-30 15:29 ` jcgruenhage
2022-06-30 19:48 ` jcgruenhage
2022-06-30 21:29 ` jcgruenhage
2022-07-01 6:40 ` [PR PATCH] [Merged]: " the-maldridge
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).