pbs-installer 2024.3.27__py3-none-any.whl → 2024.4.24__py3-none-any.whl

pbs_installer/__main__.py

@@ -9,7 +9,7 @@ from ._install import install
 from ._utils import get_available_arch_platforms
 
 
-def _setup_logger(verbose: bool):
+def _setup_logger(verbose: bool) -> None:
     logger = logging.getLogger("pbs_installer")
     handler = logging.StreamHandler()
     handler.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
@@ -46,7 +46,7 @@ class ListAction(Action):
             print(f"- {version}")
 
 
-def main():
+def main() -> None:
     archs, platforms = get_available_arch_platforms()
     parser = ArgumentParser("pbs-install", description="Installer for Python Build Standalone")
     install_group = parser.add_argument_group("Install Arguments")

pbs_installer/_install.py

@@ -4,7 +4,7 @@ import hashlib
 import logging
 import os
 import tempfile
-from typing import TYPE_CHECKING, Optional, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple, cast
 from urllib.parse import unquote
 
 from ._utils import PythonVersion, get_arch_platform
@@ -13,6 +13,10 @@ if TYPE_CHECKING:
     import httpx
     from _typeshed import StrPath
 
+    from typing import Literal
+
+    PythonImplementation = Literal["cpython", "pypy"]
+
 logger = logging.getLogger(__name__)
 THIS_ARCH, THIS_PLATFORM = get_arch_platform()
 PythonFile = Tuple[str, Optional[str]]
@@ -32,7 +36,8 @@ def get_download_link(
     request: str,
     arch: str = THIS_ARCH,
     platform: str = THIS_PLATFORM,
-    implementation: str = "cpython",
+    implementation: PythonImplementation = "cpython",
+    build_dir: bool = False,
 ) -> tuple[PythonVersion, PythonFile]:
     """Get the download URL matching the given requested version.
 
@@ -41,6 +46,7 @@ def get_download_link(
         arch: The architecture to install, e.g. x86_64, arm64
         platform: The platform to install, e.g. linux, macos
         implementation: The implementation of Python to install, allowed values are 'cpython' and 'pypy'
+        build_dir: Whether to include the `build/` directory from indygreg builds
 
     Returns:
         A tuple of the PythonVersion and the download URL
@@ -56,9 +62,11 @@ def get_download_link(
         if not py_ver.matches(request, implementation):
             continue
 
-        matched = urls.get((platform, arch))
+        matched = urls.get((platform, arch, not build_dir))
         if matched is not None:
             return py_ver, matched
+        if build_dir and (matched := urls.get((platform, arch, False))) is not None:
+            return py_ver, matched
     raise ValueError(
         f"Could not find a version matching version={request!r}, implementation={implementation}"
     )
@@ -136,12 +144,13 @@ def install_file(
         destination,
         original_filename,
     )
+    filename = cast(str, filename)
     if original_filename.endswith(".zst"):
-        unpack_zst(filename, destination, build_dir)
+        unpack_zst(filename, destination)
     elif original_filename.endswith(".zip"):
-        unpack_zip(filename, destination, build_dir)
+        unpack_zip(filename, destination)
     else:
-        unpack_tar(filename, destination, build_dir)
+        unpack_tar(filename, destination)
 
 
 def install(
@@ -151,7 +160,7 @@ def install(
     client: httpx.Client | None = None,
     arch: str | None = None,
     platform: str | None = None,
-    implementation: str = "cpython",
+    implementation: PythonImplementation = "cpython",
     build_dir: bool = False,
 ) -> None:
     """Download and install the requested python version.
@@ -181,7 +190,7 @@ def install(
         arch = THIS_ARCH
 
     ver, python_file = get_download_link(
-        request, arch=arch, platform=platform, implementation=implementation
+        request, arch=arch, platform=platform, implementation=implementation, build_dir=build_dir
     )
     if version_dir:
         destination = os.path.join(destination, str(ver))

pbs_installer/_utils.py

@@ -53,36 +53,31 @@ def get_arch_platform() -> tuple[str, str]:
     return ARCH_MAPPING.get(arch, arch), PLATFORM_MAPPING.get(plat, plat)
 
 
-def _unpack_tar(tf: tarfile.TarFile, destination: StrPath, build_dir: bool = False) -> None:
+def _unpack_tar(tf: tarfile.TarFile, destination: StrPath) -> None:
     """Unpack the tarfile to the destination, with the first skip_parts parts of the path removed"""
     members: list[tarfile.TarInfo] = []
-    has_build = any(
-        (p := fn.lstrip("/").split("/")) and len(p) > 1 and p[1] == "build" for fn in tf.getnames()
-    )
     for member in tf.getmembers():
         parts = member.name.lstrip("/").split("/")
-        if build_dir or not has_build:
-            member.name = "/".join(parts[1:])
-        elif len(parts) > 1 and parts[1] == "install":
-            member.name = "/".join(parts[2:])
-        else:
-            continue
+        member.name = "/".join(parts[1:])
         if member.name:
             members.append(member)
     tf.extractall(destination, members=members)
 
 
-def unpack_tar(filename: str, destination: StrPath, build_dir: bool = False) -> None:
+def unpack_tar(filename: str, destination: StrPath) -> None:
     """Unpack the tarfile to the destination"""
     with tarfile.open(filename) as z:
-        _unpack_tar(z, destination, build_dir=build_dir)
+        _unpack_tar(z, destination)
 
 
-def unpack_zst(filename: str, destination: StrPath, build_dir: bool = False) -> None:
+def unpack_zst(filename: str, destination: StrPath) -> None:
     """Unpack the zstd compressed tarfile to the destination"""
     import tempfile
 
-    import zstandard as zstd
+    try:
+        import zstandard as zstd
+    except ModuleNotFoundError:
+        raise ModuleNotFoundError("zstandard is required to unpack .zst files") from None
 
     dctx = zstd.ZstdDecompressor()
     with tempfile.TemporaryFile(suffix=".tar") as ofh:
@@ -90,24 +85,18 @@ def unpack_zst(filename: str, destination: StrPath, build_dir: bool = False) ->
             dctx.copy_stream(ifh, ofh)
         ofh.seek(0)
         with tarfile.open(fileobj=ofh) as z:
-            _unpack_tar(z, destination, build_dir=build_dir)
+            _unpack_tar(z, destination)
 
 
-def unpack_zip(filename: str, destination: StrPath, build_dir: bool = False) -> None:
+def unpack_zip(filename: str, destination: StrPath) -> None:
     """Unpack the zip file to the destination"""
     import zipfile
 
     with zipfile.ZipFile(filename) as z:
         members: list[zipfile.ZipInfo] = []
-        has_build = any(fn.lstrip("/").split("/")[1] == "build" for fn in z.namelist())
         for member in z.infolist():
             parts = member.filename.lstrip("/").split("/")
-            if (build_dir or not has_build) and len(parts) > 1:
-                member.filename = "/".join(parts[1:])
-            elif len(parts) > 1 and parts[1] == "install":
-                member.filename = "/".join(parts[2:])
-            else:
-                continue
+            member.filename = "/".join(parts[1:])
             if member.filename:
                 members.append(member)