From 30ca6b9ab19a602241d224670dd92a4fc211c0e2 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Tue, 25 Apr 2023 17:50:24 +0200
Subject: [PATCH] python/ansible-core: update to 2.14.5
---
/dev/null | 19 -------------------
components/python/ansible-core/pkg5 | 1 -
components/python/ansible-core/test/results-all.master | 27 ++++++++++++++-------------
components/python/ansible-core/python-integrate-project.conf | 1 +
components/python/ansible-core/Makefile | 7 ++++---
5 files changed, 19 insertions(+), 36 deletions(-)
diff --git a/components/python/ansible-core/Makefile b/components/python/ansible-core/Makefile
index 2979680..00d2d50 100644
--- a/components/python/ansible-core/Makefile
+++ b/components/python/ansible-core/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = ansible-core
-HUMAN_VERSION = 2.14.4
+HUMAN_VERSION = 2.14.5
COMPONENT_SUMMARY = ansible-core - Radically simple IT automation
COMPONENT_PROJECT_URL = https://ansible.com/
COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/8e/8a/397f18f067d95206eac75a89b38ec9c2ad59c4915ef59aae2ecfb17cce99/ansible-core-2.14.4.tar.gz
+ https://files.pythonhosted.org/packages/9d/f1/9c5e9361c90cf838810433e4c685cf5f585bf74cb44031d6e8c0e779f567/ansible-core-2.14.5.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:90b260bc264901d35fb1f0753f2b650813f54cfe6476540afbc6b25ef541ef14
+ sha256:8c4eed76ce458b4a37334a0802df29488ecf9f8af38c3111069c96b17b205530
COMPONENT_LICENSE = GPL-3.0-only
COMPONENT_LICENSE_FILE = COPYING
@@ -66,6 +66,7 @@
-e 's/^\[gw.\] \[...%\] //' \
-e 's/\([^ ]\{1,\}\) \(.*\)$$/\2 \1/' \
-e 's/\(test_distribution_version\[stdin\)[0-9]*/\1/' \
+ -e 's|$(@D)|\$$(@D)|g' \
| $(SORT) \
| $(COMPONENT_TEST_TRANSFORMER) -e ''"
diff --git a/components/python/ansible-core/ansible.p5m b/components/python/ansible-core/ansible.p5m
deleted file mode 100644
index 1e8d935..0000000
--- a/components/python/ansible-core/ansible.p5m
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-set name=pkg.fmri value=pkg:/system/management/ansible@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=pkg.summary value="Ansible is a radically simple IT automation system"
-set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=info.upstream-url value=https://ansible.com/
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-depend type=require fmri=library/python/ansible-core
diff --git a/components/python/ansible-core/pkg5 b/components/python/ansible-core/pkg5
index 1a13cdb..5e375e5 100644
--- a/components/python/ansible-core/pkg5
+++ b/components/python/ansible-core/pkg5
@@ -11,7 +11,6 @@
],
"fmris": [
"library/python/ansible-core-37",
- "system/management/ansible",
"library/python/ansible-core-39",
"library/python/ansible-core"
],
diff --git a/components/python/ansible-core/python-integrate-project.conf b/components/python/ansible-core/python-integrate-project.conf
index 0ea07cc..f4bb1a4 100644
--- a/components/python/ansible-core/python-integrate-project.conf
+++ b/components/python/ansible-core/python-integrate-project.conf
@@ -56,6 +56,7 @@
-e 's/^\[gw.\] \[...%\] //' \
-e 's/\([^ ]\{1,\}\) \(.*\)$$/\2 \1/' \
-e 's/\(test_distribution_version\[stdin\)[0-9]*/\1/' \
+ -e 's|$(@D)|\$$(@D)|g' \
| $(SORT) \
| $(COMPONENT_TEST_TRANSFORMER) -e ''"
%hook-no-license%
diff --git a/components/python/ansible-core/test/results-all.master b/components/python/ansible-core/test/results-all.master
index 2653e0b..a35c0f7 100644
--- a/components/python/ansible-core/test/results-all.master
+++ b/components/python/ansible-core/test/results-all.master
@@ -4,9 +4,9 @@
test/units/_vendor/test_vendor.py::test_vendored_conflict PASSED
test/units/ansible_test/ci/test_azp.py::test_auth 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 = /data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/lib/ansible] PASSED
-test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible-cli-test [core 2.14.4]] PASSED
-test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[config file = /data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/test/lib/ansible_test/_data/ansible.cfg] 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.14.5]] 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.16 (main, Feb 19 2023, 15:42:40) [GCC 10.4.0]] PASSED
@@ -222,8 +222,8 @@
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_cwd_does_not_exist[setup_existing_files0-setup_env0] PASSED
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_cwd_warning_on_writable[setup_existing_files0-setup_env0] PASSED
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_cwd_warning_on_writable_no_warning_set[setup_existing_files0-setup_env0] PASSED
-test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_env_has_cfg_file[setup_existing_files0-setup_env0-/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/test/units/config/manager/data/test.cfg] PASSED
-test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_env_has_cfg_file[setup_existing_files0-setup_env1-/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/test/units/config/manager/data/ansible.cfg] PASSED
+test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_env_has_cfg_file[setup_existing_files0-setup_env0-$(@D)/test/units/config/manager/data/test.cfg] PASSED
+test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_env_has_cfg_file[setup_existing_files0-setup_env1-$(@D)/test/units/config/manager/data/ansible.cfg] PASSED
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_env_has_no_cfg_file[setup_existing_files0-setup_env0] PASSED
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_env_has_no_cfg_file[setup_existing_files0-setup_env1] PASSED
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_ini_in_cwd[setup_existing_files0-setup_env0] PASSED
@@ -231,8 +231,8 @@
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_ini_in_systemdir[setup_existing_files0-setup_env0] PASSED
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_no_config[setup_existing_files0-setup_env0] PASSED
test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_no_cwd_cfg_no_warning_on_writable[setup_existing_files0-setup_env0] PASSED
-test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_no_warning_on_writable_if_env_used[setup_existing_files0-setup_env0-/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/test/units/config/manager/data/test.cfg] PASSED
-test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_no_warning_on_writable_if_env_used[setup_existing_files0-setup_env1-/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/test/units/config/manager/ansible.cfg] PASSED
+test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_no_warning_on_writable_if_env_used[setup_existing_files0-setup_env0-$(@D)/test/units/config/manager/data/test.cfg] PASSED
+test/units/config/manager/test_find_ini_config_file.py::TestFindIniFile::test_no_warning_on_writable_if_env_used[setup_existing_files0-setup_env1-$(@D)/test/units/config/manager/ansible.cfg] PASSED
test/units/config/test_manager.py::TestConfigManager::test_config_types PASSED
test/units/config/test_manager.py::TestConfigManager::test_config_types_negative PASSED
test/units/config/test_manager.py::TestConfigManager::test_ensure_type[-string-python_type29] PASSED
@@ -300,9 +300,9 @@
test/units/executor/module_common/test_modify_module.py::test_shebang_task_vars PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_collection_path_re[/root/ansible_collections/ns/col/plugins/modules/ping.py-ansible_collections/ns/col/plugins/modules/ping] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_collection_path_re[/root/ansible_collections/ns/col/plugins/modules/subdir/ping.py-ansible_collections/ns/col/plugins/modules/subdir/ping] PASSED
-test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_core_library_path_re[/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/lib/ansible/modules/cloud/amazon/s3.py-ansible/modules/cloud/amazon/s3] PASSED
-test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_core_library_path_re[/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/lib/ansible/modules/from_role.py-ansible/modules/from_role] PASSED
-test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_core_library_path_re[/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/lib/ansible/modules/system/ping.py-ansible/modules/system/ping] PASSED
+test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_core_library_path_re[$(@D)/lib/ansible/modules/cloud/amazon/s3.py-ansible/modules/cloud/amazon/s3] PASSED
+test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_core_library_path_re[$(@D)/lib/ansible/modules/from_role.py-ansible/modules/from_role] PASSED
+test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_core_library_path_re[$(@D)/lib/ansible/modules/system/ping.py-ansible/modules/system/ping] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_new_style_python_module_re[from .. module_utils import basic] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_new_style_python_module_re[from ....module_utils import basic] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_new_style_python_module_re[from ..module_utils import basic] PASSED
@@ -313,9 +313,9 @@
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_new_style_python_module_re[from ansible_collections.my_ns.my_col.plugins.module_utils.my_util import my_func] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_new_style_python_module_re[import ansible.module_utils.basic] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_detect_new_style_python_module_re[import ansible_collections.my_ns.my_col.plugins.module_utils.my_util] PASSED
-test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_collection_path_re[/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/lib/ansible/modules/cloud/amazon/s3.py] PASSED
-test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_collection_path_re[/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/lib/ansible/modules/from_role.py] PASSED
-test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_collection_path_re[/data/builds/ul-perl-modules/components/python/ansible-core/build/amd64-3.9/lib/ansible/modules/system/ping.py] PASSED
+test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_collection_path_re[$(@D)/lib/ansible/modules/cloud/amazon/s3.py] PASSED
+test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_collection_path_re[$(@D)/lib/ansible/modules/from_role.py] PASSED
+test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_collection_path_re[$(@D)/lib/ansible/modules/system/ping.py] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_core_library_path_re[/root/ansible_collections/ns/col/plugins/modules/ping.py] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_core_library_path_re[/root/ansible_collections/ns/col/plugins/modules/subdir/ping.py] PASSED
test/units/executor/module_common/test_module_common.py::TestDetectionRegexes::test_no_detect_new_style_python_module_re[from .. import release] PASSED
@@ -3255,6 +3255,7 @@
test/units/plugins/lookup/test_password.py::TestParseContent::test PASSED
test/units/plugins/lookup/test_password.py::TestParseContent::test_empty_password_file PASSED
test/units/plugins/lookup/test_password.py::TestParseContent::test_with_salt PASSED
+test/units/plugins/lookup/test_password.py::TestParseContent::test_with_salt_and_ident PASSED
test/units/plugins/lookup/test_password.py::TestParseParameters::test PASSED
test/units/plugins/lookup/test_password.py::TestParseParameters::test_invalid_params PASSED
test/units/plugins/lookup/test_password.py::TestParseParameters::test_unrecognized_value PASSED
--
Gitblit v1.9.3