From 33de11b21ea16d78fd1b8d817e1110b25c51c7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= 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 " +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?= 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 " 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?= 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 " 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