ansible-core 2.16.5rc1__py3-none-any.whl → 2.17.0b1__py3-none-any.whl

ansible_test/__init__.py

@@ -1,2 +1 @@
-# Empty __init__.py to allow importing of `ansible_test._util.target.common` under Python 2.x.
-# This allows the ansible-test entry point to report supported Python versions before exiting.
+# Empty __init__.py to allow relative imports to work under mypy.

ansible_test/_data/completion/docker.txt

@@ -1,9 +1,7 @@
-base image=quay.io/ansible/base-test-container:5.10.0 python=3.12,2.7,3.6,3.7,3.8,3.9,3.10,3.11
-default image=quay.io/ansible/default-test-container:8.12.0 python=3.12,2.7,3.6,3.7,3.8,3.9,3.10,3.11 context=collection
-default image=quay.io/ansible/ansible-core-test-container:8.12.0 python=3.12,2.7,3.6,3.7,3.8,3.9,3.10,3.11 context=ansible-core
-alpine3 image=quay.io/ansible/alpine3-test-container:6.3.0 python=3.11 cgroup=none audit=none
-centos7 image=quay.io/ansible/centos7-test-container:6.3.0 python=2.7 cgroup=v1-only
-fedora38 image=quay.io/ansible/fedora38-test-container:6.3.0 python=3.11
-opensuse15 image=quay.io/ansible/opensuse15-test-container:6.3.0 python=3.6
-ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:6.3.0 python=3.8
-ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:6.3.0 python=3.10
+base image=quay.io/ansible/base-test-container:6.2.0 python=3.12,3.7,3.8,3.9,3.10,3.11
+default image=quay.io/ansible/default-test-container:9.6.0 python=3.12,3.7,3.8,3.9,3.10,3.11 context=collection
+default image=quay.io/ansible/ansible-core-test-container:9.6.0 python=3.12,3.7,3.8,3.9,3.10,3.11 context=ansible-core
+alpine319 image=quay.io/ansible/alpine319-test-container:7.1.0 python=3.11 cgroup=none audit=none
+fedora39 image=quay.io/ansible/fedora39-test-container:7.1.0 python=3.12
+ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:7.1.0 python=3.8
+ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:7.1.0 python=3.10

ansible_test/_data/completion/remote.txt

@@ -1,14 +1,13 @@
-alpine/3.18 python=3.11 become=doas_sudo provider=aws arch=x86_64
+alpine/3.19 python=3.11 become=doas_sudo provider=aws arch=x86_64
 alpine become=doas_sudo provider=aws arch=x86_64
-fedora/38 python=3.11 become=sudo provider=aws arch=x86_64
+fedora/39 python=3.12 become=sudo provider=aws arch=x86_64
 fedora become=sudo provider=aws arch=x86_64
-freebsd/13.2 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
+freebsd/13.3 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
+freebsd/14.0 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
 freebsd python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
-macos/13.2 python=3.11 python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
+macos/14.3 python=3.11 python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
 macos python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
-rhel/7.9 python=2.7 become=sudo provider=aws arch=x86_64
-rhel/8.8 python=3.6,3.11 become=sudo provider=aws arch=x86_64
-rhel/9.2 python=3.9,3.11 become=sudo provider=aws arch=x86_64
+rhel/9.3 python=3.9,3.11 become=sudo provider=aws arch=x86_64
 rhel become=sudo provider=aws arch=x86_64
 ubuntu/22.04 python=3.10 become=sudo provider=aws arch=x86_64
 ubuntu become=sudo provider=aws arch=x86_64

ansible_test/_data/requirements/ansible-test.txt

@@ -1,5 +1,3 @@
 # The test-constraints sanity test verifies this file, but changes must be made manually to keep it in up-to-date.
-virtualenv == 16.7.12 ; python_version < '3'
 coverage == 7.3.2 ; python_version >= '3.8' and python_version <= '3.12'
 coverage == 6.5.0 ; python_version >= '3.7' and python_version <= '3.7'
-coverage == 4.5.4 ; python_version >= '2.6' and python_version <= '3.6'

