ansible-core: update to 2.13.2.

This commit is contained in:
Jan Christian Grünhage 2022-07-19 15:27:39 +02:00 committed by Michal Vasilek
parent fe883033d7
commit fe67dc17ee
3 changed files with 5 additions and 43 deletions

View file

@ -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?= From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz> <jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 15:33:46 +0200 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] 'which' is not standardized and can even be considered problematic [1]
@ -28,5 +28,5 @@ index 7641344968..45421e88e0 100644
else else
ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1 ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
-- --
2.36.1 2.37.1

View file

@ -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

View file

@ -1,6 +1,6 @@
# Template file for 'ansible-core' # Template file for 'ansible-core'
pkgname=ansible-core pkgname=ansible-core
version=2.13.1 version=2.13.2
revision=1 revision=1
hostmakedepends="python3-setuptools python3-wheel python3-packaging hostmakedepends="python3-setuptools python3-wheel python3-packaging
python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml" python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
@ -13,7 +13,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
homepage="https://www.ansible.com/" homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz" distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958 checksum=b779d0e55a97717c0ee5e86b486aa67c07c2809ef477be2ac84ad091a8dd2ddb
conflicts="ansible<2.10.1_1" conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1" replaces="ansible-base<2.11.0_1"