relenv 0.22.1__py3-none-any.whl → 0.22.3__py3-none-any.whl

relenv/relocate.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 A script to ensure the proper rpaths are in place for the relenv environment.
@@ -11,6 +11,7 @@ import os as _os
 import pathlib
 import shutil as _shutil
 import subprocess as _subprocess
+import sys as _sys
 from typing import Optional
 
 log = logging.getLogger(__name__)
@@ -18,6 +19,7 @@ log = logging.getLogger(__name__)
 os = _os
 shutil = _shutil
 subprocess = _subprocess
+sys = _sys
 
 __all__ = [
     "is_macho",
@@ -70,6 +72,83 @@ LC_ID_DYLIB = "LC_ID_DYLIB"
 LC_LOAD_DYLIB = "LC_LOAD_DYLIB"
 LC_RPATH = "LC_RPATH"
 
+# Cache for readelf binary path
+_READELF_BINARY: Optional[str] = None
+
+# Cache for patchelf binary path
+_PATCHELF_BINARY: Optional[str] = None
+
+
+def _get_readelf_binary() -> str:
+    """
+    Get the path to readelf binary, preferring toolchain version.
+
+    Returns the cached value if already computed. On Linux, prefers the
+    toolchain's readelf over the system version. Falls back to "readelf"
+    from PATH if toolchain is unavailable.
+
+    :return: Path to readelf binary
+    :rtype: str
+    """
+    global _READELF_BINARY
+    if _READELF_BINARY is not None:
+        return _READELF_BINARY
+
+    # Only Linux has the toolchain with readelf
+    if sys.platform == "linux":
+        try:
+            from relenv.common import get_toolchain, get_triplet
+
+            toolchain = get_toolchain()
+            if toolchain:
+                triplet = get_triplet()
+                toolchain_readelf = toolchain / "bin" / f"{triplet}-readelf"
+                if toolchain_readelf.exists():
+                    _READELF_BINARY = str(toolchain_readelf)
+                    return _READELF_BINARY
+        except Exception:
+            # Fall through to system readelf
+            pass
+
+    # Fall back to system readelf
+    _READELF_BINARY = "readelf"
+    return _READELF_BINARY
+
+
+def _get_patchelf_binary() -> str:
+    """
+    Get the path to patchelf binary, preferring toolchain version.
+
+    Returns the cached value if already computed. On Linux, prefers the
+    toolchain's patchelf over the system version. Falls back to "patchelf"
+    from PATH if toolchain is unavailable.
+
+    :return: Path to patchelf binary
+    :rtype: str
+    """
+    global _PATCHELF_BINARY
+    if _PATCHELF_BINARY is not None:
+        return _PATCHELF_BINARY
+
+    # Only Linux has the toolchain with patchelf
+    if sys.platform == "linux":
+        try:
+            from relenv.common import get_toolchain
+
+            toolchain = get_toolchain()
+            if toolchain:
+                toolchain_patchelf = toolchain / "bin" / "patchelf"
+                if toolchain_patchelf.exists():
+                    _PATCHELF_BINARY = str(toolchain_patchelf)
+                    return _PATCHELF_BINARY
+        except Exception:
+            # Fall through to system patchelf
+            pass
+
+    # Fall back to system patchelf
+    _PATCHELF_BINARY = "patchelf"
+    return _PATCHELF_BINARY
+
 
 def is_macho(path: str | os.PathLike[str]) -> bool:
     """
@@ -192,8 +271,9 @@ def parse_rpath(path: str | os.PathLike[str]) -> list[str]:
     :return: The RPATH's found.
     :rtype: list
     """
+    readelf = _get_readelf_binary()
     proc = subprocess.run(
-        ["readelf", "-d", path], stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        [readelf, "-d", path], stdout=subprocess.PIPE, stderr=subprocess.PIPE
     )
     return parse_readelf_d(proc.stdout.decode())
 
@@ -264,6 +344,35 @@ def is_in_dir(
     return os.path.realpath(filepath).startswith(os.path.realpath(directory) + os.sep)
 
 
+def remove_rpath(path: str | os.PathLike[str]) -> bool:
+    """
+    Remove the rpath from a given ELF file.
+
+    :param path: The path to an ELF file
+    :type path: str
+
+    :return: True if successful, False otherwise
+    :rtype: bool
+    """
+    old_rpath = parse_rpath(path)
+    if not old_rpath:
+        # No RPATH to remove
+        return True
+
+    log.info("Remove RPATH from %s (was: %s)", path, old_rpath)
+    patchelf = _get_patchelf_binary()
+    proc = subprocess.run(
+        [patchelf, "--remove-rpath", path],
+        stderr=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+
+    if proc.returncode:
+        log.error("Failed to remove RPATH from %s: %s", path, proc.stderr.decode())
+        return False
+    return True
+
+
 def patch_rpath(
     path: str | os.PathLike[str],
     new_rpath: str,
@@ -291,8 +400,9 @@ def patch_rpath(
     if new_rpath not in old_rpath:
         patched_rpath = ":".join([new_rpath] + old_rpath)
         log.info("Set RPATH=%s %s", patched_rpath, path)
+        patchelf = _get_patchelf_binary()
         proc = subprocess.run(
-            ["patchelf", "--force-rpath", "--set-rpath", patched_rpath, path],
+            [patchelf, "--force-rpath", "--set-rpath", patched_rpath, path],
             stderr=subprocess.PIPE,
             stdout=subprocess.PIPE,
         )
@@ -325,6 +435,7 @@ def handle_elf(
         root = libs
     proc = subprocess.run(["ldd", path], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
     needs_rpath = False
+
     for line in proc.stdout.decode().splitlines():
         if line.find("=>") == -1:
             log.debug("Skip ldd output line: %s", line)
@@ -371,7 +482,9 @@ def handle_elf(
         log.info("Adjust rpath of %s to %s", path, relpath)
         patch_rpath(path, relpath)
     else:
-        log.info("Do not adjust rpath of %s", path)
+        # No relenv libraries are linked, so RPATH is not needed
+        # Remove any existing RPATH to avoid security/correctness issues
+        remove_rpath(path)
 
 
 def main(
@@ -420,6 +533,7 @@ def main(
                 if path in processed:
                     continue
                 log.debug("Checking %s", path)
+
                 if is_macho(path):
                     log.info("Found Mach-O %s", path)
                     _ = handle_macho(path, libs_dir, rpath_only)

relenv/runtime.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 This code is run when initializing the python interperter in a Relenv environment.
@@ -384,25 +384,30 @@ def install_wheel_wrapper(func: Callable[..., Any]) -> Callable[..., Any]:
             direct_url,
             requested,
         )
-        plat = pathlib.Path(scheme.platlib)
-        rootdir = relenv_root()
-        with open(plat / info_dir / "RECORD") as fp:
-            for line in fp.readlines():
-                file = plat / line.split(",", 1)[0]
-                if not file.exists():
-                    debug(f"Relenv - File not found {file}")
-                    continue
-                if relocate().is_elf(file):
-                    debug(f"Relenv - Found elf {file}")
-                    relocate().handle_elf(plat / file, rootdir / "lib", True, rootdir)
-                elif relocate().is_macho(file):
-                    otool_bin = shutil.which("otool")
-                    if otool_bin:
-                        relocate().handle_macho(str(plat / file), str(rootdir), True)
-                    else:
-                        debug(
-                            "The otool command is not available, please run `xcode-select --install`"
+        if "RELENV_BUILDENV" in os.environ:
+            plat = pathlib.Path(scheme.platlib)
+            rootdir = relenv_root()
+            with open(plat / info_dir / "RECORD") as fp:
+                for line in fp.readlines():
+                    file = plat / line.split(",", 1)[0]
+                    if not file.exists():
+                        debug(f"Relenv - File not found {file}")
+                        continue
+                    if relocate().is_elf(file):
+                        debug(f"Relenv - Found elf {file}")
+                        relocate().handle_elf(
+                            plat / file, rootdir / "lib", True, rootdir
                         )
+                    elif relocate().is_macho(file):
+                        otool_bin = shutil.which("otool")
+                        if otool_bin:
+                            relocate().handle_macho(
+                                str(plat / file), str(rootdir), True
+                            )
+                        else:
+                            debug(
+                                "The otool command is not available, please run `xcode-select --install`"
+                            )
 
     return wrapper
 
@@ -1022,7 +1027,11 @@ def install_cargo_config() -> None:
     cargo_home = dirs.data / "cargo"
     triplet = common().get_triplet()
 
-    toolchain = common().get_toolchain()
+    try:
+        toolchain = common().get_toolchain()
+    except PermissionError:
+        pass
+
     if not toolchain:
         debug("Unable to set CARGO_HOME ppbt package not installed")
         return

relenv/toolchain.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 The ``relenv toolchain`` command.

{relenv-0.22.1.dist-info → relenv-0.22.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.22.1
+Version: 0.22.3
 Project-URL: Source Code, https://github.com/saltstack/relative-environment-for-python
 Project-URL: Documentation, https://relenv.readthedocs.io/en/latest/
 Project-URL: Changelog, https://relenv.readthedocs.io/en/latest/changelog.html

relenv-0.22.3.dist-info/RECORD

@@ -0,0 +1,51 @@
+relenv/__init__.py,sha256=LmJZKtCS7hgyl9VIIT4qiIXj8YX1fJKY0qJUi2UtwgA,325
+relenv/__main__.py,sha256=gLR88_GYmdpyuppoaCq-W0SPetEOQFisQglcQZSGROg,1538
+relenv/buildenv.py,sha256=I7ZyWxO6RZveaCQtqwBPpUW1XdMLwmuPfww5dfzRgwM,4120
+relenv/check.py,sha256=m3KkTS6LQkvRwexVqqGQ4_A7GQU-dAmcF8EQDu_K67c,1133
+relenv/common.py,sha256=zkNmhZr-Dp9-aMPSO2FNiF9vrDqGOCVQgDjIClaDalA,35826
+relenv/create.py,sha256=6Q3m1MkeYyeH48UM6wYhvTlhHRRA73ZA34LfvNe0Ylk,7934
+relenv/fetch.py,sha256=cnkPJiPlttiWOm7Olt4R23RAu_IzzcUsq1H-yHoPbow,2791
+relenv/manifest.py,sha256=xyMHWao_I3j7gCyweES3I50830efacxZI3KumuPfyvU,1057
+relenv/python-versions.json,sha256=vRDqf2sKys1zCnJBzZCCtaUnn5d_Ow6-vj3XcX8y2hE,15827
+relenv/pyversions.py,sha256=euMZcELZsM612c4D3PD9dad4ScFbh0S54dRnbf7BHJg,43032
+relenv/relocate.py,sha256=7usm94iC68AsbFl4IJ6iL_6p4Cb_HUeygAdfLrelCwU,16503
+relenv/runtime.py,sha256=BQ96USuzT04umQjlnDt0johYTsfSVg1IMrfVx8xyfdI,40326
+relenv/toolchain.py,sha256=vbL79grOsThEsstYpx1fZxo3EuliDj5UHcsTpEgdWXo,929
+relenv/_resources/xz/config.h,sha256=2IofvMqyAa8xBaQb6QGStiUugMmjyUCq_Of5drh7fro,4117
+relenv/_resources/xz/crc32_table.c,sha256=L7Loi256KVn8QDuteZVGh5lhH2spTCIDOEc_7tnSJqs,641
+relenv/_resources/xz/crc64_table.c,sha256=--hRinyLqzfn6qTTQfRYBu5osdtucwJjH-lFRE4_xzY,1058
+relenv/_resources/xz/readme.md,sha256=Esbs4NhnCwCpCfk_iRc9AgeiKoqW--HnSME7THjYivA,577
+relenv/_scripts/install_vc_build.ps1,sha256=ir1bcz7rNOuFw4E5_AqBidiKS0SpPViXW7zaanRPCoM,7629
+relenv/build/__init__.py,sha256=0Gre5oainAdkw4Bfc54V4Dwrjz4a5_hiICeEil9D-Cw,6157
+relenv/build/darwin.py,sha256=n1ff-NLFlcN3_fqeJUOPnBC6HODT5Y-gvWjQ3UpdXsE,7136
+relenv/build/linux.py,sha256=UD1b-bTri9lF3iaoibOFO2vzF-6GpubO38_65hvmqtY,26161
+relenv/build/windows.py,sha256=xJ6hoH-MjhMxkS6_Pj5piUGtX41tTRcLkHJuUPWsuQA,16508
+relenv/build/common/__init__.py,sha256=PUAaLAv_1zIGJcGb77jGhSZ1PdawJF6DH4RMRKamh7U,1004
+relenv/build/common/_sysconfigdata_template.py,sha256=NaJkmEKIj8Uhf7Cs82FyrMd2CyZVh-Ri8mE3Pm8jxo0,1955
+relenv/build/common/builder.py,sha256=vFujUxp_cq-miBZD6RLS3yta7158DbiQM0zZg593IDQ,31000
+relenv/build/common/builders.py,sha256=2ajiN3gjjIsQ6TFuEvUCzizL_XKnvx0F9qeuak658ho,4772
+relenv/build/common/download.py,sha256=oFmwYhdRlWvQMPju5ByjCTEsbxmH8ENFXilnZKY7c6U,10479
+relenv/build/common/install.py,sha256=nXFxncnJQKlaell3Ps3LnjmVyGpS8KVuRWSMWrdjJHA,19299
+relenv/build/common/ui.py,sha256=FebuZVSioSHGzTUyOSepFRkZzKN-SxchjXsM5tTLApI,14192
+relenv-0.22.3.dist-info/licenses/LICENSE.md,sha256=T0SRk3vJM1YcAJjDz9vsX9gsCRatAVSBS7LeU0tklRM,9919
+relenv-0.22.3.dist-info/licenses/NOTICE,sha256=Ns0AybPHBsgJKJJfjE6YnGgWEQQ9F7lQ6QNlYLlQT3E,548
+tests/__init__.py,sha256=FdZLbBoaMwwgwYwDI9ozQnuT7FHQ7ae8MhQrsP3tVyQ,70
+tests/_pytest_typing.py,sha256=cOGrU7it8H-2F198AT3bHf1Un8K3PzYvQgDs2PCmFb8,1204
+tests/conftest.py,sha256=tccQCx1DLwftaJCnNLrBkyOmj-a_13nvayUG0KEkSzg,2628
+tests/test_build.py,sha256=WpcO5_C1hxflgz5B0j5mB4v6ZVYZe-t8VOQRiQUUJvI,14827
+tests/test_common.py,sha256=CJPpgP0euIOTFatZ2GmrR-TrJ1d2Hv_W8iaVpkNcuAc,18008
+tests/test_create.py,sha256=iW26qyApMHTfOVa_X2LFsWeBIaaGo1pk8m1xaSOhGdA,6849
+tests/test_downloads.py,sha256=A4caZk4HUdMPPS83toxx7FM6sXy4etxMqeKcDDx-gNc,3528
+tests/test_fips_photon.py,sha256=Y39E1LUndDn3_w4Ir9gkYwxAIHlH8fWPvDI1GRNFh_g,1397
+tests/test_module_imports.py,sha256=erwMhcRK-HMFjmVQoewQSLBtjes2KpZfiFAXgvK_Nt4,1354
+tests/test_pyversions_runtime.py,sha256=CTlGySCCLTuk1I4KFftr2S37gnPvpYubNun8oIRv5BU,8978
+tests/test_relocate.py,sha256=eWgocPhQoU9zAItdLN9yp45j0ura6IPsCmmkuLOOCGU,13402
+tests/test_relocate_module.py,sha256=LslZSILgSAgLZ_wSepIlTFqb7AIkXTNGLWiPiNh5ffE,7802
+tests/test_relocate_tools.py,sha256=bOHFlkebeZFfH0ZF0rg2Agd0unI-7GFHxkzmPL3reIw,5622
+tests/test_runtime.py,sha256=QBIiX89JBJHoNAGqghZFtH6iLzvtKbQyqonNzYWK7gE,74285
+tests/test_verify_build.py,sha256=F34nBwEvUif7XTpLOTD9tSIGz2kzf3egvelpcajnLc0,67927
+relenv-0.22.3.dist-info/METADATA,sha256=6vmSfsbuLB0DSSmXkCIYgzRN-znakGbKDRH3Ds08-a8,1360
+relenv-0.22.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+relenv-0.22.3.dist-info/entry_points.txt,sha256=dO66nWPPWl8ALWWnZFlHKAo6mfPFuQid7purYWL2ddc,48
+relenv-0.22.3.dist-info/top_level.txt,sha256=P4Ro6JLZE53ZdsQ76o2OzBcpb0MaVJmbfr0HAn9WF8M,13
+relenv-0.22.3.dist-info/RECORD,,

{relenv-0.22.1.dist-info → relenv-0.22.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/__init__.py

@@ -1,2 +1,2 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0

tests/_pytest_typing.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Typed helper wrappers for common pytest decorators so mypy understands them.

tests/conftest.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 import logging

tests/test_build.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 import hashlib
 import logging
@@ -154,8 +154,8 @@ def test_get_dependency_version_sqlite_all_platforms() -> None:
 def test_get_dependency_version_xz_all_platforms() -> None:
     """Test getting XZ version for various platforms."""
     # XZ 5.5.0+ removed MSBuild support, so Windows uses a fallback version
-    # and XZ is not in JSON for win32
-    for platform in ["linux", "darwin"]:
+    # BUT we now have XZ 5.8.2 in python-versions.json for win32 too
+    for platform in ["linux", "darwin", "win32"]:
         result = get_dependency_version("xz", platform)
         assert result is not None, f"XZ should be available for {platform}"
         assert isinstance(result, dict)
@@ -166,10 +166,6 @@ def test_get_dependency_version_xz_all_platforms() -> None:
         assert "xz" in result["url"].lower()
         assert isinstance(result["sha256"], str)
 
-    # Windows should return None (uses hardcoded fallback in windows.py)
-    result = get_dependency_version("xz", "win32")
-    assert result is None, "XZ should not be in JSON for win32 (uses fallback)"
-
 
 def test_get_dependency_version_nonexistent() -> None:
     """Test that nonexistent dependency returns None."""

tests/test_common.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 from __future__ import annotations
 
@@ -529,7 +529,7 @@ def test_toolchain_uses_cache_without_relenv_data(
 def test_copyright_headers() -> None:
     """Verify all Python source files have the correct copyright header."""
     expected_header = (
-        "# Copyright 2022-2025 Broadcom.\n" "# SPDX-License-Identifier: Apache-2.0\n"
+        "# Copyright 2022-2026 Broadcom.\n" "# SPDX-License-Identifier: Apache-2.0\n"
     )
 
     # Find all Python files in relenv/ and tests/

tests/test_create.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 import os

tests/test_downloads.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 import pathlib
 import subprocess

tests/test_fips_photon.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 import os

tests/test_module_imports.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 from __future__ import annotations

tests/test_pyversions_runtime.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 from __future__ import annotations
@@ -175,3 +175,80 @@ def test_detect_xz_versions(monkeypatch: pytest.MonkeyPatch) -> None:
     assert "5.6.3" in versions
     # Verify sorting (latest first)
     assert versions[0] == "5.8.1"
+
+
+def test_resolve_python_version_none_defaults_to_latest_310() -> None:
+    """Test that None resolves to the latest 3.10 version."""
+    result = pyversions.resolve_python_version(None)
+    assert result.startswith("3.10.")
+    # Verify it's a valid version in the registry
+    versions = pyversions.python_versions("3.10")
+    assert pyversions.Version(result) in versions
+    # Verify it's the latest 3.10 version
+    latest = sorted(list(versions.keys()))[-1]
+    assert result == str(latest)
+
+
+def test_resolve_python_version_partial_minor() -> None:
+    """Test that partial versions (3.10) resolve to latest micro."""
+    result = pyversions.resolve_python_version("3.10")
+    assert result.startswith("3.10.")
+    # Verify it resolves to the latest micro version
+    versions = pyversions.python_versions("3.10")
+    latest = sorted(list(versions.keys()))[-1]
+    assert result == str(latest)
+
+
+def test_resolve_python_version_different_minors() -> None:
+    """Test resolution works for different minor versions."""
+    result_311 = pyversions.resolve_python_version("3.11")
+    assert result_311.startswith("3.11.")
+
+    result_313 = pyversions.resolve_python_version("3.13")
+    assert result_313.startswith("3.13.")
+
+    # Verify they're different
+    assert result_311 != result_313
+
+    # Verify each is the latest for its minor version
+    versions_311 = pyversions.python_versions("3.11")
+    latest_311 = sorted(list(versions_311.keys()))[-1]
+    assert result_311 == str(latest_311)
+
+    versions_313 = pyversions.python_versions("3.13")
+    latest_313 = sorted(list(versions_313.keys()))[-1]
+    assert result_313 == str(latest_313)
+
+
+def test_resolve_python_version_full_version() -> None:
+    """Test that full versions are validated and returned as-is."""
+    # Get any valid version from the registry
+    all_versions = pyversions.python_versions()
+    some_version = str(next(iter(all_versions)))
+
+    result = pyversions.resolve_python_version(some_version)
+    assert result == some_version
+
+
+def test_resolve_python_version_invalid_full_version() -> None:
+    """Test that invalid full versions raise RuntimeError."""
+    with pytest.raises(RuntimeError, match="Unknown version"):
+        pyversions.resolve_python_version("3.10.999")
+
+
+def test_resolve_python_version_invalid_minor_version() -> None:
+    """Test that invalid minor versions raise RuntimeError."""
+    with pytest.raises(RuntimeError, match="Unknown minor version"):
+        pyversions.resolve_python_version("3.99")
+
+
+def test_resolve_python_version_consistency() -> None:
+    """Test that resolve_python_version is idempotent for full versions."""
+    # Get a valid full version from the registry
+    all_versions = pyversions.python_versions()
+    some_version = str(next(iter(all_versions)))
+
+    # Resolving a full version twice should give the same result
+    first = pyversions.resolve_python_version(some_version)
+    second = pyversions.resolve_python_version(first)
+    assert first == second

tests/test_relocate.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 import pathlib
 import shutil
@@ -16,6 +16,7 @@ from relenv.relocate import (
     main,
     parse_readelf_d,
     patch_rpath,
+    remove_rpath,
 )
 
 pytestmark = [
@@ -276,3 +277,87 @@ def test_handle_elf_rpath_only(tmp_path: pathlib.Path) -> None:
                 assert not (proj.libs_dir / "fake.so.2").exists()
                 assert patch_rpath_mock.call_count == 1
                 patch_rpath_mock.assert_called_with(str(pybin), "$ORIGIN/../lib")
+
+
+def test_remove_rpath_with_existing_rpath(tmp_path: pathlib.Path) -> None:
+    """Test that remove_rpath removes an existing RPATH."""
+    path = str(tmp_path / "test.so")
+    with patch("subprocess.run", return_value=MagicMock(returncode=0)):
+        with patch(
+            "relenv.relocate.parse_rpath",
+            return_value=["/some/absolute/path"],
+        ):
+            assert remove_rpath(path) is True
+
+
+def test_remove_rpath_no_existing_rpath(tmp_path: pathlib.Path) -> None:
+    """Test that remove_rpath succeeds when there's no RPATH to remove."""
+    path = str(tmp_path / "test.so")
+    with patch("relenv.relocate.parse_rpath", return_value=[]):
+        assert remove_rpath(path) is True
+
+
+def test_remove_rpath_failed(tmp_path: pathlib.Path) -> None:
+    """Test that remove_rpath returns False when patchelf fails."""
+    path = str(tmp_path / "test.so")
+    with patch("subprocess.run", return_value=MagicMock(returncode=1)):
+        with patch(
+            "relenv.relocate.parse_rpath",
+            return_value=["/some/absolute/path"],
+        ):
+            assert remove_rpath(path) is False
+
+
+def test_handle_elf_removes_rpath_when_no_relenv_libs(tmp_path: pathlib.Path) -> None:
+    """Test that handle_elf removes RPATH for binaries linking only to system libs."""
+    proj = LinuxProject(tmp_path / "proj")
+    module = proj.add_simple_elf("array.so", "lib", "python3.10", "lib-dynload")
+
+    # ldd output showing only system libraries
+    ldd_ret = """
+    linux-vdso.so.1 => linux-vdso.so.1 (0x0123456789)
+    libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x0123456789)
+    libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x0123456789)
+    """.encode()
+
+    with proj:
+        with patch("subprocess.run", return_value=MagicMock(stdout=ldd_ret)):
+            with patch("relenv.relocate.remove_rpath") as remove_rpath_mock:
+                with patch("relenv.relocate.patch_rpath") as patch_rpath_mock:
+                    handle_elf(
+                        str(module), str(proj.libs_dir), True, str(proj.root_dir)
+                    )
+                    # Should remove RPATH, not patch it
+                    assert remove_rpath_mock.call_count == 1
+                    assert patch_rpath_mock.call_count == 0
+                    remove_rpath_mock.assert_called_with(str(module))
+
+
+def test_handle_elf_sets_rpath_when_relenv_libs_present(tmp_path: pathlib.Path) -> None:
+    """Test that handle_elf sets RPATH for binaries linking to relenv libs."""
+    proj = LinuxProject(tmp_path / "proj")
+    module = proj.add_simple_elf("_ssl.so", "lib", "python3.10", "lib-dynload")
+    libssl = proj.libs_dir / "libssl.so.3"
+    libssl.touch()
+
+    # ldd output showing relenv-built library
+    ldd_ret = """
+    linux-vdso.so.1 => linux-vdso.so.1 (0x0123456789)
+    libssl.so.3 => {libssl} (0x0123456789)
+    libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x0123456789)
+    libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x0123456789)
+    """.format(
+        libssl=libssl
+    ).encode()
+
+    with proj:
+        with patch("subprocess.run", return_value=MagicMock(stdout=ldd_ret)):
+            with patch("relenv.relocate.remove_rpath") as remove_rpath_mock:
+                with patch("relenv.relocate.patch_rpath") as patch_rpath_mock:
+                    handle_elf(
+                        str(module), str(proj.libs_dir), True, str(proj.root_dir)
+                    )
+                    # Should patch RPATH, not remove it
+                    assert patch_rpath_mock.call_count == 1
+                    assert remove_rpath_mock.call_count == 0
+                    patch_rpath_mock.assert_called_with(str(module), "$ORIGIN/../..")

tests/test_relocate_module.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 #
 from __future__ import annotations