pystand 2.9__py3-none-any.whl → 2.11__py3-none-any.whl

{pystand-2.9.dist-info → pystand-2.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.9
+Version: 2.11
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -142,7 +142,7 @@ options:
   -D DISTRIBUTION, --distribution DISTRIBUTION
                         python-build-standalone distribution. Default is
                         "x86_64_v3-unknown-linux-gnu-install_only_stripped for
-                        this host.
+                        this host
   -P PREFIX_DIR, --prefix-dir PREFIX_DIR
                         specify prefix dir for storing versions. Default is
                         "$HOME/.local/share/pystand"

pystand-2.11.dist-info/RECORD

@@ -0,0 +1,6 @@
+pystand.py,sha256=6yFhPrfS19fvrqxZKujgfWvbE0BxlKyexaX2-uXVD8E,36230
+pystand-2.11.dist-info/METADATA,sha256=Be4WcqhlUAXtn_PbXtG1hAlklpEQ3bspNTvhuKuOTJg,24843
+pystand-2.11.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pystand-2.11.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
+pystand-2.11.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
+pystand-2.11.dist-info/RECORD,,

pystand.py

@@ -7,34 +7,28 @@ https://github.com/astral-sh/python-build-standalone.
 '''
 from __future__ import annotations
 
-import json
 import os
 import platform
 import re
 import shlex
 import shutil
-import subprocess
 import sys
-import tarfile
 import time
-import urllib.parse
-import urllib.request
-from argparse import SUPPRESS, ArgumentParser, Namespace
+from argparse import ArgumentParser, Namespace
 from collections import defaultdict
-from datetime import date, datetime, timedelta
+from datetime import date, datetime
 from pathlib import Path
 from typing import Any, Iterable, Iterator
 
 import argcomplete
-import github
 import platformdirs
-import zstandard
 from packaging.version import parse as parse_version
 
 REPO = 'python-build-standalone'
 GITHUB_REPO = f'astral-sh/{REPO}'
 GITHUB_SITE = f'https://github.com/{GITHUB_REPO}'
-LATEST_RELEASE = f'{GITHUB_SITE}/releases.atom'
+LATEST_RELEASES = f'{GITHUB_SITE}/releases.atom'
+LATEST_RELEASE_TAG = f'{GITHUB_SITE}/releases/latest'
 
 # Sample release tag for documentation/usage examples
 SAMPL_RELEASE = '20240415'
@@ -78,10 +72,11 @@ def fmt(version, release) -> str:
     return f'{version} @ {release}'
 
 def get_json(file: Path) -> dict:
+    from json import load
     'Get JSON data from given file'
     try:
         with file.open() as fp:
-            return json.load(fp)
+            return load(fp)
     except Exception:
         pass
 
@@ -89,9 +84,10 @@ def get_json(file: Path) -> dict:
 
 def set_json(file: Path, data: dict) -> str | None:
     'Set JSON data to given file'
+    from json import dump
     try:
         with file.open('w') as fp:
-            json.dump(data, fp, indent=2)
+            dump(data, fp, indent=2)
     except Exception as e:
         return str(e)
 
@@ -108,12 +104,14 @@ def get_gh(args: Namespace) -> Any:
         return get_gh_handle
 
     if args.github_access_token:
-        auth = github.Auth.Token(args.github_access_token)
+        from github.Auth import Token
+        auth = Token(args.github_access_token)
     else:
         auth = None
 
     # Save this handle globally for future use
-    get_gh_handle = github.Github(auth=auth)  # type: ignore
+    from github import Github
+    get_gh_handle = Github(auth=auth)  # type: ignore
     return get_gh_handle
 
 def rm_path(path: Path) -> None:
@@ -127,6 +125,9 @@ def rm_path(path: Path) -> None:
 
 def unpack_zst(filename: str, extract_dir: str) -> None:
     'Unpack a zstandard compressed tar'
+    import tarfile
+
+    import zstandard
     with open(filename, 'rb') as compressed:
         dctx = zstandard.ZstdDecompressor()
         with dctx.stream_reader(compressed) as reader:
@@ -135,19 +136,21 @@ def unpack_zst(filename: str, extract_dir: str) -> None:
 
 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')
     rm_path(tmpdir)
     tmpdir.mkdir(parents=True)
 
-    filename_q = Path(urllib.parse.urlparse(url).path).name
-    filename = urllib.parse.unquote(filename_q)
+    filename_q = Path(urlparse(url).path).name
+    filename = unquote(filename_q)
     cache_file = args._downloads / release / filename
     cache_file.parent.mkdir(parents=True, exist_ok=True)
 
     if not cache_file.exists():
         try:
-            urllib.request.urlretrieve(url, cache_file)
+            urlretrieve(url, cache_file)
         except Exception as e:
             error = f'Failed to fetch "{url}": {e}'
 
@@ -277,10 +280,11 @@ def check_release_tag(release: str) -> str | None:
 # because it is much faster than using the GitHub API, and has no
 # rate-limits.
 def fetch_tags() -> Iterator[tuple[str, str]]:
-    'Fetch the latest release tag from the GitHub release atom feed'
+    'Fetch the latest release tags from the GitHub release atom feed'
     import xml.etree.ElementTree as et
+    from urllib.request import urlopen
     try:
-        with urllib.request.urlopen(LATEST_RELEASE) as url:
+        with urlopen(LATEST_RELEASES) as url:
             data = et.parse(url).getroot()
     except Exception:
         sys.exit('Failed to fetch latest YYYYMMDD release atom file.')
@@ -292,14 +296,16 @@ def fetch_tags() -> Iterator[tuple[str, str]]:
             if tl and dt:
                 yield tl, dt
 
-def fetch_tag_latest(args: Namespace) -> str:
-    now = datetime.now().astimezone()
-    for title, datestr in fetch_tags():
-        timestamp = datetime.fromisoformat(datestr)
-        if now - timestamp >= args._min_release_time:
-            return title
+def fetch_tag_latest() -> str:
+    'Fetch the latest release tag from the GitHub'
+    from urllib.request import urlopen
+    try:
+        with urlopen(LATEST_RELEASE_TAG) as url:
+            data = url.geturl()
+    except Exception:
+        sys.exit('Failed to fetch latest YYYYMMDD release tag.')
 
-    return ''
+    return data.split('/')[-1]
 
 def get_release_tag(args: Namespace) -> str:
     'Return the release tag, or latest if not specified'
@@ -314,7 +320,7 @@ 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(args)):
+    if not (tag := fetch_tag_latest()):
         sys.exit('Latest YYYYMMDD release tag timestamp file is unavailable.')
 
     args._latest_release.write_text(tag + '\n')
@@ -349,7 +355,6 @@ def add_file(files: dict, tag: str, name: str, url: str) -> None:
 
 def get_release_files(args, tag, implementation: str | None = None) -> dict:
     'Return the release files for the given tag'
-    from github.GithubException import UnknownObjectException
     # Look for tag data in our release cache
     jfile = args._releases / tag
     if not (files := get_json(jfile)):
@@ -359,6 +364,7 @@ def get_release_files(args, tag, implementation: str | None = None) -> dict:
             return {}
 
         # Not in cache so fetch it (and also store in cache)
+        from github.GithubException import UnknownObjectException
         gh = get_gh(args)
         try:
             release = gh.get_repo(GITHUB_REPO).get_release(tag)
@@ -489,6 +495,8 @@ def remove(args: Namespace, version: str) -> None:
 
 def strip_binaries(vdir: Path, distribution: str) -> bool:
     'Strip binaries from files in a version directory'
+    from subprocess import DEVNULL, run
+
     # Only run the strip command on Linux hosts and for Linux distributions
     was_stripped = False
     if platform.system() == 'Linux' and '-linux-' in distribution:
@@ -501,7 +509,7 @@ def strip_binaries(vdir: Path, distribution: str) -> bool:
                 if not file.is_symlink() and file.is_file():
                     cmd = f'strip -p --strip-unneeded {file}'.split()
                     try:
-                        subprocess.run(cmd, stderr=subprocess.DEVNULL)
+                        run(cmd, stderr=DEVNULL)
                     except Exception:
                         pass
                     else:
@@ -557,7 +565,7 @@ def main() -> str | None:
     # Set up main/global arguments
     opt.add_argument('-D', '--distribution',
                      help=f'{REPO} distribution. '
-                     f'Default is "{distro_help} for this host.')
+                     f'Default is "{distro_help} for this host')
     opt.add_argument('-P', '--prefix-dir', default=prefix_dir,
                      help='specify prefix dir for storing '
                      'versions. Default is "%(default)s"')
@@ -579,8 +587,6 @@ def main() -> str | None:
                      help='do not strip downloaded binaries')
     opt.add_argument('-V', '--version', action='store_true',
                      help=f'just show {PROG} version')
-    opt.add_argument('--min-release-hours', default=6, type=int,
-                     help=SUPPRESS)
     cmd = opt.add_subparsers(title='Commands', dest='cmdname')
 
     # Add each command ..
@@ -649,7 +655,6 @@ 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._min_release_time = timedelta(hours=args.min_release_hours)
 
     result = args.func(args)
     purge_unused_releases(args)
@@ -896,16 +901,13 @@ class _show(COMMAND):
             args.parser.error('Can not specify --all with --list.')
 
         if args.list:
-            now = datetime.now().astimezone()
             for title, datestr in fetch_tags():
                 if args.re_match and not re.search(args.re_match, title):
                     continue
 
-                tdiff = now - datetime.fromisoformat(datestr)
-                if tdiff < args._min_release_time:
-                    print(title, '(pending)')
-                else:
-                    print(title)
+                dts = datetime.fromisoformat(datestr).astimezone().isoformat(
+                        sep='_', timespec='minutes')
+                print(title, dts)
 
             return
 

pystand-2.9.dist-info/RECORD

@@ -1,6 +0,0 @@
-pystand.py,sha256=bvWRxN3JrIodS5p1pvBy6Lf2evbpACtNp6LPl3XO2xI,36294
-pystand-2.9.dist-info/METADATA,sha256=y5bHXt3xX-XT8Ow7dxQyYI2GhmUlM29V-Eawq7c3uqk,24843
-pystand-2.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pystand-2.9.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
-pystand-2.9.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
-pystand-2.9.dist-info/RECORD,,