pystand 2.28__tar.gz → 2.30__tar.gz

{pystand-2.28/pystand.egg-info → pystand-2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.28
+Version: 2.30
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -26,17 +26,17 @@ installation, and update of pre-built Python versions from the
 [`python-build-standalone`][pbs] project. The following commands are
 provided:
 
- |Command|Description|
- |---------|--------------------------------------------------------------------|
- |`install`|Install one, more, or all versions from a python-build-standalone release.|
- |`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.|
- |`cache`|Show size of release download caches.|
- |`uv`|Run a uv command using a version of python installed by pystand.|
- |`uvx`|Run a program using uvx and a version of python installed by pystand.|
+  |Command  |Aliases  |Description |
+  |---------|---------|------------|
+  |`install`|`i`      |Install one, more, or all versions from a python-build-standalone release|
+  |`update` |`u`, `up`|Update one, more, or all versions to another releas |
+  |`remove` |`r`, `rm`|Remove/uninstall one, more, or all versions|
+  |`list`   |`l`      |List installed versions and show which have an update available|
+  |`show`   |`s`      |Show versions available from a release|
+  |`path`   |`p`      |Show path prefix to installed version base directory|
+  |`cache`  |`c`      |Show size of release download caches|
+  |`uv`     |         |Run a uv command using a version of python installed by pystand|
+  |`uvx`    |         |Run a program using uvx and a version of python installed by pystand|
 
 By default, Python versions are sourced from the latest
 `python-build-standalone` [release][pbs-rel] available (e.g.
@@ -144,7 +144,7 @@ usage: pystand [-h] [-D DISTRIBUTION] [-P PREFIX_DIR] [-C CACHE_DIR]
                   [-M CACHE_MINUTES] [--purge-days PURGE_DAYS]
                   [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
                   [--no-color] [--cert {system,certifi,none}] [-V]
-                  {install,i,update,u,upgrade,remove,r,uninstall,list,l,show,s,path,p,cache,c,uv,uvx} ...
+                  {install,i,update,u,up,remove,r,rm,list,l,show,s,path,p,cache,c,uv,uvx} ...
 
 Command line tool to download, install, and update pre-built Python versions
 from the python-build-standalone project at https://github.com/astral-
@@ -184,13 +184,11 @@ options:
   -V, --version         just show pystand version
 
 Commands:
-  {install,i,update,u,upgrade,remove,r,uninstall,list,l,show,s,path,p,cache,c,uv,uvx}
+  {install,i,update,u,up,remove,r,rm,list,l,show,s,path,p,cache,c,uv,uvx}
     install (i)         Install one, more, or all versions from a python-
                         build-standalone release.
-    update (u, upgrade)
-                        Update one, more, or all versions to another release.
-    remove (r, uninstall)
-                        Remove/uninstall one, more, or all versions.
+    update (u, up)      Update one, more, or all versions to another release.
+    remove (r, rm)      Remove/uninstall one, more, or all versions.
     list (l)            List installed versions and show which have an update
                         available.
     show (s)            Show versions available from a release.
@@ -258,7 +256,7 @@ options:
   -k, --keep            keep old version after updating (but only if different
                         version number)
 
-aliases: u, upgrade
+aliases: u, up
 ```
 
 ### Command `remove`
@@ -280,7 +278,7 @@ options:
                         only remove versions if from specified YYYMMDD release
                         (e.g. 20240415)
 
-aliases: r, uninstall
+aliases: r, rm
 ```
 
 ### Command `list`
@@ -351,7 +349,7 @@ aliases: p
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [-r | -R] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r | -R] [-f] [release ...]
 
 Show size of release download caches.
 
@@ -367,6 +365,8 @@ options:
   -R, --remove-all-unused
                         remove caches for all currently unused releases
                         instead of showing size
+  -f, --file            also remove cached release file list when removing
+                        download caches
 
 aliases: c
 ```

{pystand-2.28 → pystand-2.30}/README.md

@@ -7,17 +7,17 @@ installation, and update of pre-built Python versions from the
 [`python-build-standalone`][pbs] project. The following commands are
 provided:
 
- |Command|Description|
- |---------|--------------------------------------------------------------------|
- |`install`|Install one, more, or all versions from a python-build-standalone release.|
- |`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.|
- |`cache`|Show size of release download caches.|
- |`uv`|Run a uv command using a version of python installed by pystand.|
- |`uvx`|Run a program using uvx and a version of python installed by pystand.|
+  |Command  |Aliases  |Description |
+  |---------|---------|------------|
+  |`install`|`i`      |Install one, more, or all versions from a python-build-standalone release|
+  |`update` |`u`, `up`|Update one, more, or all versions to another releas |
+  |`remove` |`r`, `rm`|Remove/uninstall one, more, or all versions|
+  |`list`   |`l`      |List installed versions and show which have an update available|
+  |`show`   |`s`      |Show versions available from a release|
+  |`path`   |`p`      |Show path prefix to installed version base directory|
+  |`cache`  |`c`      |Show size of release download caches|
+  |`uv`     |         |Run a uv command using a version of python installed by pystand|
+  |`uvx`    |         |Run a program using uvx and a version of python installed by pystand|
 
 By default, Python versions are sourced from the latest
 `python-build-standalone` [release][pbs-rel] available (e.g.
@@ -125,7 +125,7 @@ usage: pystand [-h] [-D DISTRIBUTION] [-P PREFIX_DIR] [-C CACHE_DIR]
                   [-M CACHE_MINUTES] [--purge-days PURGE_DAYS]
                   [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
                   [--no-color] [--cert {system,certifi,none}] [-V]
-                  {install,i,update,u,upgrade,remove,r,uninstall,list,l,show,s,path,p,cache,c,uv,uvx} ...
+                  {install,i,update,u,up,remove,r,rm,list,l,show,s,path,p,cache,c,uv,uvx} ...
 
 Command line tool to download, install, and update pre-built Python versions
 from the python-build-standalone project at https://github.com/astral-
@@ -165,13 +165,11 @@ options:
   -V, --version         just show pystand version
 
 Commands:
-  {install,i,update,u,upgrade,remove,r,uninstall,list,l,show,s,path,p,cache,c,uv,uvx}
+  {install,i,update,u,up,remove,r,rm,list,l,show,s,path,p,cache,c,uv,uvx}
     install (i)         Install one, more, or all versions from a python-
                         build-standalone release.
-    update (u, upgrade)
-                        Update one, more, or all versions to another release.
-    remove (r, uninstall)
-                        Remove/uninstall one, more, or all versions.
+    update (u, up)      Update one, more, or all versions to another release.
+    remove (r, rm)      Remove/uninstall one, more, or all versions.
     list (l)            List installed versions and show which have an update
                         available.
     show (s)            Show versions available from a release.
@@ -239,7 +237,7 @@ options:
   -k, --keep            keep old version after updating (but only if different
                         version number)
 
-aliases: u, upgrade
+aliases: u, up
 ```
 
 ### Command `remove`
@@ -261,7 +259,7 @@ options:
                         only remove versions if from specified YYYMMDD release
                         (e.g. 20240415)
 
-aliases: r, uninstall
+aliases: r, rm
 ```
 
 ### Command `list`
@@ -332,7 +330,7 @@ aliases: p
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [-r | -R] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r | -R] [-f] [release ...]
 
 Show size of release download caches.
 
@@ -348,6 +346,8 @@ options:
   -R, --remove-all-unused
                         remove caches for all currently unused releases
                         instead of showing size
+  -f, --file            also remove cached release file list when removing
+                        download caches
 
 aliases: c
 ```

{pystand-2.28 → pystand-2.30/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.28
+Version: 2.30
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -26,17 +26,17 @@ installation, and update of pre-built Python versions from the
 [`python-build-standalone`][pbs] project. The following commands are
 provided:
 
- |Command|Description|
- |---------|--------------------------------------------------------------------|
- |`install`|Install one, more, or all versions from a python-build-standalone release.|
- |`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.|
- |`cache`|Show size of release download caches.|
- |`uv`|Run a uv command using a version of python installed by pystand.|
- |`uvx`|Run a program using uvx and a version of python installed by pystand.|
+  |Command  |Aliases  |Description |
+  |---------|---------|------------|
+  |`install`|`i`      |Install one, more, or all versions from a python-build-standalone release|
+  |`update` |`u`, `up`|Update one, more, or all versions to another releas |
+  |`remove` |`r`, `rm`|Remove/uninstall one, more, or all versions|
+  |`list`   |`l`      |List installed versions and show which have an update available|
+  |`show`   |`s`      |Show versions available from a release|
+  |`path`   |`p`      |Show path prefix to installed version base directory|
+  |`cache`  |`c`      |Show size of release download caches|
+  |`uv`     |         |Run a uv command using a version of python installed by pystand|
+  |`uvx`    |         |Run a program using uvx and a version of python installed by pystand|
 
 By default, Python versions are sourced from the latest
 `python-build-standalone` [release][pbs-rel] available (e.g.
@@ -144,7 +144,7 @@ usage: pystand [-h] [-D DISTRIBUTION] [-P PREFIX_DIR] [-C CACHE_DIR]
                   [-M CACHE_MINUTES] [--purge-days PURGE_DAYS]
                   [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
                   [--no-color] [--cert {system,certifi,none}] [-V]
-                  {install,i,update,u,upgrade,remove,r,uninstall,list,l,show,s,path,p,cache,c,uv,uvx} ...
+                  {install,i,update,u,up,remove,r,rm,list,l,show,s,path,p,cache,c,uv,uvx} ...
 
 Command line tool to download, install, and update pre-built Python versions
 from the python-build-standalone project at https://github.com/astral-
@@ -184,13 +184,11 @@ options:
   -V, --version         just show pystand version
 
 Commands:
-  {install,i,update,u,upgrade,remove,r,uninstall,list,l,show,s,path,p,cache,c,uv,uvx}
+  {install,i,update,u,up,remove,r,rm,list,l,show,s,path,p,cache,c,uv,uvx}
     install (i)         Install one, more, or all versions from a python-
                         build-standalone release.
-    update (u, upgrade)
-                        Update one, more, or all versions to another release.
-    remove (r, uninstall)
-                        Remove/uninstall one, more, or all versions.
+    update (u, up)      Update one, more, or all versions to another release.
+    remove (r, rm)      Remove/uninstall one, more, or all versions.
     list (l)            List installed versions and show which have an update
                         available.
     show (s)            Show versions available from a release.
@@ -258,7 +256,7 @@ options:
   -k, --keep            keep old version after updating (but only if different
                         version number)
 
-aliases: u, upgrade
+aliases: u, up
 ```
 
 ### Command `remove`
@@ -280,7 +278,7 @@ options:
                         only remove versions if from specified YYYMMDD release
                         (e.g. 20240415)
 
-aliases: r, uninstall
+aliases: r, rm
 ```
 
 ### Command `list`
@@ -351,7 +349,7 @@ aliases: p
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [-r | -R] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r | -R] [-f] [release ...]
 
 Show size of release download caches.
 
@@ -367,6 +365,8 @@ options:
   -R, --remove-all-unused
                         remove caches for all currently unused releases
                         instead of showing size
+  -f, --file            also remove cached release file list when removing
+                        download caches
 
 aliases: c
 ```

{pystand-2.28 → pystand-2.30}/pystand.py

@@ -388,10 +388,11 @@ def check_release_tag(release: str) -> str | 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(args: Namespace) -> Iterator[tuple[str, str]]:
+def fetch_tags(args: Namespace) -> dict[str, str]:
     "Fetch the latest release tags from the GitHub release atom feed"
     import xml.etree.ElementTree as et
 
+    tags = {}
     try:
         with urlopen(LATEST_RELEASES, context=args._cert) as url:
             data = et.parse(url).getroot()
@@ -403,7 +404,9 @@ def fetch_tags(args: Namespace) -> Iterator[tuple[str, str]]:
             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
+                tags[tl.split(':', 1)[0]] = dt
+
+    return tags
 
 
 def fetch_tag_latest(args: Namespace) -> str:
@@ -590,7 +593,7 @@ def purge_unused_releases(args: Namespace) -> None:
 def show_list(args: Namespace) -> None:
     "Show a list of available releases"
     latest = parse_version(args._release)
-    releases = {r: d for r, d in fetch_tags(args)}
+    releases = fetch_tags(args)
     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):
@@ -600,6 +603,7 @@ def show_list(args: Namespace) -> None:
         try:
             this_version = parse_version(release)
         except InvalidVersion:
+            print(f'Invalid release tag: "{release}"', file=sys.stderr)
             continue
 
         if dt_str := releases.get(release):
@@ -1022,7 +1026,7 @@ class install_:
 class update_:
     "Update one, more, or all versions to another release."
 
-    aliases = ['u', 'upgrade']
+    aliases = ['u', 'up']
 
     @staticmethod
     def init(parser: ArgumentParser) -> None:
@@ -1109,7 +1113,7 @@ class update_:
 class remove_:
     "Remove/uninstall one, more, or all versions."
 
-    aliases = ['r', 'uninstall']
+    aliases = ['r', 'rm']
 
     @staticmethod
     def init(parser: ArgumentParser) -> None:
@@ -1394,12 +1398,21 @@ class cache_:
             action='store_true',
             help='remove caches for all currently unused releases instead of showing size',
         )