ansible_test/_data/requirements/constraints.txt

@@ -1,15 +1,10 @@
 # do not add a cryptography or pyopenssl constraint to this file, they require special handling, see get_cryptography_requirements in python_requirements.py
 # do not add a coverage constraint to this file, it is handled internally by ansible-test
-packaging < 21.0 ; python_version < '3.6' # packaging 21.0 requires Python 3.6 or newer
 pywinrm >= 0.3.0 ; python_version < '3.11' # message encryption support
 pywinrm >= 0.4.3 ; python_version >= '3.11' # support for Python 3.11
-pytest < 5.0.0, >= 4.5.0 ; python_version == '2.7' # pytest 5.0.0 and later will no longer support python 2.7
-pytest >= 4.5.0 ; python_version > '2.7' # pytest 4.5.0 added support for --strict-markers
+pytest >= 4.5.0  # pytest 4.5.0 added support for --strict-markers
 ntlm-auth >= 1.3.0 # message encryption support using cryptography
 requests-ntlm >= 1.1.0 # message encryption support
 requests-credssp >= 0.1.0 # message encryption support
-pyparsing < 3.0.0 ; python_version < '3.5' # pyparsing 3 and later require python 3.5 or later
 mock >= 2.0.0 # needed for features backported from Python 3.6 unittest.mock (assert_called, assert_called_once...)
 pytest-mock >= 1.4.0 # needed for mock_use_standalone_module pytest option
-setuptools < 45 ; python_version == '2.7' # setuptools 45 and later require python 3.5 or later
-wheel < 0.38.0 ; python_version < '3.7' # wheel 0.38.0 and later require python 3.7 or later

ansible_test/_data/requirements/sanity.ansible-doc.txt

@@ -1,5 +1,5 @@
 # edit "sanity.ansible-doc.in" and generate with: hacking/update-sanity-requirements.py --test ansible-doc
-Jinja2==3.1.2
-MarkupSafe==2.1.3
-packaging==23.2
+Jinja2==3.1.3
+MarkupSafe==2.1.5
+packaging==24.0
 PyYAML==6.0.1

ansible_test/_data/requirements/sanity.changelog.txt

@@ -1,9 +1,9 @@
 # edit "sanity.changelog.in" and generate with: hacking/update-sanity-requirements.py --test changelog
-antsibull-changelog==0.23.0
+antsibull-changelog==0.26.0
 docutils==0.18.1
-packaging==23.2
+packaging==24.0
 PyYAML==6.0.1
 rstcheck==5.0.0
 semantic-version==2.10.0
 types-docutils==0.18.3
-typing_extensions==4.8.0
+typing_extensions==4.10.0

ansible_test/_data/requirements/sanity.import.plugin.txt

@@ -1,4 +1,4 @@
 # edit "sanity.import.plugin.in" and generate with: hacking/update-sanity-requirements.py --test import.plugin
-Jinja2==3.1.2
-MarkupSafe==2.1.3
+Jinja2==3.1.3
+MarkupSafe==2.1.5
 PyYAML==6.0.1

ansible_test/_data/requirements/sanity.mypy.txt

@@ -1,18 +1,18 @@
 # edit "sanity.mypy.in" and generate with: hacking/update-sanity-requirements.py --test mypy
 cffi==1.16.0
-cryptography==41.0.4
-Jinja2==3.1.2
-MarkupSafe==2.1.3
-mypy==1.5.1
+cryptography==42.0.5
+Jinja2==3.1.3
+MarkupSafe==2.1.5
+mypy==1.9.0
 mypy-extensions==1.0.0
-packaging==23.2
+packaging==24.0
 pycparser==2.21
 tomli==2.0.1
 types-backports==0.1.3
-types-paramiko==3.3.0.0
-types-PyYAML==6.0.12.12
-types-requests==2.31.0.7
-types-setuptools==68.2.0.0
-types-toml==0.10.8.7
-typing_extensions==4.8.0
-urllib3==2.0.6
+types-paramiko==3.4.0.20240311
+types-PyYAML==6.0.12.20240311
+types-requests==2.31.0.20240311
+types-setuptools==69.2.0.20240317
+types-toml==0.10.8.20240310
+typing_extensions==4.10.0
+urllib3==2.2.1

