relenv 0.22.1__tar.gz → 0.22.2__tar.gz

{relenv-0.22.1/relenv.egg-info → relenv-0.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.22.1
+Version: 0.22.2
 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.1 → relenv-0.22.2}/relenv/__init__.py

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

{relenv-0.22.1 → relenv-0.22.2}/relenv/__main__.py

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

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 # mypy: ignore-errors
 """
@@ -15,8 +15,13 @@ from types import FrameType, ModuleType
 
 from . import darwin, linux, windows
 from .common import builds
-from ..common import DEFAULT_PYTHON, build_arch
-from ..pyversions import Version, python_versions
+from ..common import build_arch
+from ..pyversions import (
+    Version,
+    get_default_python_version,
+    python_versions,
+    resolve_python_version,
+)
 
 
 def platform_module() -> ModuleType:
@@ -62,11 +67,12 @@ def setup_parser(
             "logs, src, build, and previous tarball."
         ),
     )
+    default_version = get_default_python_version()
     build_subparser.add_argument(
         "--python",
-        default=DEFAULT_PYTHON,
+        default=default_version,
         type=str,
-        help="The python version [default: %(default)s]",
+        help="The python version (e.g., 3.10, 3.13.7) [default: %(default)s]",
     )
     build_subparser.add_argument(
         "--no-cleanup",
@@ -146,27 +152,17 @@ def main(args: argparse.Namespace) -> None:
         print(f"Unsupported platform: {sys.platform}")
         sys.exit(1)
 
-    requested = Version(args.python)
-
-    if requested.micro:
+    try:
+        build_version_str = resolve_python_version(args.python)
+    except RuntimeError as e:
+        print(f"Error: {e}")
         pyversions = python_versions()
-        if requested not in pyversions:
-            print(f"Unknown version {requested}")
-            strversions = "\n".join([str(_) for _ in pyversions])
-            print(f"Known versions are:\n{strversions}")
-            sys.exit(1)
-        build_version = requested
-    else:
-        pyversions = python_versions(args.python)
-        build_version = sorted(list(pyversions.keys()))[-1]
-
-    # print(pyversions)
-    # print(pyversions[0].major)
-    # print(pyversions[0].minor)
-    # print(pyversions[0].micro)
-    # print(pyversions[0].pre)
-    # print(pyversions[0].post)
-    # print(pyversions)
+        strversions = "\n".join([str(_) for _ in pyversions])
+        print(f"Known versions are:\n{strversions}")
+        sys.exit(1)
+
+    build_version = Version(build_version_str)
+    pyversions = python_versions()
     print(f"Build Python {build_version}")
 
     # XXX

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/common/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Build process common methods.

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/common/_sysconfigdata_template.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 # mypy: ignore-errors
 # flake8: noqa

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/common/builder.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Builder and Builds classes for managing the build process.

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/common/builders.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Build functions for specific dependencies.

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/common/download.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Download utility class for fetching build dependencies.

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/common/install.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Installation and finalization functions for the build process.
@@ -427,7 +427,11 @@ def finalize(
     :type logfp: file
     """
     # Run relok8 to make sure the rpaths are relocatable.
-    relenv.relocate.main(dirs.prefix, log_file_name=str(dirs.logs / "relocate.py.log"))
+    # Modules that don't link to relenv libs will have their RPATH removed
+    relenv.relocate.main(
+        dirs.prefix,
+        log_file_name=str(dirs.logs / "relocate.py.log"),
+    )
     # Install relenv-sysconfigdata module
     libdir = pathlib.Path(dirs.prefix) / "lib"
 

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/common/ui.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 UI and build statistics utilities.

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/darwin.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Broadcom.
+# Copyright 2025-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2
 # mypy: ignore-errors
 """

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/linux.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Broadcom.
+# Copyright 2025-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2
 # mypy: ignore-errors
 """

