relenv 0.22.0__py3-none-any.whl → 0.22.2__py3-none-any.whl

tests/test_runtime.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 from __future__ import annotations
@@ -1821,3 +1821,169 @@ def test_load_openssl_provider_linux(monkeypatch: pytest.MonkeyPatch) -> None:
     )
     monkeypatch.setattr(relenv.runtime.sys, "platform", "linux", raising=False)
     assert relenv.runtime.load_openssl_provider("default") == 456
+
+
+def test_sysconfig_wrapper_applied_for_python_313_plus(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """
+    Test that sysconfig wrapper is applied for Python 3.13+.
+
+    This is a regression test for Python 3.13 where sysconfig changed from
+    a single module to a package. The RelenvImporter no longer intercepts
+    the import automatically, so we must manually apply the wrapper.
+
+    Without this fix, Python 3.13+ would use the toolchain gcc with full path
+    even when RELENV_BUILDENV is not set, causing build failures with packages
+    like mysqlclient that compile native extensions.
+    """
+    # Simulate Python 3.13+
+    fake_version = (3, 13, 0, "final", 0)
+    monkeypatch.setattr(relenv.runtime.sys, "version_info", fake_version)
+
+    # Track whether wrap_sysconfig was called
+    wrap_called = {"count": 0, "module_name": None}
+
+    def fake_wrap_sysconfig(name: str) -> ModuleType:
+        wrap_called["count"] += 1
+        wrap_called["module_name"] = name
+        return ModuleType("sysconfig")
+
+    monkeypatch.setattr(relenv.runtime, "wrap_sysconfig", fake_wrap_sysconfig)
+
+    # Mock other dependencies to avoid side effects
+    monkeypatch.setattr(relenv.runtime, "relenv_root", lambda: pathlib.Path("/root"))
+    monkeypatch.setattr(relenv.runtime, "setup_openssl", lambda: None)
+    monkeypatch.setattr(relenv.runtime, "setup_crossroot", lambda: None)
+    monkeypatch.setattr(relenv.runtime, "install_cargo_config", lambda: None)
+    monkeypatch.setattr(
+        relenv.runtime.site, "execsitecustomize", lambda: None, raising=False
+    )
+    monkeypatch.setattr(
+        relenv.runtime, "wrapsitecustomize", lambda func: func, raising=False
+    )
+
+    # Mock importer
+    fake_importer = SimpleNamespace()
+    monkeypatch.setattr(relenv.runtime, "importer", fake_importer, raising=False)
+
+    # Clear sys.meta_path to avoid side effects
+    original_meta_path = sys.meta_path.copy()
+    monkeypatch.setattr(sys, "meta_path", [])
+
+    try:
+        # Execute the module initialization code at the end of runtime.py
+        # This simulates what happens when the runtime module is imported
+        exec(
+            """
+import sys
+sys.RELENV = relenv_root()
+setup_openssl()
+site.execsitecustomize = wrapsitecustomize(site.execsitecustomize)
+setup_crossroot()
+install_cargo_config()
+sys.meta_path = [importer] + sys.meta_path
+
+# For Python 3.13+, sysconfig became a package so the importer doesn't
+# intercept it. Manually wrap it here.
+if sys.version_info >= (3, 13):
+    wrap_sysconfig("sysconfig")
+""",
+            {
+                "sys": relenv.runtime.sys,
+                "relenv_root": relenv.runtime.relenv_root,
+                "setup_openssl": relenv.runtime.setup_openssl,
+                "site": relenv.runtime.site,
+                "wrapsitecustomize": relenv.runtime.wrapsitecustomize,
+                "setup_crossroot": relenv.runtime.setup_crossroot,
+                "install_cargo_config": relenv.runtime.install_cargo_config,
+                "importer": fake_importer,
+                "wrap_sysconfig": fake_wrap_sysconfig,
+            },
+        )
+
+        # Verify wrap_sysconfig was called for Python 3.13+
+        assert wrap_called["count"] == 1
+        assert wrap_called["module_name"] == "sysconfig"
+
+    finally:
+        # Restore original meta_path
+        monkeypatch.setattr(sys, "meta_path", original_meta_path)
+
+
+def test_sysconfig_wrapper_not_applied_for_python_312(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """
+    Test that sysconfig wrapper is NOT applied for Python 3.12 and earlier.
+
+    For Python 3.12 and earlier, sysconfig is a single module file and the
+    RelenvImporter intercepts it automatically. We should not manually wrap
+    it to avoid double-wrapping.
+    """
+    # Simulate Python 3.12
+    fake_version = (3, 12, 0, "final", 0)
+    monkeypatch.setattr(relenv.runtime.sys, "version_info", fake_version)
+
+    # Track whether wrap_sysconfig was called
+    wrap_called = {"count": 0}
+
+    def fake_wrap_sysconfig(name: str) -> ModuleType:
+        wrap_called["count"] += 1
+        return ModuleType("sysconfig")
+
+    monkeypatch.setattr(relenv.runtime, "wrap_sysconfig", fake_wrap_sysconfig)
+
+    # Mock other dependencies
+    monkeypatch.setattr(relenv.runtime, "relenv_root", lambda: pathlib.Path("/root"))
+    monkeypatch.setattr(relenv.runtime, "setup_openssl", lambda: None)
+    monkeypatch.setattr(relenv.runtime, "setup_crossroot", lambda: None)
+    monkeypatch.setattr(relenv.runtime, "install_cargo_config", lambda: None)
+    monkeypatch.setattr(
+        relenv.runtime.site, "execsitecustomize", lambda: None, raising=False
+    )
+    monkeypatch.setattr(
+        relenv.runtime, "wrapsitecustomize", lambda func: func, raising=False
+    )
+
+    fake_importer = SimpleNamespace()
+    monkeypatch.setattr(relenv.runtime, "importer", fake_importer, raising=False)
+
+    original_meta_path = sys.meta_path.copy()
+    monkeypatch.setattr(sys, "meta_path", [])
+
+    try:
+        # Execute the module initialization code
+        exec(
+            """
+import sys
+sys.RELENV = relenv_root()
+setup_openssl()
+site.execsitecustomize = wrapsitecustomize(site.execsitecustomize)
+setup_crossroot()
+install_cargo_config()
+sys.meta_path = [importer] + sys.meta_path
+
+# For Python 3.13+, sysconfig became a package so the importer doesn't
+# intercept it. Manually wrap it here.
+if sys.version_info >= (3, 13):
+    wrap_sysconfig("sysconfig")
+""",
+            {
+                "sys": relenv.runtime.sys,
+                "relenv_root": relenv.runtime.relenv_root,
+                "setup_openssl": relenv.runtime.setup_openssl,
+                "site": relenv.runtime.site,
+                "wrapsitecustomize": relenv.runtime.wrapsitecustomize,
+                "setup_crossroot": relenv.runtime.setup_crossroot,
+                "install_cargo_config": relenv.runtime.install_cargo_config,
+                "importer": fake_importer,
+                "wrap_sysconfig": fake_wrap_sysconfig,
+            },
+        )
+
+        # Verify wrap_sysconfig was NOT called for Python 3.12
+        assert wrap_called["count"] == 0
+
+    finally:
+        monkeypatch.setattr(sys, "meta_path", original_meta_path)

tests/test_verify_build.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 # mypy: ignore-errors
 """
@@ -180,13 +180,15 @@ def test_imports(pyexec):
 
 
 def test_pip_install_salt_git(pipexec, build, build_dir, pyexec, build_version):
-    if (
-        sys.platform == "win32"
-        and "3.11" in build_version
+    if sys.platform == "win32" and (
+        "3.10" in build_version
+        or "3.11" in build_version
         or "3.12" in build_version
         or "3.13" in build_version
     ):
-        pytest.xfail("Salt does not work with 3.11 or 3.12 on windows yet")
+        pytest.xfail(
+            "Salt git install fails on Windows (setup.py tries to install missing man pages)"
+        )
     if sys.platform == "darwin" and "3.12" in build_version:
         pytest.xfail("Salt does not work with 3.12 on macos yet")
     if sys.platform == "darwin" and "3.13" in build_version:

relenv-0.22.0.dist-info/RECORD

@@ -1,48 +0,0 @@
-relenv/__init__.py,sha256=JGbn7yb2-o9LBupMRzj1RYcvMWC6eB8yJv76NHCM0-w,325
-relenv/__main__.py,sha256=6N3x5KYX02c2xLWvvtmmLjpcG5Oi2yt9DvP0UW4srM8,1538
-relenv/buildenv.py,sha256=MioqMak_bjA5lhKUU8NDyJOFvjv7MoGY2S7PJld-vyA,4120
-relenv/check.py,sha256=KnYu60lKud9bwAyUKEzSn5MNBHpA6e3D_pGe_Toml70,1133
-relenv/common.py,sha256=vmQjI3g99hqdZ-9zpzWl_xn7L7V5W1FkgA3aQysbVgk,35731
-relenv/create.py,sha256=8Pxqc5rrOER8iWiOMFwA6b0oG7il6fICyjhGh4h2uw0,8383
-relenv/fetch.py,sha256=6kIla7zOV43r-1NAXzOg4TFGH6z0vPOcF99SkneGSPA,2567
-relenv/manifest.py,sha256=W2QTjPsDHlm4OLUpL1bwIGvlNpJijhh1LDYidqCm538,1057
-relenv/python-versions.json,sha256=ZuNUnq1uEYH7c-KYivsQAIeK1l1Z7dZTcVoBD-N9BV0,14694
-relenv/pyversions.py,sha256=8SnFqHdtb0Lrp4JH7Ri6h-YHJngroh8SOL1chHn3GjY,41276
-relenv/relocate.py,sha256=Xfmr1lTMu7DwB8SdMIYQFFfC5La5je8Z33G4md557ew,13182
-relenv/runtime.py,sha256=9lrQ2MZqSe2UE0oSsLfyPpMwtubcKbdVwdzOhmVOZsc,39844
-relenv/toolchain.py,sha256=wRRtgDfkOsvY6N1wQQWf7cc7SRXaFBsO_gxIK8mfjOM,929
-relenv/_resources/xz/config.h,sha256=2IofvMqyAa8xBaQb6QGStiUugMmjyUCq_Of5drh7fro,4117
-relenv/_resources/xz/readme.md,sha256=aOs7hz9RhTnTwHUt6gbO-2Sl0xLKIJp8-w6Du4VIFgY,258
-relenv/_scripts/install_vc_build.ps1,sha256=ir1bcz7rNOuFw4E5_AqBidiKS0SpPViXW7zaanRPCoM,7629
-relenv/build/__init__.py,sha256=Wfs38kXJTKJodtWLAvAUeEOrVnu0ss-krzv2ICM7XnI,6341
-relenv/build/darwin.py,sha256=OvsTmpKq87WILxkmjP0aDdUv8lh3DadJ5MwRqPyXXK0,7131
-relenv/build/linux.py,sha256=S5v4jp4_nCYN3H5h_fel-VbjQcuY_XfZqBeFWdS6qjo,26156
-relenv/build/windows.py,sha256=b1hxd8NmmbvblB8W7-qu_b1_TdMQBNl3Vee-C-edUHc,16102
-relenv/build/common/__init__.py,sha256=YzSyjBpW6StrbiQ4Q0CCT4Iaj-wok2ZtuaHW4cCheDE,1004
-relenv/build/common/_sysconfigdata_template.py,sha256=six70jAkN_4eBP4aKrJhABu9hXMxudUE6ccNQbQT-J8,1955
-relenv/build/common/builder.py,sha256=RaRlWMeShYRcTvT47ry135cpeqhEJ_lMwHZeMtZCuGM,31000
-relenv/build/common/builders.py,sha256=sEwJu9HApcPwp2nSrDHvX42Jc8W3dqRqo4Kt9D2mNdo,4772
-relenv/build/common/download.py,sha256=jHuIrc5jhDGoa4lWGMYdrO6FsYxJvmiuTVhjDzs7ogc,10479
-relenv/build/common/install.py,sha256=1s8cl2GV8yauGAIyAqsOvAWZEorWPPI_hrHkk3Oy9_4,19201
-relenv/build/common/ui.py,sha256=j14BE0uFqa5u8XoSBfphSW38XSwboi4StMJ81gLgkkQ,14192
-relenv-0.22.0.dist-info/licenses/LICENSE.md,sha256=T0SRk3vJM1YcAJjDz9vsX9gsCRatAVSBS7LeU0tklRM,9919
-relenv-0.22.0.dist-info/licenses/NOTICE,sha256=Ns0AybPHBsgJKJJfjE6YnGgWEQQ9F7lQ6QNlYLlQT3E,548
-tests/__init__.py,sha256=PFmZ0Etkh3YyYMcTEuVClZE9LTIC_7LYZQ-U6TpFO-g,70
-tests/_pytest_typing.py,sha256=aTeDhNtOJCKhwkZ-BP560Zi4Jkac_Ylv1RimBpNGtMA,1204
-tests/conftest.py,sha256=inPHwb4duz33BzIxfPoH3z3PK_dbMCbtytUZU785NPk,2628
-tests/test_build.py,sha256=48-4ZWdDk8oCHiWcGhhWoPwyqOhZNrSfXrEsXZuhfmw,14992
-tests/test_common.py,sha256=n2JDIvJWvu_EjFt-S7kN-zv7hVfpPAc2jnP97TyUm4E,15824
-tests/test_create.py,sha256=rjJ7mvInJXqn0r3a5D_q6zzftR4pkzI7M-ipkR5qD9U,6849
-tests/test_downloads.py,sha256=OJViW_atWbQiAUhHImIp4dU7U4hNoJQVDEFD-0hSHx8,3528
-tests/test_fips_photon.py,sha256=LD6a3jUmMmNrERoDPYgW63ts1Dy48aMr4eZpzkGcixE,1397
-tests/test_module_imports.py,sha256=RhwPeUvdKLvuFcZSxCt2WCu81SKTjykaunrrN1sORpw,1354
-tests/test_pyversions_runtime.py,sha256=utmG3CLP061AIbAqRE0n6mVqsQ2DCZDc54LUz3SOQts,5980
-tests/test_relocate.py,sha256=TAYARIL5VRCEPwz1HL1BJpvUSS6RQkk4D0DqGag7rv4,9694
-tests/test_relocate_module.py,sha256=G_KQqR5d7y7WCru_c2fPZKplhtzKgAJX9QONEQmzUAI,7802
-tests/test_runtime.py,sha256=Ih7KquGZjWjBHot21kbYqQaaeRYHId-qwdNKVp_9bgo,65809
-tests/test_verify_build.py,sha256=G4HsBbtHCYgBGX1KFKbm3_cskJZcQT6m4hBfZOeltig,67750
-relenv-0.22.0.dist-info/METADATA,sha256=E8RjqcMC4CJDuvwPiLVWoY1-xi9Vq_xQ_4CGSjxrXfk,1360
-relenv-0.22.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-relenv-0.22.0.dist-info/entry_points.txt,sha256=dO66nWPPWl8ALWWnZFlHKAo6mfPFuQid7purYWL2ddc,48
-relenv-0.22.0.dist-info/top_level.txt,sha256=P4Ro6JLZE53ZdsQ76o2OzBcpb0MaVJmbfr0HAn9WF8M,13
-relenv-0.22.0.dist-info/RECORD,,