From 22f007a7e50fb2b0264244eb98ffb733ed55afd9 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Thu, 28 Mar 2024 23:27:18 +0100
Subject: [PATCH] python/ansible-core: update to 2.15.10
---
components/python/ansible-core/patches/05-wcwidth.patch | 4 +-
components/python/ansible-core/patches/06-dev-null.patch | 4 +-
components/python/ansible-core/patches/07-test_importlib_resources.patch | 4 +-
components/python/ansible-core/test/results-all.master | 20 +++++-----
components/python/ansible-core/patches/02-selinux.patch | 4 +-
components/python/ansible-core/python-integrate-project.conf | 4 ++
components/python/ansible-core/patches/03-test-disable-plugins.patch | 18 ++++++---
components/python/ansible-core/Makefile | 16 ++++++--
8 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/components/python/ansible-core/Makefile b/components/python/ansible-core/Makefile
index b69b82b..26640ea 100644
--- a/components/python/ansible-core/Makefile
+++ b/components/python/ansible-core/Makefile
@@ -19,13 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = ansible-core
-HUMAN_VERSION = 2.15.9
+HUMAN_VERSION = 2.15.10
COMPONENT_SUMMARY = ansible-core - Radically simple IT automation
COMPONENT_PROJECT_URL = https://ansible.com/
-COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/47/0b/5e46aeee6c72adc3507d9909e57fa1e9a66b3f4929c463bdbe102441a062/ansible-core-2.15.9.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:25f9b1b5a5af3c0986bd3928ed086eaddb867527fb5c83afef1a03cfad34f345
+ sha256:954dbe8e4e802a4dd5df0366193975b692a05806aa8d7358418a7e617346b20f
COMPONENT_LICENSE = GPL-3.0-only
COMPONENT_LICENSE_FILE = COPYING
@@ -53,6 +51,10 @@
COMPONENT_TEST_ARGS += --verbose
COMPONENT_TEST_TARGETS =
+# This project does not support tox so we need to provide test requirements
+# manually.
+TEST_REQUIREMENTS += test/lib/ansible_test/_data/requirements/units.txt
+
# testing fails without HOME environment variable
COMPONENT_TEST_ENV += HOME=/tmp
@@ -79,3 +81,9 @@
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
+TEST_REQUIRED_PACKAGES.python += library/python/mock
+TEST_REQUIRED_PACKAGES.python += library/python/pytest
+TEST_REQUIRED_PACKAGES.python += library/python/pytest-forked
+TEST_REQUIRED_PACKAGES.python += library/python/pytest-mock
+TEST_REQUIRED_PACKAGES.python += library/python/pytest-xdist
+TEST_REQUIRED_PACKAGES.python += library/python/pyyaml
diff --git a/components/python/ansible-core/patches/02-selinux.patch b/components/python/ansible-core/patches/02-selinux.patch
index 7c79b55..4401489 100644
--- a/components/python/ansible-core/patches/02-selinux.patch
+++ b/components/python/ansible-core/patches/02-selinux.patch
@@ -1,5 +1,5 @@
---- ansible-core-2.15.9/test/units/module_utils/basic/test_selinux.py.orig
-+++ ansible-core-2.15.9/test/units/module_utils/basic/test_selinux.py
+--- ansible-core-2.15.10/test/units/module_utils/basic/test_selinux.py.orig
++++ ansible-core-2.15.10/test/units/module_utils/basic/test_selinux.py
@@ -37,6 +37,7 @@
# test AnsibleModule selinux wrapper methods
@pytest.mark.usefixtures('no_args_module_exec')
diff --git a/components/python/ansible-core/patches/03-test-disable-plugins.patch b/components/python/ansible-core/patches/03-test-disable-plugins.patch
index cd54841..ee5ab2b 100644
--- a/components/python/ansible-core/patches/03-test-disable-plugins.patch
+++ b/components/python/ansible-core/patches/03-test-disable-plugins.patch
@@ -1,13 +1,19 @@
---- ansible-core-2.15.9/test/lib/ansible_test/_internal/commands/units/__init__.py.orig
-+++ ansible-core-2.15.9/test/lib/ansible_test/_internal/commands/units/__init__.py
-@@ -258,6 +258,10 @@
+--- ansible-core-2.15.10/test/lib/ansible_test/_internal/commands/units/__init__.py.orig
++++ ansible-core-2.15.10/test/lib/ansible_test/_internal/commands/units/__init__.py
+@@ -258,6 +258,16 @@
'-n', str(args.num_workers) if args.num_workers else 'auto',
'--color', 'yes' if args.color else 'no',
'-p', 'no:cacheprovider',
-+ '-p', 'no:black',
-+ '-p', 'no:cov',
-+ '-p', 'no:mypy',
++ '-p', 'no:enabler',
+ '-p', 'no:relaxed',
++ '-p', 'no:salt-factories',
++ '-p', 'no:salt-factories-event-listener',
++ '-p', 'no:salt-factories-factories',
++ '-p', 'no:salt-factories-loader-mock',
++ '-p', 'no:salt-factories-log-server',
++ '-p', 'no:salt-factories-markers',
++ '-p', 'no:salt-factories-sysinfo',
++ '-p', 'no:system-statistics',
'-c', os.path.join(ANSIBLE_TEST_DATA_ROOT, 'pytest', 'config', config_name),
'--junit-xml', os.path.join(ResultType.JUNIT.path, 'python%s-%s-units.xml' % (python.version, test_context)),
'--strict-markers', # added in pytest 4.5.0
diff --git a/components/python/ansible-core/patches/05-wcwidth.patch b/components/python/ansible-core/patches/05-wcwidth.patch
index 85009e2..cd8a864 100644
--- a/components/python/ansible-core/patches/05-wcwidth.patch
+++ b/components/python/ansible-core/patches/05-wcwidth.patch
@@ -1,7 +1,7 @@
https://www.illumos.org/issues/15543
---- ansible-core-2.15.9/test/units/utils/test_display.py.orig
-+++ ansible-core-2.15.9/test/units/utils/test_display.py
+--- ansible-core-2.15.10/test/units/utils/test_display.py.orig
++++ ansible-core-2.15.10/test/units/utils/test_display.py
@@ -41,7 +41,6 @@
assert get_text_width(u'\u001B') == 0
assert get_text_width(u'ab\u0000') == 2
diff --git a/components/python/ansible-core/patches/06-dev-null.patch b/components/python/ansible-core/patches/06-dev-null.patch
index 02ed09e..dfa07a5 100644
--- a/components/python/ansible-core/patches/06-dev-null.patch
+++ b/components/python/ansible-core/patches/06-dev-null.patch
@@ -1,5 +1,5 @@
---- ansible-core-2.15.9/test/units/parsing/vault/test_vault_editor.py.orig
-+++ ansible-core-2.15.9/test/units/parsing/vault/test_vault_editor.py
+--- ansible-core-2.15.10/test/units/parsing/vault/test_vault_editor.py.orig
++++ ansible-core-2.15.10/test/units/parsing/vault/test_vault_editor.py
@@ -501,6 +501,7 @@
res = ve._real_path(filename)
self.assertEqual(res, '-')
diff --git a/components/python/ansible-core/patches/07-test_importlib_resources.patch b/components/python/ansible-core/patches/07-test_importlib_resources.patch
index 548a1c0..3bd99b6 100644
--- a/components/python/ansible-core/patches/07-test_importlib_resources.patch
+++ b/components/python/ansible-core/patches/07-test_importlib_resources.patch
@@ -1,5 +1,5 @@
---- ansible-core-2.15.9/test/units/utils/collection_loader/test_collection_loader.py.orig
-+++ ansible-core-2.15.9/test/units/utils/collection_loader/test_collection_loader.py
+--- ansible-core-2.15.10/test/units/utils/collection_loader/test_collection_loader.py.orig
++++ ansible-core-2.15.10/test/units/utils/collection_loader/test_collection_loader.py
@@ -829,6 +829,7 @@
diff --git a/components/python/ansible-core/python-integrate-project.conf b/components/python/ansible-core/python-integrate-project.conf
index b84e026..b0df434 100644
--- a/components/python/ansible-core/python-integrate-project.conf
+++ b/components/python/ansible-core/python-integrate-project.conf
@@ -42,6 +42,10 @@
COMPONENT_TEST_ARGS += --verbose
COMPONENT_TEST_TARGETS =
+# This project does not support tox so we need to provide test requirements
+# manually.
+TEST_REQUIREMENTS += test/lib/ansible_test/_data/requirements/units.txt
+
# testing fails without HOME environment variable
COMPONENT_TEST_ENV += HOME=/tmp
diff --git a/components/python/ansible-core/test/results-all.master b/components/python/ansible-core/test/results-all.master
index d5097a3..c0acf54 100644
--- a/components/python/ansible-core/test/results-all.master
+++ b/components/python/ansible-core/test/results-all.master
@@ -34,11 +34,11 @@
test/units/ansible_test/test_validate_modules.py::test_type_regex[x = type(foo)-False] PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible collection location = /tmp/.ansible/collections:/usr/share/ansible/collections] PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible python module location = $(@D)/lib/ansible] PASSED
-test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible-cli-test [core 2.15.9]] PASSED
+test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible-cli-test [core 2.15.10]] PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[config file = $(@D)/test/lib/ansible_test/_data/ansible.cfg] PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[configured module search path = ['/dev/null']] PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[executable location = ] PASSED
-test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[python version = 3.9.18 (main, Jan 26 2024, 07:32:01) [GCC 13.2.0]] PASSED
+test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[python version = 3.9.19 (main, Mar 26 2024, 20:30:24) [GCC 13.2.0]] PASSED
test/units/cli/galaxy/test_collection_extract_tar.py::test_extract_tar_dir_does_not_exist PASSED
test/units/cli/galaxy/test_collection_extract_tar.py::test_extract_tar_dir_exists PASSED
test/units/cli/galaxy/test_collection_extract_tar.py::test_extract_tar_member_trailing_sep PASSED
@@ -1532,8 +1532,8 @@
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[abcde-ascii-abcde0] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[abcde-ascii-abcde1] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xc3\xa9-utf-8-caf\xc3\xa9] PASSED
-test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe90] PASSED
-test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe91] PASSED
+test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe9_0] PASSED
+test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe9_1] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-utf-8-caf\xc3\xa9] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[\u304f\u3089\u3068\u307f-shift-jis-\u304f\u3089\u3068\u307f] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[\u304f\u3089\u3068\u307f-utf-8-\u304f\u3089\u3068\u307f] PASSED
@@ -1542,8 +1542,8 @@
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[abcde-ascii-abcde0] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[abcde-ascii-abcde1] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xc3\xa9-utf-8-caf\xe9] PASSED
-test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe90] PASSED
-test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe91] PASSED
+test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe9_0] PASSED
+test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe9_1] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-utf-8-caf\xe9] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[\u304f\u3089\u3068\u307f-shift-jis-\u304f\u3089\u3068\u307f] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[\u304f\u3089\u3068\u307f-utf-8-\u304f\u3089\u3068\u307f] PASSED
@@ -1552,8 +1552,8 @@
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[abcde-ascii-abcde0] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[abcde-ascii-abcde1] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xc3\xa9-utf-8-caf\xe9] PASSED
-test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe90] PASSED
-test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe91] PASSED
+test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe9_0] PASSED
+test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe9_1] PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-utf-8-caf\xe9] PASSED
test/units/module_utils/common/text/formatters/test_bytes_to_human.py::test_bytes_to_human[0-0.00 Bytes] PASSED
test/units/module_utils/common/text/formatters/test_bytes_to_human.py::test_bytes_to_human[0.5-0.50 Bytes] PASSED
@@ -3634,8 +3634,8 @@
test/units/utils/test_version.py::test_invalid[1.2.3-0123] PASSED
test/units/utils/test_version.py::test_invalid[1.2.3.DEV] PASSED
test/units/utils/test_version.py::test_invalid[1.2.31.2.3----RC-SNAPSHOT.12.09.1--..12+788] PASSED
-test/units/utils/test_version.py::test_invalid[1.20] PASSED
-test/units/utils/test_version.py::test_invalid[1.21] PASSED
+test/units/utils/test_version.py::test_invalid[1.2_0] PASSED
+test/units/utils/test_version.py::test_invalid[1.2_1] PASSED
test/units/utils/test_version.py::test_invalid[1] PASSED
test/units/utils/test_version.py::test_invalid[9.8.7+meta+meta] PASSED
test/units/utils/test_version.py::test_invalid[9.8.7-whatever+meta+meta] PASSED
--
Gitblit v1.9.3