{relenv-0.22.1 → relenv-0.22.2}/relenv/build/windows.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2
 # mypy: ignore-errors
 """

{relenv-0.22.1 → relenv-0.22.2}/relenv/buildenv.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Helper for building libraries to install into a relenv environment.

{relenv-0.22.1 → relenv-0.22.2}/relenv/check.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Check the integrety of a relenv environment.

{relenv-0.22.1 → relenv-0.22.2}/relenv/common.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Common classes and values used around relenv.
@@ -34,14 +34,12 @@ from typing import (
 )
 
 # relenv package version
-__version__ = "0.22.1"
+__version__ = "0.22.2"
 
 log = logging.getLogger(__name__)
 
 MODULE_DIR = pathlib.Path(__file__).resolve().parent
 
-DEFAULT_PYTHON = "3.10.18"
-
 LINUX = "linux"
 WIN32 = "win32"
 DARWIN = "darwin"

{relenv-0.22.1 → relenv-0.22.2}/relenv/create.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 The ``relenv create`` command.
@@ -23,7 +23,11 @@ from .common import (
     format_shebang,
     relative_interpreter,
 )
-from .pyversions import Version, python_versions
+from .pyversions import (
+    get_default_python_version,
+    python_versions,
+    resolve_python_version,
+)
 
 
 @contextlib.contextmanager
@@ -73,11 +77,12 @@ def setup_parser(
         type=str,
         help="The host architecture [default: %(default)s]",
     )
+    default_version = get_default_python_version()
     subparser.add_argument(
         "--python",
-        default="3.10.17",
+        default=default_version,
         type=str,
-        help="The python version [default: %(default)s]",
+        help="The python version (e.g., 3.10, 3.13.7) [default: %(default)s]",
     )
 
 
@@ -106,8 +111,9 @@ def create(
     else:
         writeto = pathlib.Path(name).resolve()
 
+    # Version should be provided by main(), but handle None just in case
     if version is None:
-        version = "3.10.17"
+        version = get_default_python_version()
 
     if pathlib.Path(writeto).exists():
         raise CreateException("The requested path already exists.")
@@ -253,31 +259,17 @@ def main(args: argparse.Namespace) -> None:
             "Warning: Cross compilation support is experimental and is not fully tested or working!"
         )
 
-    # Resolve version (support minor version like "3.12" or full version like "3.12.7")
-    requested = Version(args.python)
-
-    if requested.micro:
-        # Full version specified (e.g., "3.12.7")
+    try:
+        create_version = resolve_python_version(args.python)
+    except RuntimeError as e:
+        print(f"Error: {e}")
         pyversions = python_versions()
-        if requested not in pyversions:
-            print(f"Unknown version {requested}")
-            strversions = "\n".join([str(_) for _ in pyversions])
-            print(f"Known versions are:\n{strversions}")
-            sys.exit(1)
-        create_version = requested
-    else:
-        # Minor version specified (e.g., "3.12"), resolve to latest
-        pyversions = python_versions(args.python)
-        if not pyversions:
-            print(f"Unknown minor version {requested}")
-            all_versions = python_versions()
-            strversions = "\n".join([str(_) for _ in all_versions])
-            print(f"Known versions are:\n{strversions}")
-            sys.exit(1)
-        create_version = sorted(list(pyversions.keys()))[-1]
+        strversions = "\n".join([str(_) for _ in pyversions])
+        print(f"Known versions are:\n{strversions}")
+        sys.exit(1)
 
     try:
-        create(name, arch=args.arch, version=str(create_version))
+        create(name, arch=args.arch, version=create_version)
     except CreateException as exc:
         print(exc)
         sys.exit(1)

{relenv-0.22.1 → relenv-0.22.2}/relenv/fetch.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 # mypy: ignore-errors
 """
