pystand 2.10__tar.gz → 2.12__tar.gz

{pystand-2.10/pystand.egg-info → pystand-2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.10
+Version: 2.12
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -27,8 +27,8 @@ provided:
 |Command  |Description                                                           |
 |---------|----------------------------------------------------------------------|
 |`install`|Install one or more versions from a python-build-standalone release   |
-|`update` |Update one, more, or all versions to another release                  |
-|`remove` |Remove/uninstall one, more, or all versions                           |
+|`update` (or `upgrade`) |Update one, more, or all versions to another release   |
+|`remove` (or `uninstall`) |Remove/uninstall one, more, or all versions          |
 |`list`   |List installed versions and show which have an update available       |
 |`show`   |Show versions available from a release                                |
 |`path`   |Show path prefix to installed version base directory                  |
@@ -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.10 → pystand-2.12}/README.md

@@ -10,8 +10,8 @@ provided:
 |Command  |Description                                                           |
 |---------|----------------------------------------------------------------------|
 |`install`|Install one or more versions from a python-build-standalone release   |
-|`update` |Update one, more, or all versions to another release                  |
-|`remove` |Remove/uninstall one, more, or all versions                           |
+|`update` (or `upgrade`) |Update one, more, or all versions to another release   |
+|`remove` (or `uninstall`) |Remove/uninstall one, more, or all versions          |
 |`list`   |List installed versions and show which have an update available       |
 |`show`   |Show versions available from a release                                |
 |`path`   |Show path prefix to installed version base directory                  |
@@ -125,7 +125,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.10 → pystand-2.12/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.10
+Version: 2.12
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -27,8 +27,8 @@ provided:
 |Command  |Description                                                           |
 |---------|----------------------------------------------------------------------|
 |`install`|Install one or more versions from a python-build-standalone release   |
-|`update` |Update one, more, or all versions to another release                  |
-|`remove` |Remove/uninstall one, more, or all versions                           |
+|`update` (or `upgrade`) |Update one, more, or all versions to another release   |
+|`remove` (or `uninstall`) |Remove/uninstall one, more, or all versions          |
 |`list`   |List installed versions and show which have an update available       |
 |`show`   |Show versions available from a release                                |
 |`path`   |Show path prefix to installed version base directory                  |
@@ -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.10 → pystand-2.12}/pystand.py

@@ -14,9 +14,9 @@ import shlex
 import shutil
 import sys
 import time
-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
 
@@ -27,7 +27,8 @@ 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'
@@ -279,11 +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 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.')
@@ -295,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'
@@ -317,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')
@@ -457,6 +460,30 @@ def purge_unused_releases(args: Namespace) -> None:
         if path.name not in keep:
             rm_path(path)
 
+def show_list(args: Namespace) -> None:
+    'Show a list of available releases'
+    releases = {r: d for r, d in fetch_tags()}
+    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):
+            continue
+
+        if dt_str := releases.get(release):
+            dts = datetime.fromisoformat(dt_str).astimezone().isoformat(
+                    sep='_', timespec='minutes')
+        else:
+            dts = '......................'
+
+        if release in cached:
+            ddir = args._downloads / release
+            count = len(list(ddir.iterdir())) if ddir.exists() else 0
+            app = f' cached + {count} downloaded files' \
+                    if count > 0 else ' cached'
+        else:
+            app = ''
+
+        print(f'{release} {dts}{app}')
+
 class COMMAND:
     'Base class for all commands'
     commands = []
@@ -562,7 +589,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"')
@@ -584,8 +611,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 ..
@@ -654,7 +679,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,28 +920,18 @@ class _show(COMMAND):
                             'matching this regular expression pattern')
 
     @staticmethod
-    def run(args: Namespace) -> None:
+    def run(args: Namespace) -> str | None:
         if args.all and args.list:
             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)
-
-            return
+            show_list(args)
+            return None
 
         release = get_release_tag(args)
         files = get_release_files(args, release, 'cpython')
         if not files:
-            sys.exit(f'Error: release "{release}" not found.')
+            return f'Error: release "{release}" not found.'
 
         installed = {}
         for vdir in iter_versions(args):