From 988a864aa8ae5db99c6795fcf3d6ee4efb47d43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 19 Jul 2022 15:27:39 +0200 Subject: [PATCH 1/2] ansible-core: update to 2.13.2. --- ...mmand-v-instead-of-which-in-Makefile.patch | 6 +-- ...or-missing-git-executable-more-gener.patch | 38 ------------------- srcpkgs/ansible-core/template | 4 +- 3 files changed, 5 insertions(+), 43 deletions(-) delete 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 index a6ec631de778..6bf0d9d98255 100644 --- 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 @@ -1,8 +1,8 @@ -From 40acbda0805b0a43d723a1cc73fba8b40b624940 Mon Sep 17 00:00:00 2001 +From 7e4b82ed9506e189c9060e3987e68c40e60bfaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Thu, 30 Jun 2022 15:33:46 +0200 -Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile +Subject: [PATCH] use 'command -v' instead of 'which' in Makefile 'which' is not standardized and can even be considered problematic [1] @@ -28,5 +28,5 @@ index 7641344968..45421e88e0 100644 else ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1 -- -2.36.1 +2.37.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 deleted file mode 100644 index 6fa9cfbaec5b..000000000000 --- a/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 23124e9fb613..eb2d96b37f0f 100644 --- a/srcpkgs/ansible-core/template +++ b/srcpkgs/ansible-core/template @@ -1,6 +1,6 @@ # Template file for 'ansible-core' pkgname=ansible-core -version=2.13.1 +version=2.13.2 revision=1 hostmakedepends="python3-setuptools python3-wheel python3-packaging python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml" @@ -13,7 +13,7 @@ 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=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958 +checksum=b779d0e55a97717c0ee5e86b486aa67c07c2809ef477be2ac84ad091a8dd2ddb conflicts="ansible<2.10.1_1" replaces="ansible-base<2.11.0_1" From 4657bed5d62e679a1b5134c47e229c7615506fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 19 Jul 2022 15:27:45 +0200 Subject: [PATCH 2/2] ansible: update to 6.1.0. --- srcpkgs/ansible/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 2bce297348fd..69a3c3cfd025 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=6.0.0 +version=6.1.0 revision=1 build_style="python3-pep517" hostmakedepends="python3-setuptools python3-wheel" @@ -10,6 +10,6 @@ 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=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53 +checksum=91e4b23945f190aaa123c6ba4f8accb8e7f8905991bd3bb19b89afbdca456822 # Relevant tests happen in ansible-core make_check=no