ansible-core 2.19.2__py3-none-any.whl → 2.20.0b1__py3-none-any.whl

ansible_test/_data/completion/docker.txt

@@ -1,7 +1,7 @@
-base image=quay.io/ansible/base-test-container:8.2.0 python=3.13,3.8,3.9,3.10,3.11,3.12
-default image=quay.io/ansible/default-test-container:11.6.0 python=3.13,3.8,3.9,3.10,3.11,3.12 context=collection
-default image=quay.io/ansible/ansible-core-test-container:11.6.0 python=3.13,3.8,3.9,3.10,3.11,3.12 context=ansible-core
-alpine321 image=quay.io/ansible/alpine321-test-container:9.1.0 python=3.12 cgroup=none audit=none
-fedora41 image=quay.io/ansible/fedora41-test-container:9.0.0 python=3.13 cgroup=v2-only
-ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:9.0.0 python=3.10
-ubuntu2404 image=quay.io/ansible/ubuntu2404-test-container:9.0.0 python=3.12
+base image=quay.io/ansible/base-test-container:v2.20-0 python=3.13,3.9,3.10,3.11,3.12,3.14
+default image=quay.io/ansible/default-test-container:v2.20-0 python=3.13,3.9,3.10,3.11,3.12,3.14 context=collection
+default image=quay.io/ansible/ansible-core-test-container:v2.20-0 python=3.13,3.9,3.10,3.11,3.12,3.14 context=ansible-core
+alpine322 image=quay.io/ansible/alpine-test-container:3.22-v2.20-0 python=3.12 cgroup=none audit=none
+fedora42 image=quay.io/ansible/fedora-test-container:42-v2.20-0 python=3.13 cgroup=v2-only
+ubuntu2204 image=quay.io/ansible/ubuntu-test-container:22.04-v2.20-0 python=3.10
+ubuntu2404 image=quay.io/ansible/ubuntu-test-container:24.04-v2.20-0 python=3.12

ansible_test/_data/completion/network.txt

@@ -1 +0,0 @@
-ios/csr1000v collection=cisco.ios connection=ansible.netcommon.network_cli provider=aws arch=x86_64

ansible_test/_data/completion/remote.txt

@@ -1,13 +1,13 @@
-alpine/3.21 python=3.12 become=doas_sudo provider=aws arch=x86_64
+alpine/3.22 python=3.12 become=doas_sudo provider=aws arch=x86_64
 alpine become=doas_sudo provider=aws arch=x86_64
-fedora/41 python=3.13 become=sudo provider=aws arch=x86_64
+fedora/42 python=3.13 become=sudo provider=aws arch=x86_64
 fedora become=sudo provider=aws arch=x86_64
 freebsd/13.5 python=3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
-freebsd/14.2 python=3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
+freebsd/14.3 python=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/15.3 python=3.13 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/9.5 python=3.9,3.12 become=sudo provider=aws arch=x86_64
+rhel/9.6 python=3.9,3.12 become=sudo provider=aws arch=x86_64
 rhel/10.0 python=3.12 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

ansible_test/_data/requirements/ansible-test.txt

@@ -1,2 +1,2 @@
 # The test-constraints sanity test verifies this file, but changes must be made manually to keep it in up-to-date.
-coverage == 7.6.1 ; python_version >= '3.8' and python_version <= '3.13'
+coverage == 7.10.6 ; python_version >= '3.9' and python_version <= '3.14'

ansible_test/_data/requirements/sanity.changelog.txt

@@ -6,4 +6,4 @@ PyYAML==6.0.2
 rstcheck==5.0.0
 semantic-version==2.10.0
 types-docutils==0.18.3
-typing_extensions==4.13.2
+typing_extensions==4.15.0

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.13.0
+pycodestyle==2.14.0

ansible_test/_data/requirements/sanity.pylint.txt

@@ -1,9 +1,9 @@
 # edit "sanity.pylint.in" and generate with: hacking/update-sanity-requirements.py --test pylint
-astroid==3.3.10
+astroid==3.3.11
 dill==0.4.0
 isort==6.0.1
 mccabe==0.7.0
-platformdirs==4.3.8
-pylint==3.3.7
+platformdirs==4.4.0
+pylint==3.3.8
 PyYAML==6.0.2
