pystand 2.6__tar.gz → 2.8__tar.gz

{pystand-2.6/pystand.egg-info → pystand-2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.6
+Version: 2.8
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -141,7 +141,7 @@ options:
   -h, --help            show this help message and exit
   -D DISTRIBUTION, --distribution DISTRIBUTION
                         python-build-standalone distribution. Default is
-                        "x86_64-unknown-linux-gnu-install_only_stripped" for
+                        "x86_64_v3-unknown-linux-gnu-install_only_stripped for
                         this host.
   -P PREFIX_DIR, --prefix-dir PREFIX_DIR
                         specify prefix dir for storing versions. Default is
@@ -160,7 +160,7 @@ options:
   --github-access-token GITHUB_ACCESS_TOKEN
                         optional Github access token. Can specify to reduce
                         rate limiting.
-  --no-strip            do strip downloaded binaries
+  --no-strip            do not strip downloaded binaries
   -V, --version         just show pystand version
 
 Commands:
@@ -270,7 +270,7 @@ options:
 ### Command `show`
 
 ```
-usage: pystand show [-h] [-r RELEASE] [-a] [re_match]
+usage: pystand show [-h] [-l | -r RELEASE] [-a] [re_match]
 
 Show versions available from a release. View available releases and their
 distributions at https://github.com/indygreg/python-build-standalone/releases.
@@ -281,6 +281,7 @@ positional arguments:
 
 options:
   -h, --help            show this help message and exit
+  -l, --list            just list recent releases
   -r RELEASE, --release RELEASE
                         python-build-standalone YYYYMMDD release to show (e.g.
                         20240415), default is latest release

{pystand-2.6 → pystand-2.8}/README.md

@@ -124,7 +124,7 @@ options:
   -h, --help            show this help message and exit
   -D DISTRIBUTION, --distribution DISTRIBUTION
                         python-build-standalone distribution. Default is
-                        "x86_64-unknown-linux-gnu-install_only_stripped" for
+                        "x86_64_v3-unknown-linux-gnu-install_only_stripped for
                         this host.
   -P PREFIX_DIR, --prefix-dir PREFIX_DIR
                         specify prefix dir for storing versions. Default is
@@ -143,7 +143,7 @@ options:
   --github-access-token GITHUB_ACCESS_TOKEN
                         optional Github access token. Can specify to reduce
                         rate limiting.
-  --no-strip            do strip downloaded binaries
+  --no-strip            do not strip downloaded binaries
   -V, --version         just show pystand version
 
 Commands:
@@ -253,7 +253,7 @@ options:
 ### Command `show`
 
 ```
-usage: pystand show [-h] [-r RELEASE] [-a] [re_match]
+usage: pystand show [-h] [-l | -r RELEASE] [-a] [re_match]
 
 Show versions available from a release. View available releases and their
 distributions at https://github.com/indygreg/python-build-standalone/releases.
@@ -264,6 +264,7 @@ positional arguments:
 
 options:
   -h, --help            show this help message and exit
+  -l, --list            just list recent releases
   -r RELEASE, --release RELEASE
                         python-build-standalone YYYYMMDD release to show (e.g.
                         20240415), default is latest release

{pystand-2.6 → pystand-2.8/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.6
+Version: 2.8
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -141,7 +141,7 @@ options:
   -h, --help            show this help message and exit
   -D DISTRIBUTION, --distribution DISTRIBUTION
                         python-build-standalone distribution. Default is
-                        "x86_64-unknown-linux-gnu-install_only_stripped" for
+                        "x86_64_v3-unknown-linux-gnu-install_only_stripped for
                         this host.
   -P PREFIX_DIR, --prefix-dir PREFIX_DIR
                         specify prefix dir for storing versions. Default is
@@ -160,7 +160,7 @@ options:
   --github-access-token GITHUB_ACCESS_TOKEN
                         optional Github access token. Can specify to reduce
                         rate limiting.
-  --no-strip            do strip downloaded binaries
+  --no-strip            do not strip downloaded binaries
   -V, --version         just show pystand version
 
 Commands:
@@ -270,7 +270,7 @@ options:
 ### Command `show`
 
 ```
-usage: pystand show [-h] [-r RELEASE] [-a] [re_match]
+usage: pystand show [-h] [-l | -r RELEASE] [-a] [re_match]
 
 Show versions available from a release. View available releases and their
 distributions at https://github.com/indygreg/python-build-standalone/releases.
@@ -281,6 +281,7 @@ positional arguments:
 
 options:
   -h, --help            show this help message and exit
+  -l, --list            just list recent releases
   -r RELEASE, --release RELEASE
                         python-build-standalone YYYYMMDD release to show (e.g.
                         20240415), default is latest release

{pystand-2.6 → pystand-2.8}/pystand.py

@@ -19,22 +19,22 @@ import tarfile
 import time
 import urllib.parse
 import urllib.request
-from argparse import ArgumentParser, Namespace
+from argparse import SUPPRESS, ArgumentParser, Namespace
 from collections import defaultdict
-from datetime import date
+from datetime import date, datetime, timedelta
 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_OWNER = 'indygreg'
 REPO = 'python-build-standalone'
-GITHUB_REPO = f'{REPO_OWNER}/{REPO}'
-LATEST_RELEASE_URL = f'https://raw.githubusercontent.com/{GITHUB_REPO}'\
-        '/latest-release/latest-release.json'
+GITHUB_REPO = f'indygreg/{REPO}'
+GITHUB_SITE = f'https://github.com/{GITHUB_REPO}'
+LATEST_RELEASE = f'{GITHUB_SITE}/releases.atom'
 
 # Sample release tag for documentation/usage examples
 SAMPL_RELEASE = '20240415'
@@ -50,7 +50,8 @@ 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',
-    ('Windows', 'x86_64'): 'x86_64-pc-windows-msvc-shared-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',
 }
 
@@ -106,15 +107,13 @@ def get_gh(args: Namespace) -> Any:
     if get_gh_handle:
         return get_gh_handle
 
-    from github import Github
     if args.github_access_token:
-        from github import Auth
-        auth = Auth.Token(args.github_access_token)
+        auth = github.Auth.Token(args.github_access_token)
     else:
         auth = None
 
     # Save this handle globally for future use
-    get_gh_handle = Github(auth=auth)  # type: ignore
+    get_gh_handle = github.Github(auth=auth)  # type: ignore
     return get_gh_handle
 
 def rm_path(path: Path) -> None:
@@ -274,6 +273,34 @@ def check_release_tag(release: str) -> str | None:
 
     return 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]]:
+    'Fetch the latest release tag from the GitHub release atom feed'
+    import xml.etree.ElementTree as et
+    try:
+        with urllib.request.urlopen(LATEST_RELEASE) as url:
+            data = et.parse(url).getroot()
+    except Exception:
+        sys.exit('Failed to fetch latest YYYYMMDD release atom file.')
+
+    for child in data.iter():
+        for entry in child.findall('{http://www.w3.org/2005/Atom}entry'):
+            tl = entry.findtext('{http://www.w3.org/2005/Atom}title')
+            dt = entry.findtext('{http://www.w3.org/2005/Atom}updated')
+            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
+
+    return ''
+
 def get_release_tag(args: Namespace) -> str:
     'Return the release tag, or latest if not specified'
     if release := args.release:
@@ -287,19 +314,8 @@ 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()
 
-    # Note this simple URL fetch is much faster than using the GitHub
-    # API, and has no rate-limits, so we use it to get the latest
-    # release tag.
-    try:
-        with urllib.request.urlopen(LATEST_RELEASE_URL) as url:
-            data = json.load(url)
-    except Exception:
-        sys.exit('Failed to fetch latest YYYYMMDD release tag.')
-
-    tag = data.get('tag')
-
-    if not tag:
-        sys.exit('Latest YYYYMMDD release tag timestamp file is corrupted.')
+    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
@@ -333,6 +349,7 @@ 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)):
@@ -345,7 +362,7 @@ def get_release_files(args, tag, implementation: str | None = None) -> dict:
         gh = get_gh(args)
         try:
             release = gh.get_repo(GITHUB_REPO).get_release(tag)
-        except Exception:
+        except UnknownObjectException:
             return {}
 
         # Iterate over the release assets and store pertinent files in a
@@ -414,28 +431,28 @@ def update_version_symlinks(args: Namespace) -> None:
 
 def purge_unused_releases(args: Namespace) -> None:
     'Purge old releases that are no longer needed and have expired'
-    releases = set(f.name for f in args._releases.iterdir())
-    keep = set()
+    # Want to keep releases for versions that we currently have installed
+    keep = {r for v in iter_versions(args)
+            if (r := get_json(v / args._data).get('release'))}
+
+    # Add current release to keep list (even if not currently installed)
     if args._latest_release.exists():
         keep.add(args._latest_release.read_text().strip())
 
-    for version in iter_versions(args):
-        if (release := get_json(version / args._data).get('release')):
-            keep.add(release)
-
+    # Purge any release lists that are no longer used and have expired
     now_secs = time.time()
     end_secs = args.purge_days * 86400
-    releases -= keep
-    for release in releases:
-        rdir = args._releases / release
-        if (rdir.stat().st_mtime + end_secs) < now_secs:
-            rdir.unlink()
-        else:
-            keep.add(release)
+    for path in args._releases.iterdir():
+        if path.name not in keep:
+            if (path.stat().st_mtime + end_secs) < now_secs:
+                path.unlink()
+            else:
+                keep.add(path.name)
 
-    downloads = set(f.name for f in args._downloads.iterdir())
-    for release in (downloads - keep):
-        rm_path(args._downloads / release)
+    # Purge any downloads for releases that have expired
+    for path in args._downloads.iterdir():
+        if path.name not in keep:
+            rm_path(path)
 
 class COMMAND:
     'Base class for all commands'
@@ -540,8 +557,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"')
@@ -560,9 +576,11 @@ def main() -> str | None:
                      help='optional Github access token. Can specify to reduce '
                      'rate limiting.')
     opt.add_argument('--no-strip', action='store_true',
-                     help='do strip downloaded binaries')
+                     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 ..
@@ -631,6 +649,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._min_release_time = timedelta(hours=args.min_release_hours)
 
     result = args.func(args)
     purge_unused_releases(args)
@@ -849,17 +868,21 @@ class _list(COMMAND):
 
 @COMMAND.add
 class _show(COMMAND):
-    '''
+    doc = f'''
     Show versions available from a release.
 
     View available releases and their distributions at
-    https://github.com/indygreg/python-build-standalone/releases.
+    {GITHUB_SITE}/releases.
     '''
+
     @staticmethod
     def init(parser: ArgumentParser) -> None:
-        parser.add_argument('-r', '--release',
-                            help=f'{REPO} YYYYMMDD release to show (e.g. '
-                            f'{SAMPL_RELEASE}), default is latest release')
+        group = parser.add_mutually_exclusive_group()
+        group.add_argument('-l', '--list', action='store_true',
+                           help='just list recent releases')
+        group.add_argument('-r', '--release',
+                           help=f'{REPO} YYYYMMDD release to show (e.g. '
+                           f'{SAMPL_RELEASE}), default is latest release')
         parser.add_argument('-a', '--all', action='store_true',
                             help='show all available distributions for '
                             'each version from the release')
@@ -869,6 +892,23 @@ class _show(COMMAND):
 
     @staticmethod
     def run(args: Namespace) -> 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
+
         release = get_release_tag(args)
         files = get_release_files(args, release, 'cpython')
         if not files: