pystand 2.16__tar.gz → 2.17__tar.gz

{pystand-2.16/pystand.egg-info → pystand-2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.16
+Version: 2.17
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -13,7 +13,8 @@ Requires-Dist: argcomplete
 Requires-Dist: packaging
 Requires-Dist: platformdirs
 Requires-Dist: pygithub
-Requires-Dist: zstandard
+Requires-Dist: certifi
+Requires-Dist: zstandard; python_version < "3.14"
 
 ## PYSTAND - Install Python Versions From The Python-Build-Standalone Project
 [![PyPi](https://img.shields.io/pypi/v/pystand)](https://pypi.org/project/pystand/)
@@ -130,7 +131,7 @@ Type `pystand` or `pystand -h` to view the usage summary:
 usage: pystand [-h] [-D DISTRIBUTION] [-P PREFIX_DIR] [-C CACHE_DIR]
                   [-M CACHE_MINUTES] [--purge-days PURGE_DAYS]
                   [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
-                  [-V]
+                  [--cert {system,certifi,none}] [-V]
                   {install,update,upgrade,remove,uninstall,list,show,path,cache} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -162,6 +163,9 @@ options:
                         optional Github access token. Can specify to reduce
                         rate limiting.
   --no-strip            do not strip downloaded binaries
+  --cert {system,certifi,none}
+                        specify which SSL certificates to use for HTTPS
+                        requests. Default="system"
   -V, --version         just show pystand version
 
 Commands:
@@ -598,7 +602,7 @@ either version 3 of the License, or any later version. This program is
 distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License at
-<http://www.gnu.org/licenses/> for more details.
+<https://en.wikipedia.org/wiki/GNU_General_Public_License> for more details.
 
 [pystand]: https://github.com/bulletmark/pystand
 [pbs]: https://github.com/astral-sh/python-build-standalone

{pystand-2.16 → pystand-2.17}/README.md

@@ -113,7 +113,7 @@ Type `pystand` or `pystand -h` to view the usage summary:
 usage: pystand [-h] [-D DISTRIBUTION] [-P PREFIX_DIR] [-C CACHE_DIR]
                   [-M CACHE_MINUTES] [--purge-days PURGE_DAYS]
                   [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
-                  [-V]
+                  [--cert {system,certifi,none}] [-V]
                   {install,update,upgrade,remove,uninstall,list,show,path,cache} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -145,6 +145,9 @@ options:
                         optional Github access token. Can specify to reduce
                         rate limiting.
   --no-strip            do not strip downloaded binaries
+  --cert {system,certifi,none}
+                        specify which SSL certificates to use for HTTPS
+                        requests. Default="system"
   -V, --version         just show pystand version
 
 Commands:
@@ -581,7 +584,7 @@ either version 3 of the License, or any later version. This program is
 distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License at
-<http://www.gnu.org/licenses/> for more details.
+<https://en.wikipedia.org/wiki/GNU_General_Public_License> for more details.
 
 [pystand]: https://github.com/bulletmark/pystand
 [pbs]: https://github.com/astral-sh/python-build-standalone

{pystand-2.16 → pystand-2.17}/pyproject.toml

@@ -18,7 +18,8 @@ dependencies = [
   "packaging",
   "platformdirs",
   "pygithub",
-  "zstandard",
+  "certifi",
+  "zstandard; python_version < '3.14'",
 ]
 
 [[project.authors]]

{pystand-2.16 → pystand-2.17/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.16
+Version: 2.17
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -13,7 +13,8 @@ Requires-Dist: argcomplete
 Requires-Dist: packaging
 Requires-Dist: platformdirs
 Requires-Dist: pygithub
-Requires-Dist: zstandard
+Requires-Dist: certifi
+Requires-Dist: zstandard; python_version < "3.14"
 
 ## PYSTAND - Install Python Versions From The Python-Build-Standalone Project
 [![PyPi](https://img.shields.io/pypi/v/pystand)](https://pypi.org/project/pystand/)
@@ -130,7 +131,7 @@ Type `pystand` or `pystand -h` to view the usage summary:
 usage: pystand [-h] [-D DISTRIBUTION] [-P PREFIX_DIR] [-C CACHE_DIR]
                   [-M CACHE_MINUTES] [--purge-days PURGE_DAYS]
                   [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
-                  [-V]
+                  [--cert {system,certifi,none}] [-V]
                   {install,update,upgrade,remove,uninstall,list,show,path,cache} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -162,6 +163,9 @@ options:
                         optional Github access token. Can specify to reduce
                         rate limiting.
   --no-strip            do not strip downloaded binaries
+  --cert {system,certifi,none}
+                        specify which SSL certificates to use for HTTPS
+                        requests. Default="system"
   -V, --version         just show pystand version
 
 Commands:
@@ -598,7 +602,7 @@ either version 3 of the License, or any later version. This program is
 distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License at
-<http://www.gnu.org/licenses/> for more details.
+<https://en.wikipedia.org/wiki/GNU_General_Public_License> for more details.
 
 [pystand]: https://github.com/bulletmark/pystand
 [pbs]: https://github.com/astral-sh/python-build-standalone

{pystand-2.16 → pystand-2.17}/pystand.egg-info/requires.txt

@@ -2,4 +2,7 @@ argcomplete
 packaging
 platformdirs
 pygithub
+certifi
+
+[:python_version < "3.14"]
 zstandard

{pystand-2.16 → pystand-2.17}/pystand.py

@@ -13,6 +13,7 @@ import platform
 import re
 import shlex
 import shutil
+import ssl
 import sys
 import time
 from argparse import ArgumentParser, Namespace
@@ -20,6 +21,7 @@ from collections import defaultdict
 from datetime import date, datetime
 from pathlib import Path
 from typing import Any, Iterable, Iterator
+from urllib.request import urlopen
 
 import argcomplete
 import platformdirs
@@ -45,10 +47,13 @@ DISTRIBUTIONS = {
     ('Linux', 'armv8l'): 'armv7-unknown-linux-gnueabihf-install_only_stripped',
     ('Darwin', 'x86_64'): 'x86_64-apple-darwin-install_only_stripped',
     ('Darwin', 'aarch64'): 'aarch64-apple-darwin-install_only_stripped',
+    ('Darwin', 'arm64'): 'aarch64-apple-darwin-install_only_stripped',
     ('Windows', 'x86_64'): 'x86_64-pc-windows-msvc-shared-install_only_stripped',
     ('Windows', 'i686'): 'i686-pc-windows-msvc-shared-install_only_stripped',
 }
 
+CERTS = ('system', 'certifi', 'none')
+
 
 def is_admin() -> bool:
     "Check if we are running as root"
@@ -77,7 +82,7 @@ def fmt(version, release) -> str:
     return f'{version} @ {release}'
 
 
-def get_json(file: Path) -> dict:
+def get_json(file: Path) -> dict[str, Any]:
     from json import load
 
     'Get JSON data from given file'
@@ -90,7 +95,7 @@ def get_json(file: Path) -> dict:
     return {}
 
 
-def set_json(file: Path, data: dict) -> str | None:
+def set_json(file: Path, data: dict[str, Any]) -> str | None:
     "Set JSON data to given file"
     from json import dump
 
@@ -138,23 +143,30 @@ def rm_path(path: Path) -> None:
         path.unlink()
 
 
-def unpack_zst(filename: str, extract_dir: str) -> None:
-    "Unpack a zstandard compressed tar"
-    import tarfile
+def register_zst() -> None:
+    "Register custom zstandard unpacker"
+    # Python 3.14+ has built-in support for zstandard so only register custom
+    # handler for earlier versions
+    if sys.version_info < (3, 14):
+
+        def unpack_zst(filename: str, extract_dir: str) -> None:
+            "Unpack a zstandard compressed tar"
+            import tarfile
 
-    import zstandard
+            import zstandard
 
-    with open(filename, 'rb') as compressed:
-        dctx = zstandard.ZstdDecompressor()
-        with dctx.stream_reader(compressed) as reader:
-            with tarfile.open(fileobj=reader, mode='r|') as tar:
-                tar.extractall(path=extract_dir)
+            with open(filename, 'rb') as compressed:
+                dctx = zstandard.ZstdDecompressor()
+                with dctx.stream_reader(compressed) as reader:
+                    with tarfile.open(fileobj=reader, mode='r|') as tar:
+                        tar.extractall(path=extract_dir)
+
+        shutil.register_unpack_format('zst', ['.zst'], unpack_zst)
 
 
 def fetch(args: Namespace, release: str, url: str, tdir: Path) -> str | None:
     "Fetch and unpack a release file"
     from urllib.parse import unquote, urlparse
-    from urllib.request import urlretrieve
 
     error = None
     tmpdir = tdir.with_name(f'{tdir.name}-tmp')
@@ -168,7 +180,8 @@ def fetch(args: Namespace, release: str, url: str, tdir: Path) -> str | None:
 
     if not cache_file.exists():
         try:
-            urlretrieve(url, cache_file)
+            with urlopen(url, context=args._cert) as urlp, cache_file.open('wb') as fp:
+                shutil.copyfileobj(urlp, fp)
         except Exception as e:
             error = f'Failed to fetch "{url}": {e}'
 
@@ -176,7 +189,7 @@ def fetch(args: Namespace, release: str, url: str, tdir: Path) -> str | None:
         rm_path(cache_file)
     else:
         if filename.endswith('.zst'):
-            shutil.register_unpack_format('zst', ['.zst'], unpack_zst)
+            register_zst()
 
         try:
             shutil.unpack_archive(cache_file, tmpdir)
@@ -306,13 +319,12 @@ def check_release_tag(release: str) -> str | None:
 # Note we use a simple direct URL fetch to get the latest tag info
 # because it is much faster than using the GitHub API, and has no
 # rate-limits.
-def fetch_tags() -> Iterator[tuple[str, str]]:
+def fetch_tags(args: Namespace) -> Iterator[tuple[str, str]]:
     "Fetch the latest release tags from the GitHub release atom feed"
     import xml.etree.ElementTree as et
-    from urllib.request import urlopen
 
     try:
-        with urlopen(LATEST_RELEASES) as url:
+        with urlopen(LATEST_RELEASES, context=args._cert) as url:
             data = et.parse(url).getroot()
     except Exception:
         sys.exit('Failed to fetch latest YYYYMMDD release atom file.')
@@ -325,12 +337,10 @@ def fetch_tags() -> Iterator[tuple[str, str]]:
                 yield tl, dt
 
 
-def fetch_tag_latest() -> str:
+def fetch_tag_latest(args: Namespace) -> str:
     "Fetch the latest release tag from the GitHub"
-    from urllib.request import urlopen
-
     try:
-        with urlopen(LATEST_RELEASE_TAG) as url:
+        with urlopen(LATEST_RELEASE_TAG, context=args._cert) as url:
             data = url.geturl()
     except Exception:
         sys.exit('Failed to fetch latest YYYYMMDD release tag.')
@@ -351,14 +361,14 @@ def get_release_tag(args: Namespace) -> str:
         if time.time() < (stat.st_mtime + int(args.cache_minutes * 60)):
             return args._latest_release.read_text().strip()
 
-    if not (tag := fetch_tag_latest()):
+    if not (tag := fetch_tag_latest(args)):
         sys.exit('Latest YYYYMMDD release tag timestamp file is unavailable.')
 
     args._latest_release.write_text(tag + '\n')
     return tag
 
 
-def add_file(files: dict, tag: str, name: str, url: str) -> None:
+def add_file(files: dict[str, Any], tag: str, name: str, url: str) -> None:
     "Extract the implementation, version, and architecture from a filename"
     if name.endswith('.tar.zst'):
         name = name[:-8]
@@ -386,7 +396,7 @@ def add_file(files: dict, tag: str, name: str, url: str) -> None:
     vers[ver][arch] = url
 
 
-def get_release_files(args, tag, implementation: str | None = None) -> dict:
+def get_release_files(args, tag) -> dict[str, Any]:
     "Return the release files for the given tag"
     # Look for tag data in our release cache
     jfile = args._releases / tag
@@ -414,7 +424,7 @@ def get_release_files(args, tag, implementation: str | None = None) -> dict:
         if error := set_json(jfile, files):
             sys.exit(f'Failed to write release {tag} file {jfile}: {error}')
 
-    return files.get(implementation, {}) if implementation else files
+    return files.get(args._implementation, {})
 
 
 def update_version_symlinks(args: Namespace) -> None:
@@ -499,7 +509,7 @@ def purge_unused_releases(args: Namespace) -> None:
 def show_list(args: Namespace) -> None:
     "Show a list of available releases"
     latest = parse_version(get_release_tag(args))
-    releases = {r: d for r, d in fetch_tags()}
+    releases = {r: d for r, d in fetch_tags(args)}
     cached = set(p.name for p in args._releases.iterdir())
     for release in sorted(cached.union(releases)):
         if args.re_match and not re.search(args.re_match, release):
@@ -578,7 +588,7 @@ def strip_binaries(vdir: Path, distribution: str) -> bool:
 
 
 def install(
-    args: Namespace, vdir: Path, release: str, distribution: str, files: dict
+    args: Namespace, vdir: Path, release: str, distribution: str, files: dict[str, Any]
 ) -> str | None:
     "Install a version"
     version = vdir.name
@@ -640,6 +650,21 @@ def show_cache_size(path: Path, args: Namespace) -> None:
         print(f'{size_str}\tTOTAL')
 
 
+def create_cert(option: str) -> ssl.SSLContext | None:
+    "Create an SSL context for HTTPS connections based on the specified certificate store"
+
+    if not option or option == 'system':
+        return None
+
+    if option == 'certifi':
+        import certifi
+
+        return ssl.create_default_context(cafile=certifi.where())
+
+    assert option == 'none'
+    return ssl._create_unverified_context()
+
+
 def main() -> str | None:
     "Main code"
     distro_default = DISTRIBUTIONS.get((platform.system(), platform.machine()))
@@ -700,6 +725,11 @@ def main() -> str | None:
     opt.add_argument(
         '--no-strip', action='store_true', help='do not strip downloaded binaries'
     )
+    opt.add_argument(
+        '--cert',
+        choices=CERTS,
+        help=f'specify which SSL certificates to use for HTTPS requests. Default="{CERTS[0]}"',
+    )
     opt.add_argument(
         '-V', '--version', action='store_true', help=f'just show {PROG} version'
     )
@@ -765,6 +795,7 @@ def main() -> str | None:
     prefix_dir = Path(args.prefix_dir).expanduser().resolve()
     cache_dir = Path(args.cache_dir).expanduser().resolve()
 
+    args._implementation = 'cpython'  # at the moment, only support CPython
     args._distribution = distribution
     args._data = f'{PROG}.json'
 
@@ -776,6 +807,7 @@ def main() -> str | None:
     args._releases = cache_dir / 'releases'
     args._releases.mkdir(parents=True, exist_ok=True)
     args._latest_release = cache_dir / 'latest_release'
+    args._cert = create_cert(args.cert)
 
     result = args.func(args)
     purge_unused_releases(args)
@@ -815,7 +847,7 @@ class install_:
     @staticmethod
     def run(args: Namespace) -> str | None:
         release = get_release_tag(args)
-        files = get_release_files(args, release, 'cpython')
+        files = get_release_files(args, release)
         if not files:
             return f'Release "{release}" not found, or has no compatible files.'
 
@@ -874,7 +906,7 @@ class update_:
     @staticmethod
     def run(args: Namespace) -> str | None:
         release_target = get_release_tag(args)
-        files = get_release_files(args, release_target, 'cpython')
+        files = get_release_files(args, release_target)
         if not files:
             return f'Release "{release_target}" not found.'
 
@@ -991,7 +1023,7 @@ class list_:
     @staticmethod
     def run(args: Namespace) -> str | None:
         release_target = get_release_tag(args)
-        files = get_release_files(args, release_target, 'cpython')
+        files = get_release_files(args, release_target)
         if not files:
             return f'Release "{release_target}" not found.'
 
@@ -1089,7 +1121,7 @@ class show_:
             return None
 
         release = get_release_tag(args)
-        files = get_release_files(args, release, 'cpython')
+        files = get_release_files(args, release)
         if not files:
             return f'Error: release "{release}" not found.'