ansible-core 2.16.6__py3-none-any.whl → 2.17.0rc1__py3-none-any.whl

ansible_test/_util/target/setup/bootstrap.sh

@@ -2,6 +2,16 @@
 
 set -eu
 
+remove_externally_managed_marker()
+{
+    "${python_interpreter}" -c '
+import pathlib
+import sysconfig
+path = pathlib.Path(sysconfig.get_path("stdlib")) / "EXTERNALLY-MANAGED"
+path.unlink(missing_ok=True)
+'
+}
+
 install_ssh_keys()
 {
     if [ ! -f "${ssh_private_key_path}" ]; then
@@ -49,9 +59,6 @@ customize_bashrc()
 install_pip() {
     if ! "${python_interpreter}" -m pip.__main__ --version --disable-pip-version-check 2>/dev/null; then
         case "${python_version}" in
-            "2.7")
-                pip_bootstrap_url="https://ci-files.testing.ansible.com/ansible-test/get-pip-20.3.4.py"
-                ;;
             *)
                 pip_bootstrap_url="https://ci-files.testing.ansible.com/ansible-test/get-pip-23.1.2.py"
                 ;;
@@ -68,18 +75,6 @@ install_pip() {
     fi
 }
 
-pip_install() {
-    pip_packages="$1"
-
-    while true; do
-        # shellcheck disable=SC2086
-        "${python_interpreter}" -m pip install --disable-pip-version-check ${pip_packages} \
-        && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
-    done
-}
-
 bootstrap_remote_alpine()
 {
     py_pkg_prefix="py3"
@@ -168,19 +163,39 @@ bootstrap_remote_freebsd()
         jinja2_pkg="py${python_package_version}-jinja2"
         cryptography_pkg="py${python_package_version}-cryptography"
         pyyaml_pkg="py${python_package_version}-yaml"
+        packaging_pkg="py${python_package_version}-packaging"
 
         # Declare platform/python version combinations which do not have supporting OS packages available.
         # For these combinations ansible-test will use pip to install the requirements instead.
         case "${platform_version}/${python_version}" in
+            13.3/3.9)
+                # defaults above 'just work'TM
+                ;;
+            13.3/3.11)
+                jinja2_pkg=""  # not available
+                cryptography_pkg=""  # not available
+                pyyaml_pkg=""  # not available
+                ;;
+            14.0/3.9)
+                # defaults above 'just work'TM
+                ;;
+            14.0/3.11)
+                cryptography_pkg=""  # not available
+                jinja2_pkg=""  # not available
+                pyyaml_pkg=""  # not available
+                ;;
             *)
+                # just assume nothing is available
                 jinja2_pkg=""  # not available
                 cryptography_pkg=""  # not available
                 pyyaml_pkg=""  # not available
+                packaging_pkg="" # not available
                 ;;
         esac
 
         packages="
             ${packages}
+            ${packaging_pkg}
             libyaml
             ${pyyaml_pkg}
             ${jinja2_pkg}
@@ -242,79 +257,6 @@ bootstrap_remote_macos()
     echo 'PATH="/usr/local/bin:$PATH"' > /etc/zshenv
 }
 
-bootstrap_remote_rhel_7()
-{
-    packages="
-        gcc
-        python-devel
-        python-virtualenv
-        "
-
-    while true; do
-        # shellcheck disable=SC2086
-        yum install -q -y ${packages} \
-        && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
-    done
-
-    install_pip
-
-    bootstrap_remote_rhel_pinned_pip_packages
-}
-
-bootstrap_remote_rhel_8()
-{
-    if [ "${python_version}" = "3.6" ]; then
-        py_pkg_prefix="python3"
-    else
-        py_pkg_prefix="python${python_version}"
-    fi
-
-    packages="
-        gcc
-        ${py_pkg_prefix}-devel
-        "
-
-    # pip isn't included in the Python devel package under Python 3.11
-    if [ "${python_version}" != "3.6" ]; then
-        packages="
-            ${packages}
-            ${py_pkg_prefix}-pip
-        "
-    fi
-
-    # Jinja2 is not installed with an OS package since the provided version is too old.
-    # Instead, ansible-test will install it using pip.
-    if [ "${controller}" ]; then
-        packages="
-            ${packages}
-            ${py_pkg_prefix}-cryptography
-            "
-    fi
-
-    # Python 3.11 isn't a module like the earlier versions
-    if [ "${python_version}" = "3.6" ]; then
-        while true; do
-            # shellcheck disable=SC2086
-            yum module install -q -y "python${python_package_version}" \
-            && break
-            echo "Failed to install packages. Sleeping before trying again..."
-            sleep 10
-        done
-    fi
-
-    while true; do
-        # shellcheck disable=SC2086
-        yum install -q -y ${packages} \
-        && break
-        echo "Failed to install packages. Sleeping before trying again..."
-        sleep 10
-    done
-
-    bootstrap_remote_rhel_pinned_pip_packages
-}
-
 bootstrap_remote_rhel_9()
 {
     if [ "${python_version}" = "3.9" ]; then
@@ -360,23 +302,10 @@ bootstrap_remote_rhel_9()
 bootstrap_remote_rhel()
 {
     case "${platform_version}" in
-        7.*) bootstrap_remote_rhel_7 ;;
-        8.*) bootstrap_remote_rhel_8 ;;
         9.*) bootstrap_remote_rhel_9 ;;
     esac
 }
 