ansible_test/_data/requirements/sanity.pep8.txt

@@ -1,2 +1,2 @@
 # edit "sanity.pep8.in" and generate with: hacking/update-sanity-requirements.py --test pep8
-pycodestyle==2.11.0
+pycodestyle==2.11.1

ansible_test/_data/requirements/sanity.pylint.txt

@@ -1,11 +1,11 @@
 # edit "sanity.pylint.in" and generate with: hacking/update-sanity-requirements.py --test pylint
-astroid==3.0.0
-dill==0.3.7
-isort==5.12.0
+astroid==3.1.0
+dill==0.3.8
+isort==5.13.2
 mccabe==0.7.0
-platformdirs==3.11.0
-pylint==3.0.1
+platformdirs==4.2.0
+pylint==3.1.0
 PyYAML==6.0.1
 tomli==2.0.1
-tomlkit==0.12.1
-typing_extensions==4.8.0
+tomlkit==0.12.4
+typing_extensions==4.10.0

ansible_test/_data/requirements/sanity.runtime-metadata.txt

@@ -1,3 +1,3 @@
 # edit "sanity.runtime-metadata.in" and generate with: hacking/update-sanity-requirements.py --test runtime-metadata
 PyYAML==6.0.1
-voluptuous==0.13.1
+voluptuous==0.14.2

ansible_test/_data/requirements/sanity.validate-modules.txt

@@ -1,6 +1,6 @@
 # edit "sanity.validate-modules.in" and generate with: hacking/update-sanity-requirements.py --test validate-modules
 antsibull-docs-parser==1.0.0
-Jinja2==3.1.2
-MarkupSafe==2.1.3
+Jinja2==3.1.3
+MarkupSafe==2.1.5
 PyYAML==6.0.1
-voluptuous==0.13.1
+voluptuous==0.14.2

ansible_test/_data/requirements/sanity.yamllint.txt

@@ -1,4 +1,4 @@
 # edit "sanity.yamllint.in" and generate with: hacking/update-sanity-requirements.py --test yamllint
-pathspec==0.11.2
+pathspec==0.12.1
 PyYAML==6.0.1
-yamllint==1.32.0
+yamllint==1.35.1

ansible_test/_internal/bootstrap.py

@@ -28,7 +28,7 @@ class Bootstrap:
     """Base class for bootstrapping systems."""
 
     controller: bool
-    python_versions: list[str]
+    python_interpreters: dict[str, str]
     ssh_key: SshKey
 
     @property