+        parser.add_argument(
+            '-f',
+            '--file',
+            action='store_true',
+            help='also remove cached release file list when removing download caches',
+        )
         parser.add_argument(
             'release', nargs='*', help='show cache size for given release[s] only'
         )
 
     @staticmethod
     def run(args: Namespace) -> str | None:
+        if args.file and not (args.remove or args.remove_all_unused):
+            args.parser.error('The -f/--file option only applies when removing.')
+
         if args.remove_all_unused:
             if args.release:
                 args.parser.error(
@@ -1407,31 +1420,49 @@ class cache_:
                 )
 
             keep = keeplist(args)
-            for release in args._downloads.iterdir():
-                if (name := release.name) not in keep and name.isdigit():
-                    if rm_path(release):
-                        print(f'Removed cache for release {name}.')
+            releases = set(
+                p.name for p in args._downloads.iterdir() if p.name.isdigit()
+            )
+            releases.update(
+                p.name for p in args._releases.iterdir() if p.name.isdigit()
+            )
+            for release in sorted(releases):
+                if release not in keep:
+                    if rm_path(args._downloads / release):
+                        print(f'Removed download cache for release {release}.')
+                    if args.file and rm_path(args._releases / release):
+                        print(f'Removed file list cache for release {release}.')
 
         elif args.release:
             for release in args.release:
                 # Allow user to include cache path in release name
                 path = (args._downloads / release).expanduser()
+                release = path.name
 
-                if err := check_release_tag(path.name):
+                if err := check_release_tag(release):
                     return err
 
-                if not path.exists():
-                    return f'No cache for release {release}.'
-
                 if args.remove:
-                    if rm_path(args._downloads / release):
-                        print(f'Removed cache for release {release.name}.')
+                    removed = False
+                    if rm_path(path):
+                        print(f'Removed download cache for release {release}.')
+                        removed = True
+
+                    if args.file and rm_path((args._releases / release).expanduser()):
+                        print(f'Removed file list cache for release {release}.')
+                        removed = True
+
+                    if not removed:
+                        print(f'No caches found for release {release}.')
+
                 else:
                     show_cache_size(path, args)
         else:
             if args.remove:
                 if rm_path(args._downloads):
                     print('Removed download cache.')
+                    if args.file and rm_path(args._releases):
+                        print('Removed file lists cache.')
             else:
                 show_cache_size(args._downloads, args)