ansible-core 2.16.7__py3-none-any.whl → 2.17.0__py3-none-any.whl

ansible_test/_internal/python_requirements.py

@@ -5,7 +5,6 @@ import base64
 import dataclasses
 import json
 import os
-import re
 import typing as t
 
 from .encoding import (
@@ -20,14 +19,9 @@ from .io import (
 from .util import (
     ANSIBLE_TEST_DATA_ROOT,
     ANSIBLE_TEST_TARGET_ROOT,
-    ANSIBLE_TEST_TOOLS_ROOT,
     ApplicationError,
     SubprocessError,
     display,
-    find_executable,
-    raw_command,
-    str_to_version,
-    version_to_str,
 )
 
 from .util_common import (
@@ -63,9 +57,6 @@ from .coverage_util import (
 QUIET_PIP_SCRIPT_PATH = os.path.join(ANSIBLE_TEST_TARGET_ROOT, 'setup', 'quiet_pip.py')
 REQUIREMENTS_SCRIPT_PATH = os.path.join(ANSIBLE_TEST_TARGET_ROOT, 'setup', 'requirements.py')
 
-# IMPORTANT: Keep this in sync with the ansible-test.txt requirements file.
-VIRTUALENV_VERSION = '16.7.12'
-
 # Pip Abstraction
 
 
@@ -132,7 +123,6 @@ def install_requirements(
     ansible: bool = False,
     command: bool = False,
     coverage: bool = False,
-    virtualenv: bool = False,
     controller: bool = True,
     connection: t.Optional[Connection] = None,
 ) -> None:
@@ -145,8 +135,6 @@ def install_requirements(
     if command and isinstance(args, (UnitsConfig, IntegrationConfig)) and args.coverage:
         coverage = True
 
-    cryptography = False
-
     if ansible:
         try:
             ansible_cache = install_requirements.ansible_cache  # type: ignore[attr-defined]
@@ -160,19 +148,12 @@ def install_requirements(
         else:
             ansible_cache[python.path] = True
 
-            # Install the latest cryptography version that the current requirements can support if it is not already available.
-            # This avoids downgrading cryptography when OS packages provide a newer version than we are able to install using pip.
-            # If not installed here, later install commands may try to install a version of cryptography which cannot be installed.
-            cryptography = not is_cryptography_available(python.path)
-
     commands = collect_requirements(
         python=python,
         controller=controller,
         ansible=ansible,
-        cryptography=cryptography,
         command=args.command if command else None,
         coverage=coverage,
-        virtualenv=virtualenv,
         minimize=False,
         sanity=None,
     )
@@ -205,9 +186,7 @@ def collect_requirements(
     python: PythonConfig,
     controller: bool,
     ansible: bool,
-    cryptography: bool,
     coverage: bool,
-    virtualenv: bool,
     minimize: bool,
     command: t.Optional[str],
     sanity: t.Optional[str],
@@ -215,17 +194,9 @@ def collect_requirements(
     """Collect requirements for the given Python using the specified arguments."""
     commands: list[PipCommand] = []
 
-    if virtualenv:
-        # sanity tests on Python 2.x install virtualenv when it is too old or is not already installed and the `--requirements` option is given
-        # the last version of virtualenv with no dependencies is used to minimize the changes made outside a virtual environment
-        commands.extend(collect_package_install(packages=[f'virtualenv=={VIRTUALENV_VERSION}'], constraints=False))
-
     if coverage:
         commands.extend(collect_package_install(packages=[f'coverage=={get_coverage_version(python.version).coverage_version}'], constraints=False))
 
-    if cryptography:
-        commands.extend(collect_package_install(packages=get_cryptography_requirements(python)))
-
     if ansible or command:
         commands.extend(collect_general_install(command, ansible))
 
@@ -446,17 +417,7 @@ def get_venv_packages(python: PythonConfig) -> dict[str, str]:
         wheel='0.37.1',
     )
 
-    override_packages = {
-        '2.7': dict(
-            pip='20.3.4',  # 21.0 requires Python 3.6+
-            setuptools='44.1.1',  # 45.0.0 requires Python 3.5+
-            wheel=None,
-        ),
-        '3.6': dict(
-            pip='21.3.1',  # 22.0 requires Python 3.7+
-            setuptools='59.6.0',  # 59.7.0 requires Python 3.7+
-            wheel=None,
-        ),
+    override_packages: dict[str, dict[str, str]] = {
     }
 
     packages = {name: version or default_packages[name] for name, version in override_packages.get(python.version, default_packages).items()}
@@ -510,82 +471,3 @@ def prepare_pip_script(commands: list[PipCommand]) -> str:
 def usable_pip_file(path: t.Optional[str]) -> bool:
     """Return True if the specified pip file is usable, otherwise False."""
     return bool(path) and os.path.exists(path) and bool(os.path.getsize(path))
-
-
-# Cryptography
-
-
-def is_cryptography_available(python: str) -> bool:
-    """Return True if cryptography is available for the given python."""
-    try:
-        raw_command([python, '-c', 'import cryptography'], capture=True)
-    except SubprocessError:
-        return False
-
-    return True
-
-
-def get_cryptography_requirements(python: PythonConfig) -> list[str]:
-    """
-    Return the correct cryptography and pyopenssl requirements for the given python version.
-    The version of cryptography installed depends on the python version and openssl version.
-    """
-    openssl_version = get_openssl_version(python)
-
-    if openssl_version and openssl_version < (1, 1, 0):
-        # cryptography 3.2 requires openssl 1.1.x or later
-        # see https://cryptography.io/en/latest/changelog.html#v3-2
-        cryptography = 'cryptography < 3.2'
-        # pyopenssl 20.0.0 requires cryptography 3.2 or later
-        pyopenssl = 'pyopenssl < 20.0.0'
-    else:
-        # cryptography 3.4+ builds require a working rust toolchain
-        # systems bootstrapped using ansible-core-ci can access additional wheels through the spare-tire package index
-        cryptography = 'cryptography'
-        # any future installation of pyopenssl is free to use any compatible version of cryptography
-        pyopenssl = ''
-
-    requirements = [
-        cryptography,
-        pyopenssl,
-    ]
-
-    requirements = [requirement for requirement in requirements if requirement]
-
-    return requirements
-
-
-def get_openssl_version(python: PythonConfig) -> t.Optional[tuple[int, ...]]:
-    """Return the openssl version."""
-    if not python.version.startswith('2.'):
-        # OpenSSL version checking only works on Python 3.x.
-        # This should be the most accurate, since it is the Python we will be using.
-        version = json.loads(raw_command([python.path, os.path.join(ANSIBLE_TEST_TOOLS_ROOT, 'sslcheck.py')], capture=True)[0])['version']
-
-        if version:
-            display.info(f'Detected OpenSSL version {version_to_str(version)} under Python {python.version}.', verbosity=1)
-
-            return tuple(version)
-
-    # Fall back to detecting the OpenSSL version from the CLI.
-    # This should provide an adequate solution on Python 2.x.
-    openssl_path = find_executable('openssl', required=False)
-
-    if openssl_path:
-        try:
-            result = raw_command([openssl_path, 'version'], capture=True)[0]
-        except SubprocessError:
-            result = ''
-
-        match = re.search(r'^OpenSSL (?P<version>[0-9]+\.[0-9]+\.[0-9]+)', result)
-
-        if match:
-            version = str_to_version(match.group('version'))
-
-            display.info(f'Detected OpenSSL version {version_to_str(version)} using the openssl CLI.', verbosity=1)
-
-            return version
-
-    display.info('Unable to detect OpenSSL version.', verbosity=1)
-
-    return None

ansible_test/_internal/ssh.py

@@ -245,6 +245,7 @@ def create_ssh_port_forwards(
     """
     options: dict[str, t.Union[str, int]] = dict(
         LogLevel='INFO',  # info level required to get messages on stderr indicating the ports assigned to each forward
+        ControlPath='none',  # if the user has ControlPath set up for every host, it will prevent creation of forwards
     )
 
     cli_args = []

ansible_test/_internal/util.py

@@ -998,7 +998,7 @@ def retry(func: t.Callable[..., TValue], ex_type: t.Type[BaseException] = Subpro
 def parse_to_list_of_dict(pattern: str, value: str) -> list[dict[str, str]]:
     """Parse lines from the given value using the specified pattern and return the extracted list of key/value pair dictionaries."""
     matched = []
-    unmatched = []
+    unmatched: list[str] = []
 
     for line in value.splitlines():
         match = re.search(pattern, line)

ansible_test/_internal/util_common.py

@@ -409,7 +409,7 @@ def create_interpreter_wrapper(interpreter: str, injected_interpreter: str) -> N
     code = textwrap.dedent('''
     #!%s
 
-    from __future__ import absolute_import
+    from __future__ import annotations
 
     from os import execv
     from sys import argv

ansible_test/_internal/venv.py

@@ -15,7 +15,6 @@ from .config import (
 from .util import (
     find_python,
     SubprocessError,
-    get_available_python_versions,
     ANSIBLE_TEST_TARGET_TOOLS_ROOT,
     display,
     remove_tree,
@@ -85,49 +84,21 @@ def create_virtual_environment(
     system_site_packages: bool = False,
     pip: bool = False,
 ) -> bool:
-    """Create a virtual environment using venv or virtualenv for the requested Python version."""
+    """Create a virtual environment using venv for the requested Python version."""
     if not os.path.exists(python.path):
         # the requested python version could not be found
         return False
 
-    if str_to_version(python.version) >= (3, 0):
-        # use the built-in 'venv' module on Python 3.x
-        # creating a virtual environment using 'venv' when running in a virtual environment created by 'virtualenv' results
-        # in a copy of the original virtual environment instead of creation of a new one
-        # avoid this issue by only using "real" python interpreters to invoke 'venv'
-        for real_python in iterate_real_pythons(python.version):
-            if run_venv(args, real_python, system_site_packages, pip, path):
-                display.info('Created Python %s virtual environment using "venv": %s' % (python.version, path), verbosity=1)
-                return True
-
-        # something went wrong, most likely the package maintainer for the Python installation removed ensurepip
-        # which will prevent creation of a virtual environment without installation of other OS packages
-
-    # use the installed 'virtualenv' module on the Python requested version
-    if run_virtualenv(args, python.path, python.path, system_site_packages, pip, path):
-        display.info('Created Python %s virtual environment using "virtualenv": %s' % (python.version, path), verbosity=1)
-        return True
-
-    available_pythons = get_available_python_versions()
-
-    for available_python_version, available_python_interpreter in sorted(available_pythons.items()):
-        if available_python_interpreter == python.path:
-            # already attempted to use this interpreter
-            continue
-
-        virtualenv_version = get_virtualenv_version(args, available_python_interpreter)
-
-        if not virtualenv_version:
-            # virtualenv not available for this Python or we were unable to detect the version
-            continue
-
-        # try using 'virtualenv' from another Python to setup the desired version
-        if run_virtualenv(args, available_python_interpreter, python.path, system_site_packages, pip, path):
-            display.info('Created Python %s virtual environment using "virtualenv" on Python %s: %s' % (python.version, available_python_version, path),
-                         verbosity=1)
+    # creating a virtual environment using 'venv' when running in a virtual environment created by 'virtualenv' results
+    # in a copy of the original virtual environment instead of creation of a new one
+    # avoid this issue by only using "real" python interpreters to invoke 'venv'
+    for real_python in iterate_real_pythons(python.version):
+        if run_venv(args, real_python, system_site_packages, pip, path):
+            display.info('Created Python %s virtual environment using "venv": %s' % (python.version, path), verbosity=1)
             return True
 
-    # no suitable 'virtualenv' available
+    # something went wrong, most likely the package maintainer for the Python installation removed ensurepip
+    # which will prevent creation of a virtual environment without installation of other OS packages
     return False
 
 
@@ -188,7 +159,7 @@ def run_venv(
     pip: bool,
     path: str,
 ) -> bool:
-    """Create a virtual environment using the 'venv' module. Not available on Python 2.x."""
+    """Create a virtual environment using the 'venv' module."""
     cmd = [run_python, '-m', 'venv']
 
     if system_site_packages:
@@ -210,72 +181,3 @@ def run_venv(
         return False
 
     return True
-
-
-def run_virtualenv(
-    args: EnvironmentConfig,
-    run_python: str,
-    env_python: str,
-    system_site_packages: bool,
-    pip: bool,
-    path: str,
-) -> bool:
-    """Create a virtual environment using the 'virtualenv' module."""
-    # always specify which interpreter to use to guarantee the desired interpreter is provided
-    # otherwise virtualenv may select a different interpreter than the one running virtualenv
-    cmd = [run_python, '-m', 'virtualenv', '--python', env_python]
-
-    if system_site_packages:
-        cmd.append('--system-site-packages')
-
-    if not pip:
-        cmd.append('--no-pip')
-        # these options provide consistency with venv, which does not install them without pip
-        cmd.append('--no-setuptools')
-        cmd.append('--no-wheel')
-
-    cmd.append(path)
-
-    try:
-        run_command(args, cmd, capture=True)
-    except SubprocessError as ex:
-        remove_tree(path)
-
-        if args.verbosity > 1:
-            display.error(ex.message)
-
-        return False
-
-    return True
-
-
-def get_virtualenv_version(args: EnvironmentConfig, python: str) -> t.Optional[tuple[int, ...]]:
-    """Get the virtualenv version for the given python interpreter, if available, otherwise return None."""
-    try:
-        cache = get_virtualenv_version.cache  # type: ignore[attr-defined]
-    except AttributeError:
-        cache = get_virtualenv_version.cache = {}  # type: ignore[attr-defined]
-
-    if python not in cache:
-        try:
-            stdout = run_command(args, [python, '-m', 'virtualenv', '--version'], capture=True)[0]
-        except SubprocessError as ex:
-            stdout = ''
-
-            if args.verbosity > 1:
-                display.error(ex.message)
-
-        version = None
-
-        if stdout:
-            # noinspection PyBroadException
-            try:
-                version = str_to_version(stdout.strip())
-            except Exception:  # pylint: disable=broad-except
-                pass
-
-        cache[python] = version
-
-    version = cache[python]
-
-    return version

ansible_test/_util/__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 keep pylint happy.

ansible_test/_util/controller/sanity/mypy/ansible-core.ini

@@ -46,9 +46,6 @@ ignore_missing_imports = True
 [mypy-lxml.*]
 ignore_missing_imports = True
 
-[mypy-yum.*]
-ignore_missing_imports = True
-
 [mypy-rpmUtils.*]
 ignore_missing_imports = True
 
@@ -85,9 +82,6 @@ ignore_missing_imports = True
 [mypy-distro.*]
 ignore_missing_imports = True
 
-[mypy-selectors2.*]
-ignore_missing_imports = True
-
 [mypy-resolvelib.*]
 ignore_missing_imports = True
 

ansible_test/_util/controller/sanity/mypy/modules.ini

@@ -13,9 +13,6 @@ ignore_missing_imports = True
 [mypy-md5.*]
 ignore_missing_imports = True
 
-[mypy-yum.*]
-ignore_missing_imports = True
-
 [mypy-rpmUtils.*]
 ignore_missing_imports = True
 
@@ -52,9 +49,6 @@ ignore_missing_imports = True
 [mypy-distro.*]
 ignore_missing_imports = True
 
-[mypy-selectors2.*]
-ignore_missing_imports = True
-
 [mypy-selinux.*]
 ignore_missing_imports = True
 

ansible_test/_util/controller/sanity/pylint/config/ansible-test-target.cfg

@@ -35,7 +35,6 @@ bad-names=
     tutu,
 
 good-names=
-    __metaclass__,
     C,
     ex,
     i,

ansible_test/_util/controller/sanity/pylint/config/ansible-test.cfg

@@ -34,7 +34,6 @@ bad-names=
     tutu,
 
 good-names=
-    __metaclass__,
     C,
     ex,
     i,

ansible_test/_util/controller/sanity/pylint/config/code-smell.cfg

@@ -33,7 +33,6 @@ bad-names=
     tutu,
 
 good-names=
-    __metaclass__,
     C,
     ex,
     i,

ansible_test/_util/controller/sanity/pylint/config/collection.cfg

@@ -102,7 +102,6 @@ disable=
     undefined-loop-variable,
     unexpected-keyword-arg,
     ungrouped-imports,
-    unidiomatic-typecheck,
     unnecessary-pass,
     unnecessary-dunder-call,
     unsubscriptable-object,

ansible_test/_util/controller/sanity/pylint/config/default.cfg

@@ -95,7 +95,6 @@ disable=
     undefined-loop-variable,
     unexpected-keyword-arg,
     ungrouped-imports,
-    unidiomatic-typecheck,
     unnecessary-pass,
     unsubscriptable-object,
     unsupported-assignment-operation,

ansible_test/_util/controller/sanity/pylint/plugins/deprecated.py

@@ -32,7 +32,6 @@ except ImportError:
 from pylint.checkers import BaseChecker, BaseTokenChecker
 
 from ansible.module_utils.compat.version import LooseVersion
-from ansible.module_utils.six import string_types
 from ansible.release import __version__ as ansible_version_raw
 from ansible.utils.version import SemanticVersion
 
@@ -137,7 +136,7 @@ def _get_func_name(node):
 def parse_isodate(value):
     """Parse an ISO 8601 date string."""
     msg = 'Expected ISO 8601 date string (YYYY-MM-DD)'
-    if not isinstance(value, string_types):
+    if not isinstance(value, str):
         raise ValueError(msg)
     # From Python 3.7 in, there is datetime.date.fromisoformat(). For older versions,
     # we have to do things manually.

ansible_test/_util/controller/sanity/shellcheck/exclude.txt

@@ -1,3 +1,2 @@
 SC1090
 SC1091
-SC2164