-bootstrap_remote_rhel_pinned_pip_packages()
-{
-    # pin packaging and pyparsing to match the downstream vendored versions
-    pip_packages="
-        packaging==20.4
-        pyparsing==2.4.7
-        "
-
-    pip_install "${pip_packages}"
-}
-
 bootstrap_remote_ubuntu()
 {
     py_pkg_prefix="python3"
@@ -430,14 +359,27 @@ bootstrap_docker()
 {
     # Required for newer mysql-server packages to install/upgrade on Ubuntu 16.04.
     rm -f /usr/sbin/policy-rc.d
+
+    for key_value in ${python_interpreters}; do
+        IFS=':' read -r python_version python_interpreter << EOF
+${key_value}
+EOF
+
+        echo "Bootstrapping Python ${python_version} at: ${python_interpreter}"
+
+        remove_externally_managed_marker
+    done
 }
 
 bootstrap_remote()
 {
-    for python_version in ${python_versions}; do
-        echo "Bootstrapping Python ${python_version}"
+    for key_value in ${python_interpreters}; do
+        IFS=':' read -r python_version python_interpreter << EOF
+${key_value}
+EOF
+
+        echo "Bootstrapping Python ${python_version} at: ${python_interpreter}"
 
-        python_interpreter="python${python_version}"
         python_package_version="$(echo "${python_version}" | tr -d '.')"
 
         case "${platform}" in
@@ -448,6 +390,8 @@ bootstrap_remote()
             "rhel") bootstrap_remote_rhel ;;
             "ubuntu") bootstrap_remote_ubuntu ;;
         esac
+
+        remove_externally_managed_marker
     done
 }
 
@@ -474,7 +418,7 @@ bootstrap_type=#{bootstrap_type}
 controller=#{controller}
 platform=#{platform}
 platform_version=#{platform_version}
-python_versions=#{python_versions}
+python_interpreters=#{python_interpreters}
 ssh_key_type=#{ssh_key_type}
 ssh_private_key=#{ssh_private_key}
 ssh_public_key=#{ssh_public_key}

ansible_test/_util/target/setup/probe_cgroups.py

@@ -1,6 +1,5 @@
 """A tool for probing cgroups to determine write access."""
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import json
 import os

ansible_test/_util/target/setup/quiet_pip.py

@@ -1,20 +1,17 @@
 """Custom entry-point for pip that filters out unwanted logging and warnings."""
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import logging
 import os
 import re
 import runpy
 import sys
-import warnings
 
 BUILTIN_FILTERER_FILTER = logging.Filterer.filter
 
 LOGGING_MESSAGE_FILTER = re.compile("^("
                                     ".*Running pip install with root privileges is generally not a good idea.*|"  # custom Fedora patch [1]
                                     ".*Running pip as the 'root' user can result in broken permissions .*|"  # pip 21.1
-                                    "DEPRECATION: Python 2.7 will reach the end of its life .*|"  # pip 19.2.3
                                     "Ignoring .*: markers .* don't match your environment|"
                                     "Looking in indexes: .*|"  # pypi-test-container
                                     "Requirement already satisfied.*"
@@ -22,13 +19,6 @@ LOGGING_MESSAGE_FILTER = re.compile("^("
 
 # [1] https://src.fedoraproject.org/rpms/python-pip/blob/f34/f/emit-a-warning-when-running-with-root-privileges.patch
 
-WARNING_MESSAGE_FILTERS = (
-    # DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained.
-    # pip 21.0 will drop support for Python 2.7 in January 2021.
-    # More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support
-    'DEPRECATION: Python 2.7 reached the end of its life ',
-)
-
 
 def custom_filterer_filter(self, record):
     """Globally omit logging of unwanted messages."""
@@ -44,11 +34,6 @@ def main():
     # It also avoids problems with loss of color output and mixing up the order of stdout/stderr messages.
     logging.Filterer.filter = custom_filterer_filter
 
-    for message_filter in WARNING_MESSAGE_FILTERS:
-        # Setting filterwarnings in code is necessary because of the following:
-        #   Python 2.7 cannot use the -W option to match warning text after a colon. This makes it impossible to match specific warning messages.
-        warnings.filterwarnings('ignore', message_filter)
-
     get_pip = os.environ.get('GET_PIP')
 
     try:

ansible_test/_util/target/setup/requirements.py

@@ -1,6 +1,5 @@
 """A tool for installing test requirements on the controller and target host."""
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 # pylint: disable=wrong-import-position
 
@@ -250,6 +249,14 @@ def common_pip_environment():  # type: () -> t.Dict[str, str]
     """Return common environment variables used to run pip."""
     env = os.environ.copy()
 
+    # When ansible-test installs requirements outside a virtual environment, it does so under one of two conditions:
+    # 1) The environment is an ephemeral one provisioned by ansible-test.
+    # 2) The user has provided the `--requirements` option to force installation of requirements.
+    # It seems reasonable to bypass PEP 668 checks in both of these cases.
+    # Doing so with an environment variable allows it to work under any version of pip which supports it, without breaking older versions.
+    # NOTE: pip version 23.0 enforces PEP 668 but does not support the override, in which case upgrading pip is required.
+    env.update(PIP_BREAK_SYSTEM_PACKAGES='1')
+
     return env
 
 

ansible_test/_util/target/tools/virtualenvcheck.py

@@ -1,6 +1,5 @@
 """Detect the real python interpreter when running in a virtual environment created by the 'virtualenv' module."""
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import json
 

ansible_test/_util/target/tools/yamlcheck.py

@@ -1,6 +1,5 @@
 """Show availability of PyYAML and libyaml support."""
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import json
 

ansible/module_utils/common/_json_compat.py

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019 Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-import types
-import json
-
-# Detect the python-json library which is incompatible
-try:
-    if not isinstance(json.loads, types.FunctionType) or not isinstance(json.dumps, types.FunctionType):
-        raise ImportError('json.loads or json.dumps were not found in the imported json library.')
-except AttributeError:
-    raise ImportError('python-json was detected, which is incompatible.')