pbs-installer 2024.3.26__tar.gz → 2024.4.1__tar.gz

{pbs_installer-2024.3.26 → pbs_installer-2024.4.1}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.1
 Name: pbs-installer
-Version: 2024.3.26
+Version: 2024.4.1
 Summary: Installer for Python Build Standalone
 Author-Email: Frost Ming <me@frostming.com>
 License: MIT
+Project-URL: Repository, https://github.com/frostming/pbs-installer
+Project-URL: Documentation, http://pbs-installer.readthedocs.io
 Requires-Python: >=3.8
 Provides-Extra: download
 Provides-Extra: install

{pbs_installer-2024.3.26 → pbs_installer-2024.4.1}/pyproject.toml

@@ -7,11 +7,15 @@ authors = [
 requires-python = ">=3.8"
 readme = "README.md"
 dynamic = []
-version = "2024.3.26"
+version = "2024.4.1"
 
 [project.license]
 text = "MIT"
 
+[project.urls]
+Repository = "https://github.com/frostming/pbs-installer"
+Documentation = "http://pbs-installer.readthedocs.io"
+
 [project.optional-dependencies]
 download = [
     "httpx<1,>=0.27.0",

{pbs_installer-2024.3.26 → pbs_installer-2024.4.1}/src/pbs_installer/_install.py

@@ -33,6 +33,7 @@ def get_download_link(
     arch: str = THIS_ARCH,
     platform: str = THIS_PLATFORM,
     implementation: str = "cpython",
+    build_dir: bool = False,
 ) -> tuple[PythonVersion, PythonFile]:
     """Get the download URL matching the given requested version.
 
@@ -41,6 +42,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 +58,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}"
     )
@@ -95,15 +99,13 @@ def download(
     if not checksum:
         logger.warning("No checksum found for %s, this would be insecure", url)
 
-    with (
-        open(destination, "wb") as f,
-        client.stream("GET", url, headers=_get_headers()) as resp,
-    ):
-        resp.raise_for_status()
-        for chunk in resp.iter_bytes(chunk_size=8192):
-            if checksum:
-                hasher.update(chunk)
-            f.write(chunk)
+    with open(destination, "wb") as f:
+        with client.stream("GET", url, headers=_get_headers()) as resp:
+            resp.raise_for_status()
+            for chunk in resp.iter_bytes(chunk_size=8192):
+                if checksum:
+                    hasher.update(chunk)
+                f.write(chunk)
 
     if checksum and hasher.hexdigest() != checksum:
         raise RuntimeError(f"Checksum mismatch. Expected {checksum}, got {hasher.hexdigest()}")
@@ -139,11 +141,11 @@ def install_file(
         original_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(
@@ -183,7 +185,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-2024.3.26 → pbs_installer-2024.4.1}/src/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)