pbs-installer 2023.7.13__tar.gz → 2023.7.14__tar.gz

{pbs_installer-2023.7.13 → pbs_installer-2023.7.14}/PKG-INFO

@@ -1,15 +1,22 @@
 Metadata-Version: 2.1
 Name: pbs-installer
-Version: 2023.7.13
+Version: 2023.7.14
 Summary: Installer for Python Build Standalone
 Author-Email: Frost Ming <me@frostming.com>
 License: MIT
 Requires-Python: >=3.7
-Requires-Dist: zstandard>=0.21.0
+Provides-Extra: download
+Provides-Extra: install
+Provides-Extra: all
+Requires-Dist: requests>=2.24.0; extra == "download"
+Requires-Dist: zstandard>=0.21.0; extra == "install"
+Requires-Dist: pbs-installer[download,install]; extra == "all"
 Description-Content-Type: text/markdown
 
 # pbs-installer
 
+[![PyPI](https://img.shields.io/pypi/v/pbs-installer)](https://pypi.org/project/pbs-installer)
+
 An installer for @indygreg's [python-build-standalone](https://github.com/indygreg/python-build-standalone)
 
 The list of python versions are kept sync with the upstream automatically, via a periodically GitHub Action.

{pbs_installer-2023.7.13 → pbs_installer-2023.7.14}/README.md

@@ -1,5 +1,7 @@
 # pbs-installer
 
+[![PyPI](https://img.shields.io/pypi/v/pbs-installer)](https://pypi.org/project/pbs-installer)
+
 An installer for @indygreg's [python-build-standalone](https://github.com/indygreg/python-build-standalone)
 
 The list of python versions are kept sync with the upstream automatically, via a periodically GitHub Action.

{pbs_installer-2023.7.13 → pbs_installer-2023.7.14}/pyproject.toml

@@ -4,17 +4,26 @@ description = "Installer for Python Build Standalone"
 authors = [
     { name = "Frost Ming", email = "me@frostming.com" },
 ]
-dependencies = [
-    "zstandard>=0.21.0",
-]
+dependencies = []
 requires-python = ">=3.7"
 readme = "README.md"
 dynamic = []
-version = "2023.7.13"
+version = "2023.7.14"
 
 [project.license]
 text = "MIT"
 
+[project.optional-dependencies]
+download = [
+    "requests>=2.24.0",
+]
+install = [
+    "zstandard>=0.21.0",
+]
+all = [
+    "pbs-installer[download,install]",
+]
+
 [project.scripts]
 pbs-install = "pbs_installer.__main__:main"
 
@@ -26,7 +35,6 @@ build-backend = "pdm.backend"
 
 [tool.pdm.dev-dependencies]
 dev = [
-    "requests>=2.31.0",
     "black>=23.3.0",
 ]
 
@@ -40,3 +48,10 @@ shell = "./scripts/update.sh"
 line-length = 100
 include = "\\.pyi?$"
 exclude = "/(\n    \\.eggs\n  | \\.git\n  | \\.hg\n  | \\.mypy_cache\n  | \\.tox\n  | \\.venv\n  | build\n  | dist\n  | src/pythonfinder/_vendor\n)\n"
+
+[tool.ruff]
+line-length = 100
+extend-select = [
+    "I",
+]
+target-version = "py310"

{pbs_installer-2023.7.13 → pbs_installer-2023.7.14}/src/pbs_installer/__init__.py

@@ -1,3 +1,10 @@
+"""
+Installer for Python Build Standalone
+
+Author: frostming
+License: MIT
+"""
+
 from ._install import download, get_download_link, install, install_file
 from ._utils import PythonVersion
 

pbs_installer-2023.7.14/src/pbs_installer/__main__.py

@@ -0,0 +1,31 @@
+import logging
+from argparse import ArgumentParser
+
+from ._install import install
+
+
+def _setup_logger(verbose: bool):
+    logger = logging.getLogger("pbs_installer")
+    handler = logging.StreamHandler()
+    handler.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
+    logger.addHandler(handler)
+    logger.setLevel(logging.DEBUG if verbose else logging.WARNING)
+
+
+def main():
+    parser = ArgumentParser("pbs-install", description="Installer for Python Build Standalone")
+    parser.add_argument("version", help="The version of Python to install, e.g. 3.8,3.10.4")
+    parser.add_argument(
+        "--version-dir", help="Install to a subdirectory named by the version", action="store_true"
+    )
+    parser.add_argument("-v", "--verbose", help="Enable verbose logging", action="store_true")
+    parser.add_argument("-d", "--destination", help="The directory to install to", required=True)
+
+    args = parser.parse_args()
+    _setup_logger(args.verbose)
+    install(args.version, args.destination, version_dir=args.version_dir)
+    print("Done!")
+
+
+if __name__ == "__main__":
+    main()

{pbs_installer-2023.7.13 → pbs_installer-2023.7.14}/src/pbs_installer/_install.py

@@ -7,13 +7,12 @@ import tempfile
 from typing import TYPE_CHECKING
 from urllib.parse import unquote
 
-import requests
-
 from ._utils import PythonVersion, get_arch_platform, unpack_tar
 
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
+    import requests
     from _typeshed import StrPath
 
 THIS_ARCH, THIS_PLATFORM = get_arch_platform()
@@ -30,6 +29,11 @@ def _get_headers() -> dict[str, str] | None:
 
 
 def get_download_link(request: str) -> tuple[PythonVersion, str]:
+    """Get the download URL matching the given requested version.
+
+    :param request: The version of Python to install, e.g. 3.8,3.10.4
+    :return: A tuple of the PythonVersion and the download URL
+    """
     from ._versions import PYTHON_VERSIONS
 
     for py_ver, urls in PYTHON_VERSIONS.items():
@@ -55,8 +59,20 @@ def _read_sha256(url: str, sess: requests.Session) -> str | None:
 
 
 def download(url: str, destination: StrPath, session: requests.Session | None = None) -> str:
+    """Download the given url to the destination.
+
+    :param url: The url to download
+    :param destination: The file path to download to
+    :param session: A requests session to use for downloading, or None to create a new one
+    :return: The original filename of the downloaded file
+    """
     logger.debug("Downloading url %s to %s", url, destination)
     filename = unquote(url.rsplit("/")[-1])
+    try:
+        import requests
+    except ModuleNotFoundError:
+        raise RuntimeError("You must install requests to use this function") from None
+
     if session is None:
         session = requests.Session()
 
@@ -79,6 +95,13 @@ def download(url: str, destination: StrPath, session: requests.Session | None =
 def install_file(
     filename: StrPath, destination: StrPath, original_filename: str | None = None
 ) -> None:
+    """Unpack the downloaded file to the destination.
+
+    :param filename: The file to unpack
+    :param destination: The directory to unpack to
+    :param original_filename: The original filename of the file, if it was renamed
+    """
+
     import tarfile
 
     import zstandard as zstd
@@ -105,10 +128,23 @@ def install_file(
             unpack_tar(z, destination, 1)
 
 
-def install(request: str, destination: StrPath, session: requests.Session | None = None) -> None:
-    """Download and install the requested python version"""
+def install(
+    request: str,
+    destination: StrPath,
+    version_dir: bool = False,
+    session: requests.Session | None = None,
+) -> None:
+    """Download and install the requested python version.
+
+    :param request: The version of Python to install, e.g. 3.8,3.10.4
+    :param destination: The directory to install to
+    :param version_dir: Whether to install to a subdirectory named with the python version
+    :param session: A requests session to use for downloading
+    """
     ver, url = get_download_link(request)
-    logger.debug("Installing %s", ver)
+    if version_dir:
+        destination = os.path.join(destination, str(ver))
+    logger.debug("Installing %s to %s", ver, destination)
     os.makedirs(destination, exist_ok=True)
     with tempfile.NamedTemporaryFile() as tf:
         tf.close()

pbs_installer-2023.7.13/src/pbs_installer/__main__.py

@@ -1,17 +0,0 @@
-from argparse import ArgumentParser
-
-from ._install import install
-
-
-def main():
-    parser = ArgumentParser("pbs-install")
-    parser.add_argument("version", help="The version of Python to install, e.g. 3.8,3.10.4")
-    parser.add_argument("-d", "--destination", help="The directory to install to", required=True)
-
-    args = parser.parse_args()
-    install(args.version, args.destination)
-    print("Done!")
-
-
-if __name__ == "__main__":
-    main()