pystand 2.24__tar.gz → 2.26__tar.gz

{pystand-2.24/pystand.egg-info → pystand-2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.24
+Version: 2.26
 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
@@ -335,7 +335,7 @@ options:
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [-r] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r | -R] [release ...]
 
 Show size of release download caches.
 
@@ -348,6 +348,9 @@ options:
   -H, --no-human-readable
                         show sizes in bytes, not human readable format
   -r, --remove          remove download cache[s] instead of showing size
+  -R, --remove-all-unused
+                        remove caches for all currently unused releases
+                        instead of showing size
 ```
 
 ## Installation and Upgrade

{pystand-2.24 → pystand-2.26}/README.md

@@ -315,7 +315,7 @@ options:
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [-r] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r | -R] [release ...]
 
 Show size of release download caches.
 
@@ -328,6 +328,9 @@ options:
   -H, --no-human-readable
                         show sizes in bytes, not human readable format
   -r, --remove          remove download cache[s] instead of showing size
+  -R, --remove-all-unused
+                        remove caches for all currently unused releases
+                        instead of showing size
 ```
 
 ## Installation and Upgrade

{pystand-2.24 → pystand-2.26/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.24
+Version: 2.26
 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
@@ -335,7 +335,7 @@ options:
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [-r] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r | -R] [release ...]
 
 Show size of release download caches.
 
@@ -348,6 +348,9 @@ options:
   -H, --no-human-readable
                         show sizes in bytes, not human readable format
   -r, --remove          remove download cache[s] instead of showing size
+  -R, --remove-all-unused
+                        remove caches for all currently unused releases
+                        instead of showing size
 ```
 
 ## Installation and Upgrade

{pystand-2.24 → pystand-2.26}/pystand.py

@@ -45,6 +45,7 @@ PROG = Path(__file__).stem
 DISTRIBUTIONS = {
     ('Linux', 'x86_64'): 'x86_64_v3-unknown-linux-gnu-install_only_stripped',
     ('Linux', 'aarch64'): 'aarch64-unknown-linux-gnu-install_only_stripped',
+    ('Linux', 'arm64'): 'aarch64-unknown-linux-gnu-install_only_stripped',
     ('Linux', 'armv7l'): 'armv7-unknown-linux-gnueabihf-install_only_stripped',
     ('Linux', 'armv8l'): 'armv7-unknown-linux-gnueabihf-install_only_stripped',
     ('Darwin', 'x86_64'): 'x86_64-apple-darwin-install_only_stripped',
@@ -52,6 +53,8 @@ DISTRIBUTIONS = {
     ('Darwin', 'arm64'): 'aarch64-apple-darwin-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',
+    ('Windows', 'aarch64'): 'aarch64-pc-windows-msvc-install_only_stripped',
+    ('Windows', 'arm64'): 'aarch64-pc-windows-msvc-install_only_stripped',
 }
 
 CERTS = ('system', 'certifi', 'none')
@@ -180,11 +183,11 @@ def get_gh(args: Namespace) -> Any:
     # Save this handle globally for future use
     from github import Github
 
-    get_gh_handle = Github(auth=auth)  # type: ignore
+    get_gh_handle = Github(auth=auth)
     return get_gh_handle
 
 
-def rm_path(path: Path) -> None:
+def rm_path(path: Path) -> bool:
     "Remove the given path"
     if path.is_symlink():
         path.unlink()
@@ -192,6 +195,10 @@ def rm_path(path: Path) -> None:
         shutil.rmtree(path)
     elif path.exists():
         path.unlink()
+    else:
+        return False
+
+    return True
 
 
 def register_zst() -> None:
@@ -398,7 +405,11 @@ def fetch_tag_latest(args: Namespace) -> str:
 
 def get_release_tag(args: Namespace) -> str:
     "Return the release tag, or latest if not specified"
-    if hasattr(args, 'release') and (release := args.release):
+    if (
+        hasattr(args, 'release')
+        and (release := args.release)
+        and isinstance(release, str)
+    ):
         if err := check_release_tag(release):
             sys.exit(err)
 
@@ -527,9 +538,8 @@ def update_version_symlinks(args: Namespace) -> None:
             (base / name).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"
-    # Want to keep releases for versions that we currently have installed
+def keeplist(args: Namespace) -> set[str]:
+    "Return a set of release names to keep"
     keep = {
         r for v in iter_versions(args) if (r := get_json(v / args._data).get('release'))
     }
@@ -538,6 +548,14 @@ def purge_unused_releases(args: Namespace) -> None:
     if args._latest_release.exists():
         keep.add(args._latest_release.read_text().strip())
 
+    return keep
+
+
+def purge_unused_releases(args: Namespace) -> None:
+    "Purge old releases that are no longer needed and have expired"
+    # Want to keep releases for versions that we currently have installed
+    keep = keeplist(args)
+
     # Purge any release lists that are no longer used and have expired
     now_secs = time.time()
     end_secs = args.purge_days * 86400
@@ -691,7 +709,9 @@ def show_cache_size(path: Path, args: Namespace) -> None:
         )
         total += size
         size_str = f'{size}B' if args.no_human_readable else to_human(size)
-        name = str(spath) if spath.is_dir() else spath.name
+        name = (
+            str(spath) if spath.is_dir() else f'{spath.parent.name}{os.sep}{spath.name}'
+        )
         print(f'{size_str}\t{name}')
 
     if not args.no_total:
@@ -952,7 +972,10 @@ class install_:
             vdir = args._versions / version
 
             if vdir.exists() and not args.force:
-                print(f'Version {version} is already installed.', file=sys.stderr)
+                print(
+                    f'Version {args._fmtrel(version, release)} is already installed.',
+                    file=sys.stderr,
+                )
                 continue
 
             if error := install(args, vdir, release, args._distribution, files):
@@ -1317,32 +1340,59 @@ class cache_:
             action='store_true',
             help='show sizes in bytes, not human readable format',
         )
-        parser.add_argument(
+        group = parser.add_mutually_exclusive_group()
+        group.add_argument(
             '-r',
             '--remove',
             action='store_true',
             help='remove download cache[s] instead of showing size',
         )
+        group.add_argument(
+            '-R',
+            '--remove-all-unused',
+            action='store_true',
+            help='remove caches for all currently unused releases instead of showing size',
+        )
         parser.add_argument(
             'release', nargs='*', help='show cache size for given release[s] only'
         )
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        if args.remove:
+        if args.remove_all_unused:
             if args.release:
-                for release in args.release:
-                    rm_path(args._downloads / release)
-            else:
-                rm_path(args._downloads)
+                args.parser.error(
+                    'Can not specify --remove-all-unused with release names.'
+                )
 
-            print('Cache removed.')
+            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}.')
 
         elif args.release:
             for release in args.release:
-                show_cache_size(args._downloads / release, args)
+                # Allow user to include cache path in release name
+                path = (args._downloads / release).expanduser()
+
+                if err := check_release_tag(path.name):
+                    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}.')
+                else:
+                    show_cache_size(path, args)
         else:
-            show_cache_size(args._downloads, args)
+            if args.remove:
+                if rm_path(args._downloads):
+                    print('Removed download cache.')
+            else:
+                show_cache_size(args._downloads, args)
 
 
 if __name__ == '__main__':