-tomlkit==0.13.2
+tomlkit==0.13.3

ansible_test/_internal/cache.py

@@ -3,14 +3,11 @@
 from __future__ import annotations
 
 import collections.abc as c
-import typing as t
 
 from .config import (
     CommonConfig,
 )
 
-TValue = t.TypeVar('TValue')
-
 
 class CommonCache:
     """Common cache."""
@@ -18,14 +15,14 @@ class CommonCache:
     def __init__(self, args: CommonConfig) -> None:
         self.args = args
 
-    def get(self, key: str, factory: c.Callable[[], TValue]) -> TValue:
+    def get[TValue](self, key: str, factory: c.Callable[[], TValue]) -> TValue:
         """Return the value from the cache identified by the given key, using the specified factory method if it is not found."""
         if key not in self.args.cache:
             self.args.cache[key] = factory()
 
         return self.args.cache[key]
 
-    def get_with_args(self, key: str, factory: c.Callable[[CommonConfig], TValue]) -> TValue:
+    def get_with_args[TValue](self, key: str, factory: c.Callable[[CommonConfig], TValue]) -> TValue:
         """Return the value from the cache identified by the given key, using the specified factory method (which accepts args) if it is not found."""
         if key not in self.args.cache:
             self.args.cache[key] = factory(self.args)

ansible_test/_internal/cli/compat.py

@@ -69,7 +69,7 @@ def controller_python(version: t.Optional[str]) -> t.Optional[str]:
 
 def get_fallback_remote_controller() -> str:
     """Return the remote fallback platform for the controller."""
-    platform = 'freebsd'  # lower cost than RHEL and macOS
+    platform = 'fedora'  # Fedora is lower cost than other remotes and always supports a recent Python version
     candidates = [item for item in filter_completion(remote_completion()).values() if item.controller_supported and item.platform == platform]
     fallback = sorted(candidates, key=lambda value: str_to_version(value.version), reverse=True)[0]
     return fallback.name

ansible_test/_internal/commands/coverage/combine.py

@@ -63,8 +63,6 @@ from . import (
     PathChecker,
 )
 
-TValue = t.TypeVar('TValue')
-
 
 def command_coverage_combine(args: CoverageCombineConfig) -> None:
     """Patch paths in coverage files and merge into a single file."""
@@ -287,7 +285,7 @@ def _get_coverage_targets(args: CoverageCombineConfig, walk_func: c.Callable) ->
     return sources
 
 