@@ -41,7 +41,7 @@ class Bootstrap:
         return dict(
             bootstrap_type=self.bootstrap_type,
             controller='yes' if self.controller else '',
-            python_versions=self.python_versions,
+            python_interpreters=[f'{key}:{value}' for key, value in self.python_interpreters.items()],
             ssh_key_type=self.ssh_key.KEY_TYPE,
             ssh_private_key=self.ssh_key.key_contents,
             ssh_public_key=self.ssh_key.pub_contents,

ansible_test/_internal/classification/__init__.py

@@ -674,11 +674,6 @@ class PathMapper:
 
         # Early classification that needs to occur before common classification belongs here.
 
-        if path.startswith('test/units/compat/'):
-            return {
-                'units': 'test/units/',
-            }
-
         if dirname == '.azure-pipelines/commands':
             test_map = {
                 'cloud.sh': 'integration:cloud/',

ansible_test/_internal/commands/integration/cloud/cs.py

@@ -38,7 +38,7 @@ class CsCloudProvider(CloudProvider):
     def __init__(self, args: IntegrationConfig) -> None:
         super().__init__(args)
 
-        self.image = os.environ.get('ANSIBLE_CLOUDSTACK_CONTAINER', 'quay.io/ansible/cloudstack-test-container:1.6.1')
+        self.image = os.environ.get('ANSIBLE_CLOUDSTACK_CONTAINER', 'quay.io/ansible/cloudstack-test-container:1.7.0')
         self.host = ''
         self.port = 0
 

ansible_test/_internal/commands/integration/cloud/nios.py

@@ -28,7 +28,7 @@ class NiosProvider(CloudProvider):
     #
     # It's source source itself resides at:
     # https://github.com/ansible/nios-test-container
-    DOCKER_IMAGE = 'quay.io/ansible/nios-test-container:2.0.0'
+    DOCKER_IMAGE = 'quay.io/ansible/nios-test-container:3.0.0'
 
     def __init__(self, args: IntegrationConfig) -> None:
         super().__init__(args)

ansible_test/_internal/commands/sanity/__init__.py

@@ -764,11 +764,6 @@ class SanityTest(metaclass=abc.ABCMeta):
         """True if the test targets should include symlinks."""
         return False
 
-    @property
-    def py2_compat(self) -> bool:
-        """True if the test only applies to code that runs on Python 2.x."""
-        return False
-
     @property
     def supported_python_versions(self) -> t.Optional[tuple[str, ...]]:
         """A tuple of supported Python versions or None if the test does not depend on specific Python versions."""
@@ -786,23 +781,11 @@ class SanityTest(metaclass=abc.ABCMeta):
 
     def filter_targets_by_version(self, args: SanityConfig, targets: list[TestTarget], python_version: str) -> list[TestTarget]:
         """Return the given list of test targets, filtered to include only those relevant for the test, taking into account the Python version."""
+        del args  # args is not used here, but derived classes may make use of it
         del python_version  # python_version is not used here, but derived classes may make use of it
 
         targets = self.filter_targets(targets)
 
-        if self.py2_compat:
-            # This sanity test is a Python 2.x compatibility test.
-            content_config = get_content_config(args)
-
-            if content_config.py2_support:
-                # This collection supports Python 2.x.
-                # Filter targets to include only those that require support for remote-only Python versions.
-                targets = self.filter_remote_targets(targets)
-            else:
-                # This collection does not support Python 2.x.
-                # There are no targets to test.
-                targets = []
-
         return targets
 
     @staticmethod
@@ -878,7 +861,6 @@ class SanityCodeSmellTest(SanitySingleVersion):
             self.__no_targets: bool = self.config.get('no_targets')
             self.__include_directories: bool = self.config.get('include_directories')
             self.__include_symlinks: bool = self.config.get('include_symlinks')
-            self.__py2_compat: bool = self.config.get('py2_compat', False)
             self.__error_code: str | None = self.config.get('error_code', None)
         else:
             self.output = None
@@ -894,7 +876,6 @@ class SanityCodeSmellTest(SanitySingleVersion):
             self.__no_targets = True
             self.__include_directories = False
             self.__include_symlinks = False
-            self.__py2_compat = False
             self.__error_code = None
 
         if self.no_targets:
@@ -939,11 +920,6 @@ class SanityCodeSmellTest(SanitySingleVersion):
         """True if the test targets should include symlinks."""
         return self.__include_symlinks
 
-    @property
-    def py2_compat(self) -> bool:
-        """True if the test only applies to code that runs on Python 2.x."""
-        return self.__py2_compat
-
     @property
     def supported_python_versions(self) -> t.Optional[tuple[str, ...]]:
         """A tuple of supported Python versions or None if the test does not depend on specific Python versions."""
@@ -1141,10 +1117,8 @@ def create_sanity_virtualenv(
     commands = collect_requirements(  # create_sanity_virtualenv()
         python=python,
         controller=True,
-        virtualenv=False,
         command=None,
         ansible=False,
-        cryptography=False,
         coverage=coverage,
         minimize=minimize,
         sanity=name,

ansible_test/_internal/commands/sanity/ansible_doc.py

@@ -79,7 +79,7 @@ class AnsibleDocTest(SanitySingleVersion):
                 plugin_parts = os.path.relpath(plugin_file_path, plugin_path).split(os.path.sep)
                 plugin_name = os.path.splitext(plugin_parts[-1])[0]
 
-                if plugin_name.startswith('_'):
+                if plugin_name.startswith('_') and not data_context().content.collection:
                     plugin_name = plugin_name[1:]
 
                 plugin_fqcn = data_context().content.prefix + '.'.join(plugin_parts[:-1] + [plugin_name])

ansible_test/_internal/commands/sanity/import.py

@@ -47,11 +47,6 @@ from ...ansible_util import (
     ansible_environment,
 )
 
-from ...python_requirements import (
-    PipUnavailableError,
-    install_requirements,
-)
-
 from ...config import (
     SanityConfig,
 )
@@ -68,10 +63,6 @@ from ...host_configs import (
     PythonConfig,
 )
 
-from ...venv import (
-    get_virtualenv_version,
-)
-
 
 def _get_module_test(module_restrictions: bool) -> c.Callable[[str], bool]:
     """Create a predicate which tests whether a path can be used by modules or not."""
@@ -109,15 +100,6 @@ class ImportTest(SanityMultipleVersion):
 
         paths = [target.path for target in targets.include]
 
-        if python.version.startswith('2.') and (get_virtualenv_version(args, python.path) or (0,)) < (13,):
-            # hack to make sure that virtualenv is available under Python 2.x
-            # on Python 3.x we can use the built-in venv
-            # version 13+ is required to use the `--no-wheel` option
-            try:
-                install_requirements(args, python, virtualenv=True, controller=False)  # sanity (import)
-            except PipUnavailableError as ex:
-                display.warning(str(ex))
-
         temp_root = os.path.join(ResultType.TMP.path, 'sanity', 'import')
 
         messages = []

ansible_test/_internal/commands/sanity/mypy.py

@@ -66,7 +66,6 @@ class MypyTest(SanityMultipleVersion):
     vendored_paths = (
         'lib/ansible/module_utils/six/__init__.py',
         'lib/ansible/module_utils/distro/_distro.py',
-        'lib/ansible/module_utils/compat/_selectors2.py',
     )
 
     def filter_targets(self, targets: list[TestTarget]) -> list[TestTarget]:
@@ -76,15 +75,6 @@ class MypyTest(SanityMultipleVersion):
                 or target.path.startswith('packaging/')
                 or target.path.startswith('test/lib/ansible_test/_util/target/sanity/import/'))]
 
-    @property
-    def supported_python_versions(self) -> t.Optional[tuple[str, ...]]:
-        """A tuple of supported Python versions or None if the test does not depend on specific Python versions."""
-        # mypy 0.981 dropped support for Python 2
-        # see: https://mypy-lang.blogspot.com/2022/09/mypy-0981-released.html
-        # cryptography dropped support for Python 3.5 in version 3.3
-        # see: https://cryptography.io/en/latest/changelog/#v3-3
-        return tuple(version for version in SUPPORTED_PYTHON_VERSIONS if str_to_version(version) >= (3, 6))
-
     @property
     def error_code(self) -> t.Optional[str]:
         """Error code for ansible-test matching the format used by the underlying test program, or None if the program does not use error codes."""
@@ -95,6 +85,13 @@ class MypyTest(SanityMultipleVersion):
         """True if the test requires PyPI, otherwise False."""
         return True
 
+    @property
+    def supported_python_versions(self) -> t.Optional[tuple[str, ...]]:
+        """A tuple of supported Python versions or None if the test does not depend on specific Python versions."""
+        # Because the version of typeshed mypy use in 1.9 doesn't support 3.7, neither does mypy 1.9.
+        # see: https://mypy-lang.blogspot.com/2024/03/mypy-19-released.html
+        return tuple(version for version in SUPPORTED_PYTHON_VERSIONS if str_to_version(version) >= (3, 8))
+
     def test(self, args: SanityConfig, targets: SanityTargets, python: PythonConfig) -> TestResult:
         settings = self.load_processor(args, python.version)
 

ansible_test/_internal/commands/units/__init__.py

@@ -245,7 +245,7 @@ def command_units(args: UnitsConfig) -> None:
         #
         # NOTE: This only affects use of pytest-mock.
         #       Collection unit tests may directly import mock, which will be provided by ansible-test when it installs requirements using pip.
-        #       Although mock is available for ansible-core unit tests, they should import units.compat.mock instead.
+        #       Although mock is available for ansible-core unit tests, they should import unittest.mock instead.
         if str_to_version(python.version) < (3, 8):
             config_name = 'legacy.ini'
         else:

ansible_test/_internal/config.py

@@ -65,7 +65,6 @@ class ContentConfig:
 
     modules: ModulesConfig
     python_versions: tuple[str, ...]
-    py2_support: bool
 
 
 class EnvironmentConfig(CommonConfig):

ansible_test/_internal/content_config.py

@@ -29,7 +29,6 @@ from .io import (
 from .util import (
     ApplicationError,
     display,
-    str_to_version,
 )
 
 from .data import (
@@ -75,13 +74,9 @@ def parse_content_config(data: t.Any) -> ContentConfig:
     python_versions = tuple(version for version in SUPPORTED_PYTHON_VERSIONS
                             if version in CONTROLLER_PYTHON_VERSIONS or version in modules.python_versions)
 
-    # True if Python 2.x is supported.
-    py2_support = any(version for version in python_versions if str_to_version(version)[0] == 2)
-
     return ContentConfig(
         modules=modules,
         python_versions=python_versions,
-        py2_support=py2_support,
     )
 
 

ansible_test/_internal/coverage_util.py

@@ -71,7 +71,6 @@ COVERAGE_VERSIONS = (
     # IMPORTANT: Keep this in sync with the ansible-test.txt requirements file.
     CoverageVersion('7.3.2', 7, (3, 8), (3, 12)),
     CoverageVersion('6.5.0', 7, (3, 7), (3, 7)),
-    CoverageVersion('4.5.4', 0, (2, 6), (3, 6)),
 )
 """
 This tuple specifies the coverage version to use for Python version ranges.

ansible_test/_internal/docker_util.py

@@ -496,7 +496,7 @@ def get_docker_hostname() -> str:
     """Return the hostname of the Docker service."""
     docker_host = os.environ.get('DOCKER_HOST')
 
-    if docker_host and docker_host.startswith('tcp://'):
+    if docker_host and docker_host.startswith(('tcp://', 'ssh://')):
         try:
             hostname = urllib.parse.urlparse(docker_host)[1].split(':')[0]
             display.info('Detected Docker host: %s' % hostname, verbosity=1)

ansible_test/_internal/host_profiles.py

@@ -958,7 +958,7 @@ class DockerProfile(ControllerHostProfile[DockerConfig], SshTargetHostProfile[Do
         """Perform out-of-band setup before delegation."""
         bootstrapper = BootstrapDocker(
             controller=self.controller,
-            python_versions=[self.python.version],
+            python_interpreters={self.python.version: self.python.path},
             ssh_key=SshKey(self.args),
         )
 
@@ -1214,8 +1214,9 @@ class PosixRemoteProfile(ControllerHostProfile[PosixRemoteConfig], RemoteProfile
     def configure(self) -> None:
         """Perform in-band configuration. Executed before delegation for the controller and after delegation for targets."""
         # a target uses a single python version, but a controller may include additional versions for targets running on the controller
-        python_versions = [self.python.version] + [target.python.version for target in self.targets if isinstance(target, ControllerConfig)]
-        python_versions = sorted_versions(list(set(python_versions)))
+        python_interpreters = {self.python.version: self.python.path}
+        python_interpreters.update({target.python.version: target.python.path for target in self.targets if isinstance(target, ControllerConfig)})
+        python_interpreters = {version: python_interpreters[version] for version in sorted_versions(list(python_interpreters.keys()))}
 
         core_ci = self.wait_for_instance()
         pwd = self.wait_until_ready()
@@ -1226,7 +1227,7 @@ class PosixRemoteProfile(ControllerHostProfile[PosixRemoteConfig], RemoteProfile
             controller=self.controller,
             platform=self.config.platform,
             platform_version=self.config.version,
-            python_versions=python_versions,
+            python_interpreters=python_interpreters,
             ssh_key=core_ci.ssh_key,
         )