relenv 0.21.2__tar.gz → 0.22.0__tar.gz

relenv-0.22.0/MANIFEST.in

@@ -0,0 +1,3 @@
+recursive-include relenv/_scripts *
+recursive-include relenv/_resources *
+include relenv/python-versions.json

{relenv-0.21.2/relenv.egg-info → relenv-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: relenv
-Version: 0.21.2
+Version: 0.22.0
 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.21.2 → relenv-0.22.0}/pyproject.toml

@@ -21,3 +21,11 @@ ensure_newline_before_comments=true
 
 [tool.pylint]
 max-line-length=120
+
+[tool.mypy]
+python_version = "3.10"
+explicit_package_bases = true
+ignore_missing_imports = true
+namespace_packages = true
+mypy_path = "."
+exclude = "relenv/__main__\\.py"

relenv-0.22.0/relenv/__init__.py

@@ -0,0 +1,15 @@
+# Copyright 2022-2025 Broadcom.
+# SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
+
+import sys
+
+from relenv.common import __version__
+
+MIN_SUPPORTED_PYTHON = (3, 10)
+
+if sys.version_info < MIN_SUPPORTED_PYTHON:
+    raise RuntimeError("Relenv requires Python 3.10 or newer.")
+
+
+__all__ = ["__version__"]

{relenv-0.21.2 → relenv-0.22.0}/relenv/__main__.py

@@ -1,16 +1,20 @@
-# Copyright 2023-2025 Broadcom.
-# SPDX-License-Identifier: Apache-2
+# Copyright 2022-2025 Broadcom.
+# SPDX-License-Identifier: Apache-2.0
 """
 The entrypoint into relenv.
 """
 
+from __future__ import annotations
+
+import argparse
 from argparse import ArgumentParser
+from types import ModuleType
 
 from . import build, buildenv, check, create, fetch, pyversions, toolchain
 from .common import __version__
 
 
-def setup_cli():
+def setup_cli() -> ArgumentParser:
     """
     Build the argparser with its subparsers.
 
@@ -25,9 +29,11 @@ def setup_cli():
         description="Relenv",
     )
     argparser.add_argument("--version", action="version", version=__version__)
-    subparsers = argparser.add_subparsers()
+    subparsers: argparse._SubParsersAction[
+        argparse.ArgumentParser
+    ] = argparser.add_subparsers()
 
-    modules_to_setup = [
+    modules_to_setup: list[ModuleType] = [
         build,
         toolchain,
         create,
@@ -42,7 +48,7 @@ def setup_cli():
     return argparser
 
 
-def main():
+def main() -> None:
     """
     Run the relenv cli and disbatch to subcommands.
     """

relenv-0.22.0/relenv/_resources/xz/config.h

@@ -0,0 +1,148 @@
+/* config.h for compiling liblzma (*not* the whole XZ Utils) with MSVC 2019 */
+
+/* Prefix for symbols exported by tuklib_*.c files */
+#define TUKLIB_SYMBOL_PREFIX lzma_
+
+/* How many MiB of RAM to assume if the real amount cannot be determined. */
+#define ASSUME_RAM 128
+
+/* Define to 1 if crc32 integrity check is enabled. */
+#define HAVE_CHECK_CRC32 1
+
+/* Define to 1 if crc64 integrity check is enabled. */
+#define HAVE_CHECK_CRC64 1
+
+/* Define to 1 if sha256 integrity check is enabled. */
+#define HAVE_CHECK_SHA256 1
+
+/* Define to 1 if any of HAVE_DECODER_foo have been defined. */
+#define HAVE_DECODERS 1
+
+/* Define to 1 if arm decoder is enabled. */
+#define HAVE_DECODER_ARM 1
+
+/* Define to 1 if armthumb decoder is enabled. */
+#define HAVE_DECODER_ARMTHUMB 1
+
+/* Define to 1 if delta decoder is enabled. */
+#define HAVE_DECODER_DELTA 1
+
+/* Define to 1 if ia64 decoder is enabled. */
+#define HAVE_DECODER_IA64 1
+
+/* Define to 1 if lzma1 decoder is enabled. */
+#define HAVE_DECODER_LZMA1 1
+
+/* Define to 1 if lzma2 decoder is enabled. */
+#define HAVE_DECODER_LZMA2 1
+
+/* Define to 1 if powerpc decoder is enabled. */
+#define HAVE_DECODER_POWERPC 1
+
+/* Define to 1 if sparc decoder is enabled. */
+#define HAVE_DECODER_SPARC 1
+
+/* Define to 1 if x86 decoder is enabled. */
+#define HAVE_DECODER_X86 1
+
+/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */
+#define HAVE_ENCODERS 1
+
+/* Define to 1 if arm encoder is enabled. */
+#define HAVE_ENCODER_ARM 1
+
+/* Define to 1 if armthumb encoder is enabled. */
+#define HAVE_ENCODER_ARMTHUMB 1
+
+/* Define to 1 if delta encoder is enabled. */
+#define HAVE_ENCODER_DELTA 1
+
+/* Define to 1 if ia64 encoder is enabled. */
+#define HAVE_ENCODER_IA64 1
+
+/* Define to 1 if lzma1 encoder is enabled. */
+#define HAVE_ENCODER_LZMA1 1
+
+/* Define to 1 if lzma2 encoder is enabled. */
+#define HAVE_ENCODER_LZMA2 1
+
+/* Define to 1 if powerpc encoder is enabled. */
+#define HAVE_ENCODER_POWERPC 1
+
+/* Define to 1 if sparc encoder is enabled. */
+#define HAVE_ENCODER_SPARC 1
+
+/* Define to 1 if x86 encoder is enabled. */
+#define HAVE_ENCODER_X86 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 to enable bt2 match finder. */
+#define HAVE_MF_BT2 1
+
+/* Define to 1 to enable bt3 match finder. */
+#define HAVE_MF_BT3 1
+
+/* Define to 1 to enable bt4 match finder. */
+#define HAVE_MF_BT4 1
+
+/* Define to 1 to enable hc3 match finder. */
+#define HAVE_MF_HC3 1
+
+/* Define to 1 to enable hc4 match finder. */
+#define HAVE_MF_HC4 1
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+   declarations. */
+#define HAVE_VISIBILITY 0
+
+/* Define to 1 if the system has the type `_Bool'. */
+#define HAVE__BOOL 1
+
+#ifdef _M_IX86
+/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This
+   avoids use of features that were added in Windows Vista.
+   This is used for 32-bit x86 builds for compatibility reasons since it
+   makes no measurable difference in performance compared to Vista threads. */
+#define MYTHREAD_WIN95 1
+#else
+/* Define to 1 when using Windows Vista compatible threads. This uses features
+   that are not available on Windows XP. */
+#define MYTHREAD_VISTA 1
+#endif
+
+/* Define to 1 to disable debugging code. */
+#define NDEBUG 1
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "XZ Utils"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "https://tukaani.org/xz/"
+
+/* The size of `size_t', as computed by sizeof. */
+#ifdef _WIN64
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+
+/* Define to 1 if the system supports fast unaligned access to 16-bit and
+   32-bit integers. */
+#define TUKLIB_FAST_UNALIGNED_ACCESS 1

relenv-0.22.0/relenv/_resources/xz/readme.md

@@ -0,0 +1,4 @@
+The config.h file was removed from XZ-Utils tarting with version 5.5.0.
+XZ-Utils seems to build just fine with the config.h file from 5.4.7, so we're
+including it here. This will be copied into the src/windows directory in the
+extracted source for XZ-Utils.

{relenv-0.21.2 → relenv-0.22.0}/relenv/build/__init__.py

@@ -1,22 +1,25 @@
 # Copyright 2022-2025 Broadcom.
-# SPDX-License-Identifier: Apache-2
+# SPDX-License-Identifier: Apache-2.0
+# mypy: ignore-errors
 """
