pystand 1.0__tar.gz → 1.1__tar.gz

{pystand-1.0 → pystand-1.1}/Makefile

@@ -5,6 +5,7 @@ check:
 	ruff check *.py
 	flake8 *.py
 	mypy *.py
+	pyright *.py
 	vermin -vv --no-tips -i *.py
 
 build:

{pystand-1.0/pystand.egg-info → pystand-1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.0
+Version: 1.1
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -313,6 +313,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.0 → pystand-1.1}/README.md

@@ -297,6 +297,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.0 → pystand-1.1}/pyproject.toml

@@ -47,6 +47,7 @@ linters = [
   "ruff check",
   "flake8",
   "mypy",
+  "pyright",
 ]
 
 # vim:se sw=2:

{pystand-1.0 → pystand-1.1/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.0
+Version: 1.1
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -313,6 +313,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.0 → pystand-1.1}/pystand.py

@@ -18,11 +18,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 +90,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 +113,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 +165,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,7 +192,7 @@ 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
@@ -226,6 +227,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 +448,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
 
@@ -609,7 +653,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)' \