@@ -16,7 +16,6 @@ from .build import platform_module
 from .common import (
     CHECK_HOSTS,
     DATA_DIR,
-    DEFAULT_PYTHON,
     __version__,
     build_arch,
     check_url,
@@ -24,6 +23,7 @@ from .common import (
     get_triplet,
     work_dir,
 )
+from .pyversions import get_default_python_version, resolve_python_version
 
 
 def setup_parser(
@@ -45,11 +45,12 @@ def setup_parser(
         type=str,
         help="Architecture to download. [default: %(default)s]",
     )
+    default_version = get_default_python_version()
     subparser.add_argument(
         "--python",
-        default=DEFAULT_PYTHON,
+        default=default_version,
         type=str,
-        help="The python version [default: %(default)s]",
+        help="The python version (e.g., 3.10, 3.13.7) [default: %(default)s]",
     )
 
 
@@ -87,7 +88,8 @@ def main(args: argparse.Namespace) -> None:
     """
     version = os.environ.get("RELENV_FETCH_VERSION", __version__)
     triplet = get_triplet(machine=args.arch)
-    python = args.python
+    # args.python will be the default version or user-specified version
+    python = resolve_python_version(args.python)
     check_hosts = CHECK_HOSTS
     if os.environ.get("RELENV_FETCH_HOST", ""):
         check_hosts = [os.environ["RELENV_FETCH_HOST"]]

{relenv-0.22.1 → relenv-0.22.2}/relenv/manifest.py

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

{relenv-0.22.1 → relenv-0.22.2}/relenv/pyversions.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2.0
 """
 Versions utility.
@@ -947,6 +947,54 @@ def python_versions(
     return {version: pyversions[str(version)] for version in versions}
 
 
+def get_default_python_version() -> str:
+    """
+    Get the default Python version to use when none is specified.
+
+    :return: The default Python version string (e.g., "3.10.19")
+    """
+    # Default to latest 3.10 version
+    pyversions = python_versions("3.10")
+    if not pyversions:
+        raise RuntimeError("No 3.10 versions found")
+    latest = sorted(list(pyversions.keys()))[-1]
+    return str(latest)
+
+
+def resolve_python_version(version_spec: str | None = None) -> str:
+    """
+    Resolve a Python version specification to a full version string.
+
+    If version_spec is None, returns the latest Python 3.10 version.
+    If version_spec is partial (e.g., "3.10"), returns the latest micro version.
+    If version_spec is full (e.g., "3.10.19"), returns it as-is after validation.
+
+    :param version_spec: Version specification (None, "3.10", or "3.10.19")
+    :return: Full version string (e.g., "3.10.19")
+    :raises RuntimeError: If the version is not found
+    """
+    if version_spec is None:
+        # Default to latest 3.10 version
+        return get_default_python_version()
+
+    requested = Version(version_spec)
+
+    if requested.micro is not None:
+        # Full version specified - validate it exists
+        pyversions = python_versions()
+        if requested not in pyversions:
+            raise RuntimeError(f"Unknown version {requested}")
+        return str(requested)
+    else:
+        # Partial version (major.minor) - get latest micro
+        pyversions = python_versions(version_spec)
+        if not pyversions:
+            raise RuntimeError(f"Unknown minor version {requested}")
+        # Return the latest version for this major.minor
+        latest = sorted(list(pyversions.keys()))[-1]
+        return str(latest)
+
+
 def setup_parser(
     subparsers: argparse._SubParsersAction[argparse.ArgumentParser],
 ) -> None:

{relenv-0.22.1 → relenv-0.22.2}/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.
@@ -264,6 +264,34 @@ 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)
+    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,
@@ -325,6 +353,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 +400,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 +451,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-0.22.1 → relenv-0.22.2}/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.

{relenv-0.22.1 → relenv-0.22.2}/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 → relenv-0.22.2/relenv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.22.1
+Version: 0.22.2
 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.1 → relenv-0.22.2}/tests/__init__.py

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

{relenv-0.22.1 → relenv-0.22.2}/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.

{relenv-0.22.1 → relenv-0.22.2}/tests/conftest.py

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

{relenv-0.22.1 → relenv-0.22.2}/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

{relenv-0.22.1 → relenv-0.22.2}/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/

{relenv-0.22.1 → relenv-0.22.2}/tests/test_create.py

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

{relenv-0.22.1 → relenv-0.22.2}/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

{relenv-0.22.1 → relenv-0.22.2}/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

{relenv-0.22.1 → relenv-0.22.2}/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

{relenv-0.22.1 → relenv-0.22.2}/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

{relenv-0.22.1 → relenv-0.22.2}/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/../..")

{relenv-0.22.1 → relenv-0.22.2}/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

{relenv-0.22.1 → relenv-0.22.2}/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

{relenv-0.22.1 → relenv-0.22.2}/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: