relenv 0.22.1__tar.gz → 0.22.3__tar.gz

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

@@ -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.1 → relenv-0.22.3}/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.3}/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.3/relenv/_resources/xz/crc32_table.c

@@ -0,0 +1,22 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+/// \file       crc32_table.c
+/// \brief      Precalculated CRC32 table with correct endianness
+//
+//  Author:     Lasse Collin
+//
+//  This file has been put into the public domain.
+//  You can do whatever you want with this file.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "common.h"
+
+// Having the declaration here silences clang -Wmissing-variable-declarations.
+extern const uint32_t lzma_crc32_table[8][256];
+
+#ifdef WORDS_BIGENDIAN
+#	include "crc32_table_be.h"
+#else
+#	include "crc32_table_le.h"
+#endif

relenv-0.22.3/relenv/_resources/xz/crc64_table.c

@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+/// \file       crc64_table.c
+/// \brief      Precalculated CRC64 table with correct endianness
+//
+//  Author:     Lasse Collin
+//
+//  This file has been put into the public domain.
+//  You can do whatever you want with this file.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "common.h"
+
+
+// FIXME: Compared to crc64_fast.c this has to check for __x86_64__ too
+// so that in 32-bit builds crc64_x86.S won't break due to a missing table.
+#if (defined(__x86_64__) && defined(__SSSE3__) \
+			&& defined(__SSE4_1__) && defined(__PCLMUL__)) \
+		|| (defined(__e2k__) && __iset__ >= 6)
+// No table needed. Use a typedef to avoid an empty translation unit.
+typedef void lzma_crc64_dummy;
+
+#else
+// Having the declaration here silences clang -Wmissing-variable-declarations.
+extern const uint64_t lzma_crc64_table[4][256];
+
+#	if defined(WORDS_BIGENDIAN)
+#		include "crc64_table_be.h"
+#	else
+#		include "crc64_table_le.h"
+#	endif
+#endif

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

@@ -0,0 +1,13 @@
+The config.h file was removed from XZ-Utils starting with version 5.5.0.
+XZ-Utils switched to CMake and removed Visual Studio project files and
+pre-generated headers/sources.
+
+We include the following files from XZ 5.4.7 to maintain compatibility with
+Python's MSBuild-based build system on Windows (PCbuild/liblzma.vcxproj):
+
+- config.h (src/common/config.h)
+- crc32_table.c (src/liblzma/check/crc32_table.c)
+- crc64_table.c (src/liblzma/check/crc64_table.c)
+
+These files are copied into the extracted XZ source directory during the
+Windows build process if they are missing.

{relenv-0.22.1 → relenv-0.22.3}/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.3}/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.3}/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.3}/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.3}/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.3}/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.3}/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.3}/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.3}/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.3}/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.3}/relenv/build/windows.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Broadcom.
+# Copyright 2022-2026 Broadcom.
 # SPDX-License-Identifier: Apache-2
 # mypy: ignore-errors
 """
@@ -197,6 +197,14 @@ def update_xz(dirs: Dirs, env: EnvMapping) -> None:
     config_file_source = dirs.root / "_resources" / "xz" / "config.h"
     if not config_file.exists():
         shutil.copy(str(config_file_source), str(config_file))
+
+    # Also copy crc32_table.c and crc64_table.c which are missing in newer XZ tarballs
+    check_dir = target_dir / "src" / "liblzma" / "check"
+    for filename in ["crc32_table.c", "crc64_table.c"]:
+        target_file = check_dir / filename
+        source_file = dirs.root / "_resources" / "xz" / filename
+        if not target_file.exists():
+            shutil.copy(str(source_file), str(target_file))
     # Update externals.spdx.json with the correct version, url, and hash
     # This became a thing in 3.12
     if env["RELENV_PY_MAJOR_VERSION"] in ["3.12", "3.13", "3.14"]:

{relenv-0.22.1 → relenv-0.22.3}/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.3}/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.3}/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.3"
 
 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.3}/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.3}/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.3}/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.3}/relenv/python-versions.json

@@ -203,6 +203,14 @@
      "linux",
      "darwin"
     ]
+   },
+   "3.6.1": {
+    "url": "https://github.com/openssl/openssl/releases/download/openssl-{version}/openssl-{version}.tar.gz",
+    "sha256": "b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e",
+    "platforms": [
+     "linux",
+     "darwin"
+    ]
    }
   },
   "sqlite": {
@@ -225,6 +233,16 @@
      "darwin",
      "win32"
     ]
+   },
+   "3.51.2.0": {
+    "url": "https://sqlite.org/2026/sqlite-autoconf-{version}.tar.gz",
+    "sha256": "fbd89f866b1403bb66a143065440089dd76100f2238314d92274a082d4f2b7bb",
+    "sqliteversion": "3510200",
+    "platforms": [
+     "linux",
+     "darwin",
+     "win32"
+    ]
    }
   },
   "xz": {
@@ -235,6 +253,15 @@
      "linux",
      "darwin"
     ]
+   },
+   "5.8.2": {
+    "url": "http://tukaani.org/xz/xz-{version}.tar.gz",
+    "sha256": "ce09c50a5962786b83e5da389c90dd2c15ecd0980a258dd01f70f9e7ce58a8f1",
+    "platforms": [
+     "linux",
+     "darwin",
+     "win32"
+    ]
    }
   },
   "libffi": {
@@ -262,6 +289,13 @@
     "platforms": [
      "linux"
     ]
+   },
+   "6.6": {
+    "url": "https://mirrors.ocf.berkeley.edu/gnu/ncurses/ncurses-{version}.tar.gz",
+    "sha256": "355b4cbbed880b0381a04c46617b7656e362585d52e9cf84a67e2009b749ff11",
+    "platforms": [
+     "linux"
+    ]
    }
   },
   "readline": {
@@ -344,6 +378,15 @@
      "darwin",
      "win32"
     ]
+   },
+   "2.7.4": {
+    "url": "https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-{version}.tar.xz",
+    "sha256": "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0",
+    "platforms": [
+     "linux",
+     "darwin",
+     "win32"
+    ]
    }
   }
  }

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