-def _build_stub_groups(
+def _build_stub_groups[TValue](
     args: CoverageCombineConfig,
     sources: list[tuple[str, int]],
     default_stub_value: c.Callable[[list[str]], dict[str, TValue]],

ansible_test/_internal/commands/integration/__init__.py

@@ -41,7 +41,6 @@ from ...target import (
     walk_integration_targets,
     IntegrationTarget,
     walk_internal_targets,
-    TIntegrationTarget,
     IntegrationTargetType,
 )
 
@@ -50,7 +49,6 @@ from ...config import (
     NetworkIntegrationConfig,
     PosixIntegrationConfig,
     WindowsIntegrationConfig,
-    TIntegrationConfig,
 )
 
 from ...io import (
@@ -132,8 +130,6 @@ from .coverage import (
     CoverageManager,
 )
 
-THostProfile = t.TypeVar('THostProfile', bound=HostProfile)
-
 
 def generate_dependency_map(integration_targets: list[IntegrationTarget]) -> dict[str, set[IntegrationTarget]]:
     """Analyze the given list of integration test targets and return a dictionary expressing target names and the targets on which they depend."""
@@ -331,7 +327,7 @@ def integration_test_environment(
             display.info('Copying %s/ to %s/' % (dir_src, dir_dst), verbosity=2)
 
             if not args.explain:
-                shutil.copytree(to_bytes(dir_src), to_bytes(dir_dst), symlinks=True)  # type: ignore[arg-type]  # incorrect type stub omits bytes path support
+                shutil.copytree(to_bytes(dir_src), to_bytes(dir_dst), symlinks=True)  # type: ignore[type-var,arg-type]  # type stub omits bytes path support
 
         for file_src, file_dst in file_copies:
             display.info('Copying %s to %s' % (file_src, file_dst), verbosity=2)
@@ -856,7 +852,7 @@ class IntegrationCache(CommonCache):
         return self.get('dependency_map', lambda: generate_dependency_map(self.integration_targets))
 
 
-def filter_profiles_for_target(args: IntegrationConfig, profiles: list[THostProfile], target: IntegrationTarget) -> list[THostProfile]:
+def filter_profiles_for_target[T: HostProfile](args: IntegrationConfig, profiles: list[T], target: IntegrationTarget) -> list[T]:
     """Return a list of profiles after applying target filters."""
     if target.target_type == IntegrationTargetType.CONTROLLER:
         profile_filter = get_target_filter(args, [args.controller], True)
@@ -912,7 +908,7 @@ If necessary, context can be controlled by adding entries to the "aliases" file
     return exclude
 
 
-def command_integration_filter(
+def command_integration_filter[TIntegrationTarget: IntegrationTarget, TIntegrationConfig: IntegrationConfig](
     args: TIntegrationConfig,
     targets: c.Iterable[TIntegrationTarget],
 ) -> tuple[HostState, tuple[TIntegrationTarget, ...]]:

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

@@ -32,7 +32,7 @@ class HttptesterProvider(CloudProvider):
     def __init__(self, args: IntegrationConfig) -> None:
         super().__init__(args)
 
-        self.image = os.environ.get('ANSIBLE_HTTP_TEST_CONTAINER', 'quay.io/ansible/http-test-container:3.3.0')
+        self.image = os.environ.get('ANSIBLE_HTTP_TEST_CONTAINER', 'quay.io/ansible/http-test-container:3.5.0')
 
         self.uses_docker = True
 

ansible_test/_internal/commands/integration/coverage.py

@@ -79,10 +79,8 @@ from ...inventory import (
     create_posix_inventory,
 )
 
-THostConfig = t.TypeVar('THostConfig', bound=HostConfig)
 
-
-class CoverageHandler(t.Generic[THostConfig], metaclass=abc.ABCMeta):
+class CoverageHandler[THostConfig: HostConfig](metaclass=abc.ABCMeta):
     """Base class for configuring hosts for integration test code coverage."""
 
     def __init__(self, args: IntegrationConfig, host_state: HostState, inventory_path: str) -> None:

ansible_test/_internal/commands/integration/filters.py

@@ -40,13 +40,8 @@ from ...host_profiles import (
     HostProfile,
 )
 
-THostConfig = t.TypeVar('THostConfig', bound=HostConfig)
-TPosixConfig = t.TypeVar('TPosixConfig', bound=PosixConfig)
-TRemoteConfig = t.TypeVar('TRemoteConfig', bound=RemoteConfig)
-THostProfile = t.TypeVar('THostProfile', bound=HostProfile)
 
-
-class TargetFilter(t.Generic[THostConfig], metaclass=abc.ABCMeta):
+class TargetFilter[THostConfig: HostConfig](metaclass=abc.ABCMeta):
     """Base class for target filters."""
 
     def __init__(self, args: IntegrationConfig, configs: list[THostConfig], controller: bool) -> None:
@@ -92,7 +87,7 @@ class TargetFilter(t.Generic[THostConfig], metaclass=abc.ABCMeta):
         exclude.update(skipped)
         display.warning(f'Excluding {self.host_type} tests marked {marked} {reason}: {", ".join(skipped)}')
 
-    def filter_profiles(self, profiles: list[THostProfile], target: IntegrationTarget) -> list[THostProfile]:
+    def filter_profiles[THostProfile: HostProfile](self, profiles: list[THostProfile], target: IntegrationTarget) -> list[THostProfile]:
         """Filter the list of profiles, returning only those which are not skipped for the given target."""
         del target
         return profiles
@@ -138,7 +133,7 @@ class TargetFilter(t.Generic[THostConfig], metaclass=abc.ABCMeta):
             self.skip('unstable', 'which require --allow-unstable or prefixing with "unstable/"', targets, exclude, override)
 
 
-class PosixTargetFilter(TargetFilter[TPosixConfig]):
+class PosixTargetFilter[TPosixConfig: PosixConfig](TargetFilter[TPosixConfig]):
     """Target filter for POSIX hosts."""
 
     def filter_targets(self, targets: list[IntegrationTarget], exclude: set[str]) -> None:
@@ -169,10 +164,10 @@ class PosixSshTargetFilter(PosixTargetFilter[PosixSshConfig]):
     """Target filter for POSIX SSH hosts."""
 
 
-class RemoteTargetFilter(TargetFilter[TRemoteConfig]):
+class RemoteTargetFilter[TRemoteConfig: RemoteConfig](TargetFilter[TRemoteConfig]):
     """Target filter for remote Ansible Core CI managed hosts."""
 
-    def filter_profiles(self, profiles: list[THostProfile], target: IntegrationTarget) -> list[THostProfile]:
+    def filter_profiles[THostProfile: HostProfile](self, profiles: list[THostProfile], target: IntegrationTarget) -> list[THostProfile]:
         """Filter the list of profiles, returning only those which are not skipped for the given target."""
         profiles = super().filter_profiles(profiles, target)
 

ansible_test/_internal/commands/sanity/validate_modules.py

@@ -160,11 +160,7 @@ class ValidateModulesTest(SanitySingleVersion):
                 temp_dir = process_scoped_temporary_directory(args)
 
                 with tarfile.open(path) as file:
-                    # deprecated: description='extractall fallback without filter' python_version='3.11'
-                    if hasattr(tarfile, 'data_filter'):
-                        file.extractall(temp_dir, filter='data')  # type: ignore[call-arg]
-                    else:
-                        file.extractall(temp_dir)
+                    file.extractall(temp_dir, filter='data')
 
                 cmd.extend([
                     '--original-plugins', temp_dir,

ansible_test/_internal/commands/units/__init__.py

@@ -241,19 +241,7 @@ def command_units(args: UnitsConfig) -> None:
         sys.exit()
 
     for test_context, python, paths, env in test_sets:
-        # When using pytest-mock, make sure that features introduced in Python 3.8 are available to older Python versions.
-        # This is done by enabling the mock_use_standalone_module feature, which forces use of mock even when unittest.mock is available.
-        # Later Python versions have not introduced additional unittest.mock features, so use of mock is not needed as of Python 3.8.
-        # If future Python versions introduce new unittest.mock features, they will not be available to older Python versions.
-        # Having the cutoff at Python 3.8 also eases packaging of ansible-core since no supported controller version requires the use of mock.
-        #
-        # 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 unittest.mock instead.
-        if str_to_version(python.version) < (3, 8):
-            config_name = 'legacy.ini'
-        else:
-            config_name = 'default.ini'
+        config_name = 'default.ini'
 
         cmd = [
             'pytest',

ansible_test/_internal/completion.py

@@ -250,10 +250,7 @@ class WindowsRemoteCompletionConfig(RemoteCompletionConfig):
     connection: str = ''
 
 
-TCompletionConfig = t.TypeVar('TCompletionConfig', bound=CompletionConfig)
-
-
-def load_completion(name: str, completion_type: t.Type[TCompletionConfig]) -> dict[str, TCompletionConfig]:
+def load_completion[TCompletionConfig: CompletionConfig](name: str, completion_type: t.Type[TCompletionConfig]) -> dict[str, TCompletionConfig]:
     """Load the named completion entries, returning them in dictionary form using the specified completion type."""
     lines = read_lines_without_comments(os.path.join(ANSIBLE_TEST_DATA_ROOT, 'completion', '%s.txt' % name), remove_blank_lines=True)
 
@@ -283,7 +280,7 @@ def parse_completion_entry(value: str) -> tuple[str, dict[str, str]]:
     return name, data
 
 
-def filter_completion(
+def filter_completion[TCompletionConfig: CompletionConfig](
     completion: dict[str, TCompletionConfig],
     controller_only: bool = False,
     include_defaults: bool = False,

ansible_test/_internal/config.py

@@ -38,8 +38,6 @@ from .host_configs import (
     VirtualPythonConfig,
 )
 
-THostConfig = t.TypeVar('THostConfig', bound=HostConfig)
-
 
 class TerminateMode(enum.Enum):
     """When to terminate instances."""
@@ -166,7 +164,7 @@ class EnvironmentConfig(CommonConfig):
         """Host configuration for the targets."""
         return self.host_settings.targets
 
-    def only_target(self, target_type: t.Type[THostConfig]) -> THostConfig:
+    def only_target[THostConfig: HostConfig](self, target_type: t.Type[THostConfig]) -> THostConfig:
         """
         Return the host configuration for the target.
         Requires that there is exactly one target of the specified type.
@@ -183,7 +181,7 @@ class EnvironmentConfig(CommonConfig):
 
         return target
 
-    def only_targets(self, target_type: t.Type[THostConfig]) -> list[THostConfig]:
+    def only_targets[THostConfig: HostConfig](self, target_type: t.Type[THostConfig]) -> list[THostConfig]:
         """
         Return a list of target host configurations.
         Requires that there are one or more targets, all the specified type.
@@ -318,9 +316,6 @@ class IntegrationConfig(TestConfig):
         return ansible_config_path
 
 
-TIntegrationConfig = t.TypeVar('TIntegrationConfig', bound=IntegrationConfig)
-
-
 class PosixIntegrationConfig(IntegrationConfig):
     """Configuration for the posix integration command."""
 

ansible_test/_internal/coverage_util.py

@@ -69,7 +69,7 @@ class CoverageVersion:
 
 COVERAGE_VERSIONS = (
     # IMPORTANT: Keep this in sync with the ansible-test.txt requirements file.
-    CoverageVersion('7.6.1', 7, (3, 8), (3, 13)),
+    CoverageVersion('7.10.6', 7, (3, 9), (3, 14)),
 )
 """
 This tuple specifies the coverage version to use for Python version ranges.

ansible_test/_internal/delegation.py

@@ -124,6 +124,8 @@ def delegate(args: CommonConfig, host_state: HostState, exclude: list[str], requ
 @contextlib.contextmanager
 def metadata_context(args: EnvironmentConfig) -> t.Generator[None]:
     """A context manager which exports delegation metadata."""
+    os.makedirs(ResultType.TMP.path, exist_ok=True)
+
     with tempfile.NamedTemporaryFile(prefix='metadata-', suffix='.json', dir=ResultType.TMP.path) as metadata_fd:
         args.metadata_path = os.path.join(ResultType.TMP.relative_path, os.path.basename(metadata_fd.name))
         args.metadata.to_file(args.metadata_path)

ansible_test/_internal/docker_util.py

@@ -50,7 +50,7 @@ DOCKER_COMMANDS = [
     'podman',
 ]
 
-UTILITY_IMAGE = 'quay.io/ansible/ansible-test-utility-container:3.2.0'
+UTILITY_IMAGE = 'quay.io/ansible/ansible-test-utility-container:3.4.0'
 
 # Max number of open files in a docker container.
 # Passed with --ulimit option to the docker run command.

ansible_test/_internal/host_profiles.py

@@ -144,11 +144,6 @@ from .debugging import (
     DebuggerSettings,
 )
 
-TControllerHostConfig = t.TypeVar('TControllerHostConfig', bound=ControllerHostConfig)
-THostConfig = t.TypeVar('THostConfig', bound=HostConfig)
-TPosixConfig = t.TypeVar('TPosixConfig', bound=PosixConfig)
-TRemoteConfig = t.TypeVar('TRemoteConfig', bound=RemoteConfig)
-
 
 class ControlGroupError(ApplicationError):
     """Raised when the container host does not have the necessary cgroup support to run a container."""
@@ -239,7 +234,7 @@ class Inventory:
         display.info(f'>>> Inventory\n{inventory_text}', verbosity=3)
 
 
-class HostProfile(t.Generic[THostConfig], metaclass=abc.ABCMeta):
+class HostProfile[THostConfig: HostConfig](metaclass=abc.ABCMeta):
     """Base class for host profiles."""
 
     def __init__(
@@ -299,7 +294,7 @@ class HostProfile(t.Generic[THostConfig], metaclass=abc.ABCMeta):
         return f'{self.__class__.__name__}: {self.name}'
 
 
-class DebuggableProfile(HostProfile[THostConfig], DebuggerProfile, metaclass=abc.ABCMeta):
+class DebuggableProfile[THostConfig: HostConfig](HostProfile[THostConfig], DebuggerProfile, metaclass=abc.ABCMeta):
     """Base class for profiles remote debugging."""
 
     __DEBUGGING_PORT_KEY = 'debugging_port'
@@ -465,7 +460,7 @@ class DebuggableProfile(HostProfile[THostConfig], DebuggerProfile, metaclass=abc
         )
 
 
-class PosixProfile(HostProfile[TPosixConfig], metaclass=abc.ABCMeta):
+class PosixProfile[TPosixConfig: PosixConfig](HostProfile[TPosixConfig], metaclass=abc.ABCMeta):
     """Base class for POSIX host profiles."""
 
     @property
@@ -487,7 +482,7 @@ class PosixProfile(HostProfile[TPosixConfig], metaclass=abc.ABCMeta):
         return python
 
 
-class ControllerHostProfile(PosixProfile[TControllerHostConfig], DebuggableProfile[TControllerHostConfig], metaclass=abc.ABCMeta):
+class ControllerHostProfile[T: ControllerHostConfig](PosixProfile[T], DebuggableProfile[T], metaclass=abc.ABCMeta):
     """Base class for profiles usable as a controller."""
 
     @abc.abstractmethod
@@ -499,7 +494,7 @@ class ControllerHostProfile(PosixProfile[TControllerHostConfig], DebuggableProfi
         """Return the working directory for the host."""
 
 
-class SshTargetHostProfile(HostProfile[THostConfig], metaclass=abc.ABCMeta):
+class SshTargetHostProfile[THostConfig: HostConfig](HostProfile[THostConfig], metaclass=abc.ABCMeta):
     """Base class for profiles offering SSH connectivity."""
 
     @abc.abstractmethod
@@ -507,7 +502,7 @@ class SshTargetHostProfile(HostProfile[THostConfig], metaclass=abc.ABCMeta):
         """Return SSH connection(s) for accessing the host as a target from the controller."""
 
 
-class RemoteProfile(SshTargetHostProfile[TRemoteConfig], metaclass=abc.ABCMeta):
+class RemoteProfile[TRemoteConfig: RemoteConfig](SshTargetHostProfile[TRemoteConfig], metaclass=abc.ABCMeta):
     """Base class for remote instance profiles."""
 
     @property

ansible_test/_internal/provider/__init__.py

@@ -12,12 +12,12 @@ from ..util import (
 )
 
 
-def get_path_provider_classes(provider_type: t.Type[TPathProvider]) -> list[t.Type[TPathProvider]]:
+def get_path_provider_classes[TPathProvider: PathProvider](provider_type: t.Type[TPathProvider]) -> list[t.Type[TPathProvider]]:
     """Return a list of path provider classes of the given type."""
     return sorted(get_subclasses(provider_type), key=lambda subclass: (subclass.priority, subclass.__name__))
 
 
-def find_path_provider(
+def find_path_provider[TPathProvider: PathProvider](
     provider_type: t.Type[TPathProvider],
     provider_classes: list[t.Type[TPathProvider]],
     path: str,
@@ -71,6 +71,3 @@ class PathProvider(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def is_content_root(path: str) -> bool:
         """Return True if the given path is a content root for this provider."""
-
-
-TPathProvider = t.TypeVar('TPathProvider', bound=PathProvider)

ansible_test/_internal/provisioning.py

@@ -48,9 +48,6 @@ from .pypi_proxy import (
     run_pypi_proxy,
 )
 
-THostProfile = t.TypeVar('THostProfile', bound=HostProfile)
-TEnvironmentConfig = t.TypeVar('TEnvironmentConfig', bound=EnvironmentConfig)
-
 
 class PrimeContainers(ApplicationError):
     """Exception raised to end execution early after priming containers."""
@@ -91,7 +88,7 @@ class HostState:
         return list(itertools.chain.from_iterable([target.get_controller_target_connections() for
                                                    target in self.target_profiles if isinstance(target, SshTargetHostProfile)]))
 
-    def targets(self, profile_type: t.Type[THostProfile]) -> list[THostProfile]:
+    def targets[THostProfile: HostProfile](self, profile_type: t.Type[THostProfile]) -> list[THostProfile]:
         """The list of target(s), verified to be of the specified type."""
         if not self.target_profiles:
             raise Exception('No target profiles found.')
@@ -101,7 +98,7 @@ class HostState:
         return t.cast(list[THostProfile], self.target_profiles)
 
 
-def prepare_profiles(
+def prepare_profiles[TEnvironmentConfig: EnvironmentConfig](
     args: TEnvironmentConfig,
     targets_use_pypi: bool = False,
     skip_setup: bool = False,

ansible_test/_internal/pypi_proxy.py

@@ -70,7 +70,7 @@ def run_pypi_proxy(args: EnvironmentConfig, targets_use_pypi: bool) -> None:
         display.warning('Unable to use the PyPI proxy because Docker is not available. Installation of packages using `pip` may fail.')
         return
 
-    image = 'quay.io/ansible/pypi-test-container:3.3.0'
+    image = 'quay.io/ansible/pypi-test-container:3.5.0'
     port = 3141
 
     run_support_container(

ansible_test/_internal/target.py

@@ -65,7 +65,7 @@ def walk_completion_targets(targets: c.Iterable[CompletionTarget], prefix: str,
     return tuple(sorted(matches))
 
 
-def walk_internal_targets(
+def walk_internal_targets[TCompletionTarget: CompletionTarget](
     targets: c.Iterable[TCompletionTarget],
     includes: t.Optional[list[str]] = None,
     excludes: t.Optional[list[str]] = None,
@@ -87,7 +87,7 @@ def walk_internal_targets(
     return tuple(sorted(internal_targets, key=lambda sort_target: sort_target.name))
 
 
-def filter_targets(
+def filter_targets[TCompletionTarget: CompletionTarget](
     targets: c.Iterable[TCompletionTarget],
     patterns: list[str],
     include: bool = True,
@@ -711,7 +711,3 @@ class TargetPatternsNotMatched(ApplicationError):
             message = 'Target pattern not matched: %s' % self.patterns[0]
 
         super().__init__(message)
-
-
-TCompletionTarget = t.TypeVar('TCompletionTarget', bound=CompletionTarget)
-TIntegrationTarget = t.TypeVar('TIntegrationTarget', bound=IntegrationTarget)

ansible_test/_internal/thread.py

@@ -11,9 +11,6 @@ import queue
 import typing as t
 
 
-TCallable = t.TypeVar('TCallable', bound=t.Callable[..., t.Any])
-
-
 class WrappedThread(threading.Thread):
     """Wrapper around Thread which captures results and exceptions."""
 
@@ -50,7 +47,7 @@ class WrappedThread(threading.Thread):
         return result
 
 
-def mutex(func: TCallable) -> TCallable:
+def mutex[TCallable: t.Callable[..., t.Any]](func: TCallable) -> TCallable:
     """Enforce exclusive access on a decorated function."""
     lock = threading.Lock()
 

ansible_test/_internal/util.py

@@ -57,11 +57,6 @@ from .constants import (
     SUPPORTED_PYTHON_VERSIONS,
 )
 
-C = t.TypeVar('C')
-TBase = t.TypeVar('TBase')
-TKey = t.TypeVar('TKey')
-TValue = t.TypeVar('TValue')
-
 PYTHON_PATHS: dict[str, str] = {}
 
 COVERAGE_CONFIG_NAME = 'coveragerc'
@@ -180,7 +175,7 @@ def is_valid_identifier(value: str) -> bool:
     return value.isidentifier() and not keyword.iskeyword(value)
 
 
-def cache(func: c.Callable[[], TValue]) -> c.Callable[[], TValue]:
+def cache[TValue](func: c.Callable[[], TValue]) -> c.Callable[[], TValue]:
     """Enforce exclusive access on a decorated function and cache the result."""
     storage: dict[None, TValue] = {}
     sentinel = object()
@@ -313,7 +308,7 @@ def read_lines_without_comments(path: str, remove_blank_lines: bool = False, opt
     return lines
 
 
-def exclude_none_values(data: dict[TKey, t.Optional[TValue]]) -> dict[TKey, TValue]:
+def exclude_none_values[TKey, TValue](data: dict[TKey, t.Optional[TValue]]) -> dict[TKey, TValue]:
     """Return the provided dictionary with any None values excluded."""
     return dict((key, value) for key, value in data.items() if value is not None)
 
@@ -1059,7 +1054,7 @@ def format_command_output(stdout: str | None, stderr: str | None) -> str:
     return message
 
 
-def retry(func: t.Callable[..., TValue], ex_type: t.Type[BaseException] = SubprocessError, sleep: int = 10, attempts: int = 10, warn: bool = True) -> TValue:
+def retry[T](func: t.Callable[..., T], ex_type: t.Type[BaseException] = SubprocessError, sleep: int = 10, attempts: int = 10, warn: bool = True) -> T:
     """Retry the specified function on failure."""
     for dummy in range(1, attempts):
         try:
@@ -1092,7 +1087,7 @@ def parse_to_list_of_dict(pattern: str, value: str) -> list[dict[str, str]]:
     return matched
 
 
-def get_subclasses(class_type: t.Type[C]) -> list[t.Type[C]]:
+def get_subclasses[C](class_type: t.Type[C]) -> list[t.Type[C]]:
     """Returns a list of types that are concrete subclasses of the given type."""
     subclasses: set[t.Type[C]] = set()
     queue: list[t.Type[C]] = [class_type]
@@ -1168,7 +1163,7 @@ def import_plugins(directory: str, root: t.Optional[str] = None) -> None:
         load_module(module_path, name)
 
 
-def load_plugins(base_type: t.Type[C], database: dict[str, t.Type[C]]) -> None:
+def load_plugins[C](base_type: t.Type[C], database: dict[str, t.Type[C]]) -> None:
     """
     Load plugins of the specified type and track them in the specified database.
     Only plugins which have already been imported will be loaded.
@@ -1195,19 +1190,19 @@ def sanitize_host_name(name: str) -> str:
     return re.sub('[^A-Za-z0-9]+', '-', name)[:63].strip('-')
 
 
-def get_generic_type(base_type: t.Type, generic_base_type: t.Type[TValue]) -> t.Optional[t.Type[TValue]]:
+def get_generic_type[TValue](base_type: t.Type, generic_base_type: t.Type[TValue]) -> t.Optional[t.Type[TValue]]:
     """Return the generic type arg derived from the generic_base_type type that is associated with the base_type type, if any, otherwise return None."""
     # noinspection PyUnresolvedReferences
     type_arg = t.get_args(base_type.__orig_bases__[0])[0]
     return None if isinstance(type_arg, generic_base_type) else type_arg
 
 
-def get_type_associations(base_type: t.Type[TBase], generic_base_type: t.Type[TValue]) -> list[tuple[t.Type[TValue], t.Type[TBase]]]:
+def get_type_associations[TBase, TValue](base_type: t.Type[TBase], generic_base_type: t.Type[TValue]) -> list[tuple[t.Type[TValue], t.Type[TBase]]]:
     """Create and return a list of tuples associating generic_base_type derived types with a corresponding base_type derived type."""
     return [item for item in [(get_generic_type(sc_type, generic_base_type), sc_type) for sc_type in get_subclasses(base_type)] if item[1]]
 
 
-def get_type_map(base_type: t.Type[TBase], generic_base_type: t.Type[TValue]) -> dict[t.Type[TValue], t.Type[TBase]]:
+def get_type_map[TBase, TValue](base_type: t.Type[TBase], generic_base_type: t.Type[TValue]) -> dict[t.Type[TValue], t.Type[TBase]]:
     """Create and return a mapping of generic_base_type derived types to base_type derived types."""
     return {item[0]: item[1] for item in get_type_associations(base_type, generic_base_type)}
 
@@ -1228,7 +1223,7 @@ def verify_sys_executable(path: str) -> t.Optional[str]:
     return expected_executable
 
 
-def type_guard(sequence: c.Sequence[t.Any], guard_type: t.Type[C]) -> t.TypeGuard[c.Sequence[C]]:
+def type_guard[C](sequence: c.Sequence[t.Any], guard_type: t.Type[C]) -> t.TypeGuard[c.Sequence[C]]:
     """
     Raises an exception if any item in the given sequence does not match the specified guard type.
     Use with assert so that type checkers are aware of the type guard.