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

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/__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/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/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/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/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/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/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/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/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/build/darwin.py

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

relenv/build/linux.py

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

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/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/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/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.0"
+__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"
@@ -68,6 +66,9 @@ def _toolchain_cache_root() -> Optional[pathlib.Path]:
         if override.strip().lower() == "none":
             return None
         return pathlib.Path(override).expanduser()
+    # If RELENV_DATA is set, return None to use DATA_DIR/toolchain
+    if "RELENV_DATA" in os.environ:
+        return None
     cache_home = os.environ.get("XDG_CACHE_HOME")
     if cache_home:
         base = pathlib.Path(cache_home)

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/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/manifest.py

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