-The ``relenv build`` command.
+Entry points for the ``relenv build`` CLI command.
 """
-import sys
-import random
+from __future__ import annotations
+
+import argparse
 import codecs
+import random
 import signal
+import sys
+from types import FrameType, ModuleType
 
-from . import linux, darwin, windows
-from .common import builds, CHECK_VERSIONS_SUPPORT
-
-from ..pyversions import python_versions, Version
-
-from ..common import build_arch, DEFAULT_PYTHON
+from . import darwin, linux, windows
+from .common import builds
+from ..common import DEFAULT_PYTHON, build_arch
+from ..pyversions import Version, python_versions
 
 
-def platform_module():
+def platform_module() -> ModuleType:
     """
     Return the right module based on `sys.platform`.
     """
@@ -26,9 +29,12 @@ def platform_module():
         return linux
     elif sys.platform == "win32":
         return windows
+    raise RuntimeError(f"Unsupported platform: {sys.platform}")
 
 
-def setup_parser(subparsers):
+def setup_parser(
+    subparsers: argparse._SubParsersAction[argparse.ArgumentParser],
+) -> None:
     """
     Setup the subparser for the ``build`` command.
 
@@ -100,16 +106,16 @@ def setup_parser(subparsers):
         ),
     )
     build_subparser.add_argument(
-        "--check-versions",
+        "--no-pretty",
         default=False,
         action="store_true",
-        help="Check for new version of python and it's depenencies, then exit.",
+        help="Log build output to stdout instead of displaying a simplified status.",
     )
     build_subparser.add_argument(
-        "--no-pretty",
+        "--compact-pretty",
         default=False,
         action="store_true",
-        help="Log build output to stdout instead of displaying a simplified status.",
+        help="Use compact UI without progress bars (simpler, less detailed).",
     )
     build_subparser.add_argument(
         "--log-level",
@@ -124,7 +130,7 @@ def setup_parser(subparsers):
     )
 
 
