pystand 2.18__tar.gz → 2.20__tar.gz

{pystand-2.18/pystand.egg-info → pystand-2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.18
+Version: 2.20
 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
@@ -15,6 +15,7 @@ Requires-Dist: platformdirs
 Requires-Dist: argparse-from-file
 Requires-Dist: pygithub
 Requires-Dist: certifi
+Requires-Dist: filelock
 Requires-Dist: zstandard; python_version < "3.14"
 
 ## PYSTAND - Install Python Versions From The Python-Build-Standalone Project
@@ -145,7 +146,9 @@ options:
                         python-build-standalone distribution. Default is
                         "x86_64_v3-unknown-linux-gnu-install_only_stripped"
                         for this host. Run "pystand show -a" to see all
-                        distributions.
+                        distributions. See
+                        https://gregoryszorc.com/docs/python-build-
+                        standalone/main/
   -P, --prefix-dir PREFIX_DIR
                         specify prefix dir for storing versions. Default is
                         "$HOME/.local/share/pystand".
@@ -179,7 +182,7 @@ Commands:
                         available.
     show                Show versions available from a release.
     path                Show path prefix to installed version base directory.
-    cache               Show release cache sizes.
+    cache               Show size of release download caches.
 
 Some commands offer aliases as shown in parentheses above. Note you can set
 default starting global options in $HOME/.config/pystand-flags.conf.
@@ -317,9 +320,9 @@ options:
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r] [release ...]
 
-Show release cache sizes.
+Show size of release download caches.
 
 positional arguments:
   release               show cache size for given release[s] only
@@ -329,6 +332,7 @@ options:
   -T, --no-total        do not show total cache size
   -H, --no-human-readable
                         show sizes in bytes, not human readable format
+  -r, --remove          remove download cache[s] instead of showing size
 ```
 
 ## Installation and Upgrade

{pystand-2.18 → pystand-2.20}/README.md

@@ -126,7 +126,9 @@ options:
                         python-build-standalone distribution. Default is
                         "x86_64_v3-unknown-linux-gnu-install_only_stripped"
                         for this host. Run "pystand show -a" to see all
-                        distributions.
+                        distributions. See
+                        https://gregoryszorc.com/docs/python-build-
+                        standalone/main/
   -P, --prefix-dir PREFIX_DIR
                         specify prefix dir for storing versions. Default is
                         "$HOME/.local/share/pystand".
@@ -160,7 +162,7 @@ Commands:
                         available.
     show                Show versions available from a release.
     path                Show path prefix to installed version base directory.
-    cache               Show release cache sizes.
+    cache               Show size of release download caches.
 
 Some commands offer aliases as shown in parentheses above. Note you can set
 default starting global options in $HOME/.config/pystand-flags.conf.
@@ -298,9 +300,9 @@ options:
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r] [release ...]
 
-Show release cache sizes.
+Show size of release download caches.
 
 positional arguments:
   release               show cache size for given release[s] only
@@ -310,6 +312,7 @@ options:
   -T, --no-total        do not show total cache size
   -H, --no-human-readable
                         show sizes in bytes, not human readable format
+  -r, --remove          remove download cache[s] instead of showing size
 ```
 
 ## Installation and Upgrade

{pystand-2.18 → pystand-2.20}/pyproject.toml

@@ -20,6 +20,7 @@ dependencies = [
   "argparse-from-file",
   "pygithub",
   "certifi",
+  "filelock",
   "zstandard; python_version < '3.14'",
 ]
 

