From 6894ae7d1d5feeae6690435bf8d428fa4eeb5463 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Fri, 13 Nov 2020 15:42:10 -0600 Subject: Rename to ansible-core (#72594) Change: - Initial set of changes for renaming to ansible-core - Includes changelog fragment changes from base -> core - Does NOT include docs changes - Modifies detection stuff in setup.py to support ansible<2.9 and ansible-base Test Plan: - ci_complete --- test/lib/ansible_test/_data/completion/docker.txt | 2 +- test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt | 4 ++-- test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt | 2 +- test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py | 2 +- test/lib/ansible_test/_data/sanity/pylint/plugins/deprecated.py | 4 ++-- .../_data/sanity/validate-modules/validate_modules/schema.py | 4 ++-- test/lib/ansible_test/_internal/util_common.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'test/lib') diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt index c76cc73794..cfdf8557e7 100644 --- a/test/lib/ansible_test/_data/completion/docker.txt +++ b/test/lib/ansible_test/_data/completion/docker.txt @@ -1,5 +1,5 @@ default name=quay.io/ansible/default-test-container:2.9.0 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined context=collection -default name=quay.io/ansible/ansible-base-test-container:1.7.0 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined context=ansible-base +default name=quay.io/ansible/ansible-base-test-container:1.7.0 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined context=ansible-core alpine3 name=quay.io/ansible/alpine3-test-container:1.19.0 python=3.8 centos6 name=quay.io/ansible/centos6-test-container:1.17.0 python=2.6 seccomp=unconfined centos7 name=quay.io/ansible/centos7-test-container:1.17.0 python=2.7 seccomp=unconfined diff --git a/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt b/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt index abd6c5fdbd..cec0eed3cd 100644 --- a/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt +++ b/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt @@ -1,2 +1,2 @@ -jinja2 # ansible-base requirement -pyyaml # ansible-base requirement +jinja2 # ansible-core requirement +pyyaml # ansible-core requirement diff --git a/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt b/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt index 5c0fca7886..efe940041c 100644 --- a/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt +++ b/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt @@ -1,3 +1,3 @@ -jinja2 # ansible-base requirement +jinja2 # ansible-core requirement pyyaml # needed for collection_detail.py voluptuous diff --git a/test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py b/test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py index 6d5689516a..5eb5a4f24f 100755 --- a/test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -"""Schema validation of ansible-base's ansible_builtin_runtime.yml and collection's meta/runtime.yml""" +"""Schema validation of ansible-core's ansible_builtin_runtime.yml and collection's meta/runtime.yml""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/test/lib/ansible_test/_data/sanity/pylint/plugins/deprecated.py b/test/lib/ansible_test/_data/sanity/pylint/plugins/deprecated.py index 9ded3e3bd7..68910cb850 100644 --- a/test/lib/ansible_test/_data/sanity/pylint/plugins/deprecated.py +++ b/test/lib/ansible_test/_data/sanity/pylint/plugins/deprecated.py @@ -55,14 +55,14 @@ MSGS = { "ansible-deprecated-no-collection-name", "The current collection name in format `namespace.name` must " "be provided as collection_name when calling Display.deprecated " - "or AnsibleModule.deprecate (`ansible.builtin` for ansible-base)", + "or AnsibleModule.deprecate (`ansible.builtin` for ansible-core)", {'minversion': (2, 6)}), 'E9507': ("Wrong collection name (%r) found in call to " "Display.deprecated or AnsibleModule.deprecate", "wrong-collection-deprecated", "The name of the current collection must be passed to the " "Display.deprecated resp. AnsibleModule.deprecate calls " - "(`ansible.builtin` for ansible-base)", + "(`ansible.builtin` for ansible-core)", {'minversion': (2, 6)}), 'E9508': ("Expired date (%r) found in call to Display.deprecated " "or AnsibleModule.deprecate", diff --git a/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/schema.py b/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/schema.py index 9aeb2d7d48..9e4cd42747 100644 --- a/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/schema.py +++ b/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/schema.py @@ -155,7 +155,7 @@ def check_removal_version(v, version_field, collection_name_field, error_code='i parsed_version.parse(version) except ValueError as exc: raise _add_ansible_error_code( - Invalid('%s (%r) is not a valid ansible-base version: %s' % (version_field, version, exc)), + Invalid('%s (%r) is not a valid ansible-core version: %s' % (version_field, version, exc)), error_code=error_code) return v try: @@ -283,7 +283,7 @@ def version_added(v, error_code='version-added-invalid', accept_historical=False version.parse(version_added) except ValueError as exc: raise _add_ansible_error_code( - Invalid('version_added (%r) is not a valid ansible-base version: ' + Invalid('version_added (%r) is not a valid ansible-core version: ' '%s' % (version_added, exc)), error_code=error_code) else: diff --git a/test/lib/ansible_test/_internal/util_common.py b/test/lib/ansible_test/_internal/util_common.py index 0f3ae62767..a5923bc0e9 100644 --- a/test/lib/ansible_test/_internal/util_common.py +++ b/test/lib/ansible_test/_internal/util_common.py @@ -153,7 +153,7 @@ def get_parameterized_completion(cache, name): if data_context().content.collection: context = 'collection' else: - context = 'ansible-base' + context = 'ansible-core' images = read_lines_without_comments(os.path.join(ANSIBLE_TEST_DATA_ROOT, 'completion', '%s.txt' % name), remove_blank_lines=True) -- cgit v1.2.3