pystand 1.0__py3-none-any.whl → 1.2__py3-none-any.whl

{pystand-1.0.dist-info → pystand-1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.0
+Version: 1.2
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -18,8 +18,8 @@ Requires-Dist: pygithub
 [![PyPi](https://img.shields.io/pypi/v/pystand)](https://pypi.org/project/pystand/)
 [![AUR](https://img.shields.io/aur/version/pystand)](https://aur.archlinux.org/packages/pystand/)
 
-[`pystand`][pystand] is a command line tool to facilitate the
-installation and update of pre-built Python versions from the
+[`pystand`][pystand] is a command line tool to facilitate the download,
+installation, and update of pre-built Python versions from the
 [`python-build-standalone`][pbs] project. The following commands are
 provided:
 
@@ -120,8 +120,9 @@ usage: pystand [-h] [-D DISTRIBUTION] [-B BASE_DIR] [-C CACHE_MINUTES]
                   [--purge-days PURGE_DAYS] [-V]
                   {install,update,remove,list,show,path} ...
 
-Command line tool to install pre-built Python versions from the python-build-
-standalone project.
+Command line tool to download, install, and update pre-built Python versions
+from the python-build-standalone project at
+https://github.com/indygreg/python-build-standalone.
 
 options:
   -h, --help            show this help message and exit
@@ -181,7 +182,7 @@ options:
 ### Command `update`
 
 ```
-usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [version ...]
+usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [-k] [version ...]
 
 Update one, more, or all versions to another release.
 
@@ -196,6 +197,8 @@ options:
   -a, --all             update ALL versions
   --skip                skip the specified versions when updating all (only
                         can be specified with --all)
+  -k, --keep            keep old version after updating (but only if different
+                        version number)
 ```
 
 ### Command `remove`
@@ -313,6 +316,13 @@ Note, consistent with this, you actually don't need to specify a
 minor version, e.g. `pystand install 3` would also install `3.12.3`
 (assuming `3.12.3` is the latest available version for Python 3).
 
+After installs or updates or removals,`pystand` also maintains symbolic
+links to each latest installed version in it's version directory, e.g. a
+symlink `~/.local/share/pystand/versions/3.12` will be created pointing
+to `~/.local/share/pystand/versions/3.12.3` so that you can optionally
+hard code the symlink directory in places where it can not be set
+dynamically (i.e. where using `pystand path` is not an option).
+
 ## Command Default Options
 
 You can add default global options to a personal configuration file

pystand-1.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+pystand.py,sha256=5X--S1zNpaEauP4FkubSe9J5FM3qQ1OO92ZcPlk__4I,26248
+pystand-1.2.dist-info/METADATA,sha256=V72dn_zsBb0W0ym4lYh3EljiaOqY0s2l9fuszbK_EFg,14304
+pystand-1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pystand-1.2.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
+pystand-1.2.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
+pystand-1.2.dist-info/RECORD,,

pystand.py

@@ -1,8 +1,9 @@
 #!/usr/bin/python3
 # PYTHON_ARGCOMPLETE_OK
 '''
-Command line tool to install pre-built Python versions from the
-python-build-standalone project.
+Command line tool to download, install, and update pre-built Python
+versions from the python-build-standalone project at
+https://github.com/indygreg/python-build-standalone.
 '''
 from __future__ import annotations
 
@@ -18,11 +19,11 @@ import urllib.request
 from argparse import ArgumentParser, Namespace
 from collections import defaultdict
 from pathlib import Path
-from typing import Iterable, Iterator, Optional
+from typing import Any, Iterable, Iterator, Optional
 
 import argcomplete
 import platformdirs
-from packaging.version import Version
+from packaging.version import parse as parse_version
 
 REPO_OWNER = 'indygreg'
 REPO = 'python-build-standalone'
@@ -90,7 +91,7 @@ def set_json(file: Path, data: dict) -> Optional[str]:
 # The gh handle is an opaque github instance handle
 get_gh_handle = None
 
-def get_gh(args: Namespace):
+def get_gh(args: Namespace) -> Any:
     'Return a GitHub handle'
     # The gh handle is a global to lazily create it only if/when needed
     global get_gh_handle
@@ -113,7 +114,7 @@ def rm_path(path: Path) -> None:
 class VersionMatcher:
     'Match a version string to a list of versions'
     def __init__(self, seq: Iterable[str]) -> None:
-        self.seq = sorted(seq, key=Version, reverse=True)
+        self.seq = sorted(seq, key=parse_version, reverse=True)
 
     def match(self, version: str, *,
               upconvert_minor: bool = False) -> Optional[str]:
@@ -165,7 +166,8 @@ def get_version_names(args: Namespace) -> list[str]:
         unknowns = [f'"{u}"' for u in unknown]
         sys.exit(f'Error: version{s} {", ".join(unknowns)} not found.')
 
-    return sorted(all_names - given, key=Version) if args.all else versions
+    return sorted(all_names - given, key=parse_version) \
+            if args.all else versions
 
 def get_latest_release_tag(args: Namespace) -> str:
     'Return the latest release tag'
@@ -191,11 +193,16 @@ def get_latest_release_tag(args: Namespace) -> str:
     args._latest_release.write_text(tag + '\n')
     return tag
 
-def get_release_files(args, tag, implementation: str = None) -> dict:
+def get_release_files(args, tag, implementation: Optional[str] = None) -> dict:
     'Return the release files for the given tag'
     # Look for tag data in our release cache
     jfile = args._releases / tag
     if not (files := get_json(jfile)):
+
+        # May have read this release before but it has no assets
+        if jfile.exists():
+            return {}
+
         # Not in cache so fetch it (and also store in cache)
         gh = get_gh(args)
         try:
@@ -226,6 +233,48 @@ def get_release_files(args, tag, implementation: str = None) -> dict:
 
     return files.get(implementation, {}) if implementation else files
 
+def update_version_symlinks(args: Namespace) -> None:
+    'Create/update symlinks pointing to latest version'
+    base = args._versions
+    if not base.exists():
+        return
+
+    # Record of all the existing symlinks and version dirs
+    oldlinks = {}
+    vers = []
+    for path in base.iterdir():
+        if not path.name.startswith('.'):
+            if path.is_symlink():
+                oldlinks[path.name] = os.readlink(str(path))
+            else:
+                vers.append(path)
+
+    # Create a map of all the new major version links
+    newlinks_all = defaultdict(list)
+    for path in vers:
+        namevers = path.name
+        while '.' in namevers[:-1]:
+            namevers_major = namevers.rsplit('.', maxsplit=1)[0]
+            newlinks_all[namevers_major].append(namevers)
+            namevers = namevers_major
+
+    newlinks = {k: sorted(v, key=parse_version)[-1] for k, v in
+                newlinks_all.items()}
+
+    # Remove all old or invalid existing links
+    for name, tgt in oldlinks.items():
+        new_tgt = newlinks.get(name)
+        if not new_tgt or new_tgt != tgt:
+            path = Path(base / name)
+            path.unlink()
+
+    # Create all needed new links
+    for name, tgt in newlinks.items():
+        old_tgt = oldlinks.get(name)
+        if not old_tgt or old_tgt != tgt:
+            path = Path(base / name)
+            path.symlink_to(tgt, target_is_directory=True)
+
 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())
@@ -405,6 +454,7 @@ def main() -> Optional[str]:
     args._releases.mkdir(parents=True, exist_ok=True)
 
     result = args.func(args)
+    update_version_symlinks(args)
     purge_unused_releases(args)
     return result
 
@@ -428,7 +478,7 @@ class _install(COMMAND):
         release = args.release or get_latest_release_tag(args)
         files = get_release_files(args, release, 'cpython')
         if not files:
-            return f'Release "{release}" not found.'
+            return f'Release "{release}" not found, or has no compatible files.'
 
         matcher = VersionMatcher(files)
         for version in args.version:
@@ -460,6 +510,9 @@ class _update(COMMAND):
         parser.add_argument('--skip', action='store_true',
                             help='skip the specified versions when '
                             'updating all (only can be specified with --all)')
+        parser.add_argument('-k', '--keep', action='store_true',
+                            help='keep old version after updating (but only '
+                            'if different version number)')
         parser.add_argument('version', nargs='*',
                             help='version to update (or to skip for '
                             '--all --skip)')
@@ -481,14 +534,21 @@ class _update(COMMAND):
                 continue
 
             nextver = matcher.match(version, upconvert_minor=True)
-            new_vdir = args._versions / nextver
-            if nextver != version and new_vdir.exists():
-                continue
 
             distribution = data.get('distribution')
             if not distribution or distribution not in files.get(nextver, {}):
                 continue
 
+            if nextver == version and args.keep:
+                print(f'Error: {fmt(version, release)} would not be kept '
+                      f'if update to {fmt(nextver, release_target)} '
+                      f'distribution="{distribution}"', file=sys.stderr)
+                continue
+
+            new_vdir = args._versions / nextver
+            if nextver != version and new_vdir.exists():
+                continue
+
             print(f'{fmt(version, release)} updating to '
                   f'{fmt(nextver, release_target)} '
                   f'distribution="{distribution}" ..')
@@ -497,7 +557,7 @@ class _update(COMMAND):
                                 files):
                 return error
 
-            if nextver != version:
+            if nextver != version and not args.keep:
                 remove(args, version)
 
 @COMMAND.add
@@ -609,7 +669,7 @@ class _show(COMMAND):
                 installed[vdir.name] = distro
 
         installable = False
-        for version in sorted(files, key=Version):
+        for version in sorted(files, key=parse_version):
             installed_distribution = installed.get(version)
             for distribution in files[version]:
                 app = ' (installed)' \

pystand-1.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-pystand.py,sha256=fWBjn-KMOGv-oR3Q2XYfaKE5ZtHUDXRq2Kx__mnd6Es,23997
-pystand-1.0.dist-info/METADATA,sha256=_GdO43TfIj8kSEHfU2suk-xq0Dh07rKsa29Z6vIfnhA,13674
-pystand-1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pystand-1.0.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
-pystand-1.0.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
-pystand-1.0.dist-info/RECORD,,