-def main(args):
+def main(args: argparse.Namespace) -> None:
     """
     The entrypoint to the ``build`` command.
 
@@ -170,18 +176,6 @@ def main(args):
     build.recipies["python"]["download"].version = str(build_version)
     build.recipies["python"]["download"].checksum = pyversions[build_version]
 
-    if args.check_versions:
-        if not CHECK_VERSIONS_SUPPORT:
-            print(
-                "Check versions not supported. Please install the "
-                "packaging and looseversion python packages."
-            )
-            sys.exit(2)
-        if not build.check_versions():
-            sys.exit(1)
-        else:
-            sys.exit(0)
-
     build.set_arch(args.arch)
     if build.build_arch != build.arch:
         print(
@@ -192,10 +186,13 @@ def main(args):
         steps = [_.strip() for _ in args.steps]
     if args.no_pretty:
         show_ui = False
+        expanded_ui = False
     else:
         show_ui = True
+        # Expanded UI is default, --compact-pretty disables it
+        expanded_ui = not args.compact_pretty
 
-    def signal_handler(signal, frame):
+    def signal_handler(_signal: int, frame: FrameType | None) -> None:
         sys.exit(1)
 
     signal.signal(signal.SIGINT, signal_handler)
@@ -209,4 +206,5 @@ def main(args):
         download_only=args.download_only,
         show_ui=show_ui,
         log_level=args.log_level.upper(),
+        expanded_ui=expanded_ui,
     )

relenv-0.22.0/relenv/build/common/__init__.py

@@ -0,0 +1,50 @@
+# Copyright 2022-2025 Broadcom.
+# SPDX-License-Identifier: Apache-2.0
+"""
+Build process common methods.
+
+This module has been split into focused submodules for better organization.
+All public APIs are re-exported here for backward compatibility.
+"""
+from __future__ import annotations
+
+from .builders import (
+    build_openssl,
+    build_openssl_fips,
+    build_sqlite,
+)
+
+from .install import (
+    update_ensurepip,
+    install_runtime,
+    finalize,
+    create_archive,
+    patch_file,
+    update_sbom_checksums,
+)
+
+from .builder import (
+    Dirs,
+    builds,
+    get_dependency_version,
+)
+
+
+__all__ = [
+    # Builder classes and instances
+    "Dirs",
+    "builds",
+    # Dependency version management
+    "get_dependency_version",
+    # Install functions
+    "finalize",
+    "install_runtime",
+    "create_archive",
+    "update_ensurepip",
+    "patch_file",
+    "update_sbom_checksums",
+    # Builders (specific build functions)
+    "build_openssl",
+    "build_openssl_fips",
+    "build_sqlite",
+]

relenv-0.22.0/relenv/build/common/_sysconfigdata_template.py

@@ -0,0 +1,72 @@
+# Copyright 2022-2025 Broadcom.
+# SPDX-License-Identifier: Apache-2.0
+# mypy: ignore-errors
+# flake8: noqa
+"""
+Template for sysconfigdata module generated at build time.
+
+This file is used as a template to generate the _sysconfigdata module
+that CPython uses at runtime. It is copied verbatim (after the header comments)
+into the generated sysconfigdata file.
+
+The _build_time_vars dictionary is written before this content.
+
+Note: mypy and flake8 errors are ignored for this template file as it contains
+code that is valid only in the context of the generated sysconfigdata module
+(e.g., _build_time_vars is injected, RelenvException is in generated context).
+"""
+
+import pathlib
+import sys
+import platform
+import os
+import logging
+
+log = logging.getLogger(__name__)
+
+
+def build_arch():
+    machine = platform.machine()
+    return machine.lower()
+
+
+def get_triplet(machine=None, plat=None):
+    if not plat:
+        plat = sys.platform
+    if not machine:
+        machine = build_arch()
+    if plat == "darwin":
+        return f"{machine}-macos"
+    elif plat == "win32":
+        return f"{machine}-win"
+    elif plat == "linux":
+        return f"{machine}-linux-gnu"
+    else:
+        raise RelenvException("Unknown platform {}".format(platform))
+
+
+pydir = pathlib.Path(__file__).resolve().parent
+if sys.platform == "win32":
+    DEFAULT_DATA_DIR = pathlib.Path.home() / "AppData" / "Local" / "relenv"
+else:
+    DEFAULT_DATA_DIR = pathlib.Path.home() / ".local" / "relenv"
+
+if "RELENV_DATA" in os.environ:
+    DATA_DIR = pathlib.Path(os.environ["RELENV_DATA"]).resolve()
+else:
+    DATA_DIR = DEFAULT_DATA_DIR
+
+buildroot = pydir.parent.parent
+
+toolchain = DATA_DIR / "toolchain" / get_triplet()
+
+build_time_vars = {}
+for key in _build_time_vars:
+    val = _build_time_vars[key]
+    orig = val
+    if isinstance(val, str):
+        val = val.format(
+            BUILDROOT=buildroot,
+            TOOLCHAIN=toolchain,
+        )
+    build_time_vars[key] = val