Fix Python 3.11+ test failures

- Add "backports" module to test_thin.py mocks for Python 3.11+
- Change Docker IPv6 network from 2001:db8::/64 to fd00:db8::/64 with NAT
  to fix Python 3.11+ timeout issues when connecting to PyPI
- Add RELENV_DATA environment variable to test-action.yml (missing from merge forward)
- Improve virtualenv creation: check for python3 first, add toolchain to PATH
- Simplify importlib_metadata import in _compat.py

Author: dwoz

.github/workflows/test-action.yml

@@ -59,6 +59,7 @@ on:
 
 env:
   COLUMNS: 190
+  RELENV_DATA: "${{ github.workspace }}/.relenv"
   PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
   PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
   PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
@@ -147,7 +148,22 @@ jobs:
 
       - name: "Create docker network"
         run: |
-           docker network create -o "com.docker.network.driver.mtu=1500" --ipv6 --subnet 2001:db8::/64 ip6net
+           # Use ULA prefix (fd00::/8) for proper IPv6 support with NAT
+           docker network create --ipv6 \
+             --subnet="fd00:db8::/64" \
+             -o "com.docker.network.driver.mtu=1500" \
+             ip6net
+
+           # Enable IPv6 forwarding and NAT for internet connectivity
+           sudo sysctl -w net.ipv6.conf.all.forwarding=1
+           sudo sysctl -w net.ipv6.conf.default.forwarding=1
+
+           # Accept router advertisements even with forwarding enabled
+           sudo sysctl -w net.ipv6.conf.all.accept_ra=2
+           sudo sysctl -w net.ipv6.conf.default.accept_ra=2
+
+           # Add masquerading for ULA to reach internet (fixes Python 3.11+ IPv6 timeouts)
+           sudo ip6tables -t nat -A POSTROUTING -s fd00:db8::/64 ! -d fd00:db8::/64 -j MASQUERADE
 
       - name: "Host network config"
         run: |
@@ -466,7 +482,22 @@ jobs:
 
       - name: "Create docker network"
         run: |
-           docker network create -o "com.docker.network.driver.mtu=1500" --ipv6 --subnet 2001:db8::/64 ip6net
+           # Use ULA prefix (fd00::/8) for proper IPv6 support with NAT
+           docker network create --ipv6 \
+             --subnet="fd00:db8::/64" \
+             -o "com.docker.network.driver.mtu=1500" \
+             ip6net
+
+           # Enable IPv6 forwarding and NAT for internet connectivity
+           sudo sysctl -w net.ipv6.conf.all.forwarding=1
+           sudo sysctl -w net.ipv6.conf.default.forwarding=1
+
+           # Accept router advertisements even with forwarding enabled
+           sudo sysctl -w net.ipv6.conf.all.accept_ra=2
+           sudo sysctl -w net.ipv6.conf.default.accept_ra=2
+
+           # Add masquerading for ULA to reach internet (fixes Python 3.11+ IPv6 timeouts)
+           sudo ip6tables -t nat -A POSTROUTING -s fd00:db8::/64 ! -d fd00:db8::/64 -j MASQUERADE
 
       - name: "Host network config"
         run: |

salt/_compat.py

@@ -14,21 +14,4 @@
 else:
     import salt.ext.ipaddress as ipaddress
 
-if sys.version_info >= (3, 10):
-    import importlib.metadata as importlib_metadata
-else:
-    # importlib_metadata before version 3.3.0 does not include the functionality we need.
-    try:
-        import importlib_metadata
-
-        importlib_metadata_version = [
-            int(part)
-            for part in importlib_metadata.version("importlib_metadata").split(".")
-            if part.isdigit()
-        ]
-        if tuple(importlib_metadata_version) < (3, 3, 0):
-            # Use the vendored importlib_metadata
-            import salt.ext.importlib_metadata as importlib_metadata
-    except ImportError:
-        # Use the vendored importlib_metadata
-        import salt.ext.importlib_metadata as importlib_metadata
+import importlib.metadata as importlib_metadata

tests/pytests/unit/utils/test_thin.py

@@ -90,6 +90,7 @@ def __init__(self):
             "singledispatch": str(code_dir / "singledispatch.py"),
             "looseversion": str(code_dir / "looseversion.py"),
             "packaging": str(code_dir / "packaging"),
+            "backports": str(code_dir / "backports"),
             "requests": str(code_dir / "requests"),
             "idna": str(code_dir / "idna"),
             "urllib3": str(code_dir / "urllib3"),
@@ -1203,6 +1204,7 @@ def test_get_tops_python(thin_ctx):
                 (bts(""), bts("")),  # backports_abc
                 (bts("looseversion.py"), bts("")),
                 (bts("packaging/__init__.py"), bts("")),
+                (bts("backports/__init__.py"), bts("")),  # backports
                 (bts("distro.py"), bts("")),
             ],
         ),
@@ -1251,6 +1253,7 @@ def test_get_tops_python_exclude(thin_ctx):
                 (bts(""), bts("")),  # backports_abc
                 (bts("looseversion.py"), bts("")),
                 (bts("packaging/__init__.py"), bts("")),
+                (bts("backports/__init__.py"), bts("")),  # backports
                 (bts("distro.py"), bts("")),
             ],
         ),
@@ -1301,6 +1304,7 @@ def test_pack_alternatives_exclude(thin_ctx):
                 (bts(""), bts("")),  # backports_abc
                 (bts("looseversion.py"), bts("")),
                 (bts("packaging/__init__.py"), bts("")),
+                (bts("backports/__init__.py"), bts("")),  # backports
                 (bts(thin_ctx.fake_libs["distro"]), bts("")),
             ],
         ),

tests/support/helpers.py

@@ -1748,9 +1748,9 @@ def get_installed_packages(self):
         return data
 
     def _create_virtualenv(self):
-        pyexec = shutil.which("python")
+        pyexec = shutil.which("python3") or shutil.which("python")
         if not pyexec:
-            pytest.fail("'python' binary not found for virtualenv")
+            pytest.fail("'python' or 'python3' binary not found for virtualenv")
         cmd = [
             pyexec,
             "-m",
@@ -1783,14 +1783,29 @@ def _create_virtualenv(self):
         py_version = f"py{sys.version_info.major}.{sys.version_info.minor}"
         self.install(
             "--prefer-binary",
-            "-r", code_dir / "requirements" / "static" / "pkg" / py_version / "linux.txt"
+            "-r",
+            code_dir / "requirements" / "static" / "pkg" / py_version / "linux.txt",
         )
         self.install(RUNTIME_VARS.CODE_DIR)
 
     def install(self, *args, **kwargs):
         env = kwargs.pop("env", None) or {}
         env["USE_STATIC_REQUIREMENTS"] = "1"
+        # Add relenv toolchain to PATH if it exists
+        toolchains_dir = pathlib.Path.home() / ".cache" / "relenv" / "toolchains"
+        if toolchains_dir.exists():
+            # Find any toolchain subdirectory (e.g., x86_64-linux-gnu, aarch64-linux-gnu)
+            for toolchain in toolchains_dir.iterdir():
+                if toolchain.is_dir():
+                    toolchain_bin = toolchain / "bin"
+                    if toolchain_bin.exists():
+                        current_path = env.get("PATH", os.environ.get("PATH", ""))
+                        env["PATH"] = f"{toolchain_bin}:{current_path}"
+                        break
         kwargs["env"] = env
+        # Add --prefer-binary to avoid building from source when possible
+        if "--prefer-binary" not in args:
+            args = ("--prefer-binary",) + args
         return super().install(*args, **kwargs)