Merge branch 'ansible:devel' into devel

ansible · Jun 20, 2023 · 73ab878 · 73ab878
2 parents a3fb86c + bd5b0b4
commit 73ab878
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 4 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -120,12 +120,12 @@ stages:
               test: alpine/3.17
             - name: Fedora 37
               test: fedora/37
+            - name: Fedora 38
+              test: fedora/38
             - name: RHEL 8.8
               test: rhel/8.8
             - name: RHEL 9.2
               test: rhel/9.2
-            - name: Ubuntu 20.04
-              test: ubuntu/20.04
             - name: Ubuntu 22.04
               test: ubuntu/22.04
           groups:
@@ -143,6 +143,8 @@ stages:
               test: centos7
             - name: Fedora 37
               test: fedora37
+            - name: Fedora 38
+              test: fedora38
             - name: openSUSE 15
               test: opensuse15
             - name: Ubuntu 20.04
@@ -160,6 +162,8 @@ stages:
               test: alpine3
             - name: Fedora 37
               test: fedora37
+            - name: Fedora 38
+              test: fedora38
             - name: Ubuntu 22.04
               test: ubuntu2204
           groups:

diff --git a/changelogs/fragments/81082-deprecated-importlib-abc.yml b/changelogs/fragments/81082-deprecated-importlib-abc.yml
@@ -0,0 +1,5 @@
+---
+minor_changes:
+  - Use ``importlib.resources.abc.TraversableResources`` instead of deprecated
+    ``importlib.abc.TraversableResources`` where available
+    (https:/github.com/ansible/ansible/pull/81082).
diff --git a/changelogs/fragments/ansible-test-added-fedora-38.yml b/changelogs/fragments/ansible-test-added-fedora-38.yml
@@ -0,0 +1,3 @@
+minor_changes:
+  - ansible-test - Add Fedora 38 remote.
+  - ansible-test - Add Fedora 38 container.
diff --git a/changelogs/fragments/ansible-test-remove-ubuntu-2004.yml b/changelogs/fragments/ansible-test-remove-ubuntu-2004.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - ansible-test - Removed Ubuntu 20.04 LTS image from the `--remote` option.
diff --git a/lib/ansible/utils/collection_loader/_collection_finder.py b/lib/ansible/utils/collection_loader/_collection_finder.py
@@ -40,8 +40,19 @@ def import_module(name):  # type: ignore[misc]
     reload_module = reload  # type: ignore[name-defined]  # pylint:disable=undefined-variable
 
 try:
-    from importlib.abc import TraversableResources
+    try:
+        # Available on Python >= 3.11
+        # We ignore the import error that will trigger when running mypy with
+        # older Python versions.
+        from importlib.resources.abc import TraversableResources  # type: ignore[import]
+    except ImportError:
+        # Used with Python 3.9 and 3.10 only
+        # This member is still available as an alias up until Python 3.14 but
+        # is deprecated as of Python 3.12.
+        from importlib.abc import TraversableResources  # deprecated: description='TraversableResources move' python_version='3.10'
 except ImportError:
+    # Python < 3.9
+    # deprecated: description='TraversableResources fallback' python_version='3.8'
     TraversableResources = object  # type: ignore[assignment,misc]
 
 try:

diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt
@@ -4,6 +4,7 @@ default image=quay.io/ansible/ansible-core-test-container:8.2.0 python=3.11,2.7,
 alpine3 image=quay.io/ansible/alpine3-test-container:5.0.0 python=3.10 cgroup=none audit=none
 centos7 image=quay.io/ansible/centos7-test-container:5.0.0 python=2.7 cgroup=v1-only
 fedora37 image=quay.io/ansible/fedora37-test-container:5.0.0 python=3.11
+fedora38 image=quay.io/ansible/fedora38-test-container:6.1.0 python=3.11
 opensuse15 image=quay.io/ansible/opensuse15-test-container:6.0.0 python=3.6
 ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:5.0.0 python=3.8
 ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:5.0.0 python=3.10
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
@@ -1,6 +1,7 @@
 alpine/3.17 python=3.10 become=doas_sudo provider=aws arch=x86_64
 alpine become=doas_sudo provider=aws arch=x86_64
 fedora/37 python=3.11 become=sudo provider=aws arch=x86_64
+fedora/38 python=3.11 become=sudo provider=aws arch=x86_64
 fedora become=sudo provider=aws arch=x86_64
 freebsd/12.4 python=3.9 python_dir=/usr/local/bin become=su_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
@@ -13,6 +14,5 @@ rhel/8.8 python=3.6,3.11 become=sudo provider=aws arch=x86_64
 rhel/9.1 python=3.9 become=sudo provider=aws arch=x86_64
 rhel/9.2 python=3.9,3.11 become=sudo provider=aws arch=x86_64
 rhel become=sudo provider=aws arch=x86_64
-ubuntu/20.04 python=3.8,3.9 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