{pystand-2.18 → pystand-2.20/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.18
+Version: 2.20
 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
@@ -15,6 +15,7 @@ Requires-Dist: platformdirs
 Requires-Dist: argparse-from-file
 Requires-Dist: pygithub
 Requires-Dist: certifi
+Requires-Dist: filelock
 Requires-Dist: zstandard; python_version < "3.14"
 
 ## PYSTAND - Install Python Versions From The Python-Build-Standalone Project
@@ -145,7 +146,9 @@ options:
                         python-build-standalone distribution. Default is
                         "x86_64_v3-unknown-linux-gnu-install_only_stripped"
                         for this host. Run "pystand show -a" to see all
-                        distributions.
+                        distributions. See
+                        https://gregoryszorc.com/docs/python-build-
+                        standalone/main/
   -P, --prefix-dir PREFIX_DIR
                         specify prefix dir for storing versions. Default is
                         "$HOME/.local/share/pystand".
@@ -179,7 +182,7 @@ Commands:
                         available.
     show                Show versions available from a release.
     path                Show path prefix to installed version base directory.
-    cache               Show release cache sizes.
+    cache               Show size of release download caches.
 
 Some commands offer aliases as shown in parentheses above. Note you can set
 default starting global options in $HOME/.config/pystand-flags.conf.
@@ -317,9 +320,9 @@ options:
 ### Command `cache`
 
 ```
-usage: pystand cache [-h] [-T] [-H] [release ...]
+usage: pystand cache [-h] [-T] [-H] [-r] [release ...]
 
-Show release cache sizes.
+Show size of release download caches.
 
 positional arguments:
   release               show cache size for given release[s] only
@@ -329,6 +332,7 @@ options:
   -T, --no-total        do not show total cache size
   -H, --no-human-readable
                         show sizes in bytes, not human readable format
+  -r, --remove          remove download cache[s] instead of showing size
 ```
 
 ## Installation and Upgrade

{pystand-2.18 → pystand-2.20}/pystand.egg-info/requires.txt

@@ -4,6 +4,7 @@ platformdirs
 argparse-from-file
 pygithub
 certifi
+filelock
 
 [:python_version < "3.14"]
 zstandard

{pystand-2.18 → pystand-2.20}/pystand.py

@@ -23,8 +23,9 @@ from typing import Any
 from urllib.request import urlopen
 
 import argcomplete
+import filelock
 import platformdirs
-from argparse_from_file import ArgumentParser, Namespace  # type: ignore
+from argparse_from_file import ArgumentParser, Namespace
 from packaging.version import parse as parse_version
 
 REPO = 'python-build-standalone'
@@ -32,6 +33,7 @@ GITHUB_REPO = f'astral-sh/{REPO}'
 GITHUB_SITE = f'https://github.com/{GITHUB_REPO}'
 LATEST_RELEASES = f'{GITHUB_SITE}/releases.atom'
 LATEST_RELEASE_TAG = f'{GITHUB_SITE}/releases/latest'
+DOC = 'https://gregoryszorc.com/docs/python-build-standalone/main/'
 
 # Sample release tag for documentation/usage examples
 SAMPL_RELEASE = '20240415'
@@ -144,23 +146,19 @@ def rm_path(path: Path) -> None:
 
 def register_zst() -> None:
     "Register custom zstandard unpacker"
-    # Python 3.14+ has built-in support for zstandard so only register custom
-    # handler for earlier versions
-    if sys.version_info < (3, 14):
+    def unpack_zst(filename: str, extract_dir: str) -> None:
+        "Unpack a zstandard compressed tar"
+        import tarfile
 
-        def unpack_zst(filename: str, extract_dir: str) -> None:
-            "Unpack a zstandard compressed tar"
-            import tarfile
+        import zstandard
 
-            import zstandard
+        with open(filename, 'rb') as compressed:
+            dctx = zstandard.ZstdDecompressor()
+            with dctx.stream_reader(compressed) as reader:
+                with tarfile.open(fileobj=reader, mode='r|') as tar:
+                    tar.extractall(path=extract_dir)
 
-            with open(filename, 'rb') as compressed:
-                dctx = zstandard.ZstdDecompressor()
-                with dctx.stream_reader(compressed) as reader:
-                    with tarfile.open(fileobj=reader, mode='r|') as tar:
-                        tar.extractall(path=extract_dir)
-
-        shutil.register_unpack_format('zst', ['.zst'], unpack_zst)
+    shutil.register_unpack_format('zst', ['.zst'], unpack_zst)
 
 
 def fetch(args: Namespace, release: str, url: str, tdir: Path) -> str | None:
@@ -187,7 +185,8 @@ def fetch(args: Namespace, release: str, url: str, tdir: Path) -> str | None:
     if error:
         rm_path(cache_file)
     else:
-        if filename.endswith('.zst'):
+        # Register custom zstandard handler (only if Python < 3.14 which has built-in support)
+        if filename.endswith('.zst') and sys.version_info < (3, 14):
             register_zst()
 
         try:
@@ -500,9 +499,10 @@ def purge_unused_releases(args: Namespace) -> None:
                 keep.add(path.name)
 
     # Purge any downloads for releases that have expired
-    for path in args._downloads.iterdir():
-        if path.name not in keep:
-            rm_path(path)
+    if args._downloads.is_dir():
+        for path in args._downloads.iterdir():
+            if path.name not in keep:
+                rm_path(path)
 
 
 def show_list(args: Namespace) -> None:
@@ -677,7 +677,7 @@ def main() -> str | None:
     opt = ArgumentParser(
         description=__doc__,
         epilog='Some commands offer aliases as shown in parentheses above. '
-        'Note you can set default starting global options in #FROM_FILE_PATH#',
+        'Note you can set default starting global options in #FROM_FILE_PATH#.',
     )
 
     # Set up main/global arguments
@@ -685,7 +685,7 @@ def main() -> str | None:
         '-D',
         '--distribution',
         help=f'{REPO} distribution. Default is "{distro_help}" for this host. '
-        f'Run "{PROG} show -a" to see all distributions.',
+        f'Run "{PROG} show -a" to see all distributions. See {DOC}',
     )
     opt.add_argument(
         '-P',
@@ -773,10 +773,7 @@ def main() -> str | None:
 
     distribution = args.distribution or distro_default
     if not distribution:
-        sys.exit(
-            'Unknown system + machine distribution. Please specify '
-            'using -D/--distribution option.'
-        )
+        return 'Unknown system + machine distribution. Please specify using -D/--distribution option.'
 
     # Keep some useful info in the namespace passed to the command
     prefix_dir = Path(args.prefix_dir).expanduser().resolve()
@@ -788,7 +785,6 @@ def main() -> str | None:
 
     args._versions = prefix_dir
     args._versions.mkdir(parents=True, exist_ok=True)
-
     args._downloads = cache_dir / 'downloads'
     args._downloads.mkdir(parents=True, exist_ok=True)
     args._releases = cache_dir / 'releases'
@@ -796,9 +792,18 @@ def main() -> str | None:
     args._latest_release = cache_dir / 'latest_release'
     args._cert = create_cert(args.cert)
 
-    result = args.func(args)
-    purge_unused_releases(args)
-    update_version_symlinks(args)
+    # Only allow one instance of this program to run (to read/write prefix and cache dirs)
+    p_lock = filelock.FileLock(prefix_dir / '.lock')
+    c_lock = filelock.FileLock(cache_dir / '.lock')
+
+    try:
+        with p_lock.acquire(blocking=False), c_lock.acquire(blocking=False):
+            result = args.func(args)
+            purge_unused_releases(args)
+            update_version_symlinks(args)
+    except filelock.Timeout:
+        return f'ERROR: Another instance of {PROG} is already running.'
+
     return result
 
 
@@ -1176,7 +1181,7 @@ class path_:
             print(args._downloads.parent if args.cache_path else args._versions)
         else:
             path = args._versions / version
-            if not path.is_symlink() or not path.exists():
+            if not path.exists():
                 return f'Version "{version}" is not installed.'
 
             if args.resolve:
@@ -1195,7 +1200,7 @@ class path_:
 
 # COMMAND
 class cache_:
-    "Show release cache sizes."
+    "Show size of release download caches."
 
     @staticmethod
     def init(parser: ArgumentParser) -> None:
@@ -1208,13 +1213,28 @@ class cache_:
             action='store_true',
             help='show sizes in bytes, not human readable format',
         )
+        parser.add_argument(
+            '-r',
+            '--remove',
+            action='store_true',
+            help='remove download cache[s] 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.release:
+        if args.remove:
+            if args.release:
+                for release in args.release:
+                    rm_path(args._downloads / release)
+            else:
+                rm_path(args._downloads)
+
+            print('Cache removed.')
+
+        elif args.release:
             for release in args.release:
                 show_cache_size(args._downloads / release, args)
         else: