pystand 2.22__tar.gz → 2.24__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.22
+Version: 2.24
 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
@@ -27,14 +27,14 @@ 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 or more 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.|
+ |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.|
 
 By default, Python versions are sourced from the latest
 `python-build-standalone` [release][pbs-rel] available (e.g.
@@ -89,6 +89,14 @@ Version 3.10.14 @ 20240415 removed.
 
 $ pystand list
 3.12.3 @ 20240415 distribution="x86_64-unknown-linux-gnu-install_only_stripped"
+
+# Install all available versions from latest release:
+$ pystand install -a
+Version 3.8.19 @ 20240415 installed.
+Version 3.9.19 @ 20240415 installed.
+Version 3.10.14 @ 20240415 installed.
+Version 3.11.9 @ 20240415 installed.
+Version 3.12.3 is already installed.
 ```
 
 Here are some examples showing how to use an installed version ..
@@ -175,8 +183,8 @@ options:
 
 Commands:
   {install,update,upgrade,remove,uninstall,list,show,path,cache}
-    install             Install one or more versions from a python-build-
-                        standalone release.
+    install             Install one, more, or all versions from a python-
+                        build-standalone release.
     update (upgrade)    Update one, more, or all versions to another release.
     remove (uninstall)  Remove/uninstall one, more, or all versions.
     list                List installed versions and show which have an update
@@ -195,9 +203,10 @@ individual command:
 ### Command `install`
 
 ```
-usage: pystand install [-h] [-r RELEASE] [-f] [-s] version [version ...]
+usage: pystand install [-h] [-r RELEASE] [-a] [-A] [--skip] [-f] [-s]
+                          [version ...]
 
-Install one or more versions from a python-build-standalone release.
+Install one, more, or all versions from a python-build-standalone release.
 
 positional arguments:
   version               version to install. E.g. 3.12 or 3.12.3
@@ -208,6 +217,11 @@ options:
                         install from specified python-build-standalone
                         YYYYMMDD release (e.g. 20240415), default is latest
                         release
+  -a, --all             install ALL versions from release
+  -A, --all-prerelease  install ALL versions from release, including pre-
+                        releases
+  --skip                skip the specified versions when installing all (only
+                        can be specified with --all)
   -f, --force           force install even if already installed
   -s, --include-source  also install source files if available in distribution
                         download

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

@@ -7,14 +7,14 @@ 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 or more 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.|
+ |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.|
 
 By default, Python versions are sourced from the latest
 `python-build-standalone` [release][pbs-rel] available (e.g.
@@ -69,6 +69,14 @@ Version 3.10.14 @ 20240415 removed.
 
 $ pystand list
 3.12.3 @ 20240415 distribution="x86_64-unknown-linux-gnu-install_only_stripped"
+
+# Install all available versions from latest release:
+$ pystand install -a
+Version 3.8.19 @ 20240415 installed.
+Version 3.9.19 @ 20240415 installed.
+Version 3.10.14 @ 20240415 installed.
+Version 3.11.9 @ 20240415 installed.
+Version 3.12.3 is already installed.
 ```
 
 Here are some examples showing how to use an installed version ..
@@ -155,8 +163,8 @@ options:
 
 Commands:
   {install,update,upgrade,remove,uninstall,list,show,path,cache}
-    install             Install one or more versions from a python-build-
-                        standalone release.
+    install             Install one, more, or all versions from a python-
+                        build-standalone release.
     update (upgrade)    Update one, more, or all versions to another release.
     remove (uninstall)  Remove/uninstall one, more, or all versions.
     list                List installed versions and show which have an update
@@ -175,9 +183,10 @@ individual command:
 ### Command `install`
 
 ```
-usage: pystand install [-h] [-r RELEASE] [-f] [-s] version [version ...]
+usage: pystand install [-h] [-r RELEASE] [-a] [-A] [--skip] [-f] [-s]
+                          [version ...]
 
-Install one or more versions from a python-build-standalone release.
+Install one, more, or all versions from a python-build-standalone release.
 
 positional arguments:
   version               version to install. E.g. 3.12 or 3.12.3
@@ -188,6 +197,11 @@ options:
                         install from specified python-build-standalone
                         YYYYMMDD release (e.g. 20240415), default is latest
                         release
+  -a, --all             install ALL versions from release
+  -A, --all-prerelease  install ALL versions from release, including pre-
+                        releases
+  --skip                skip the specified versions when installing all (only
+                        can be specified with --all)
   -f, --force           force install even if already installed
   -s, --include-source  also install source files if available in distribution
                         download

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.22
+Version: 2.24
 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
@@ -27,14 +27,14 @@ 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 or more 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.|
+ |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.|
 
 By default, Python versions are sourced from the latest
 `python-build-standalone` [release][pbs-rel] available (e.g.
@@ -89,6 +89,14 @@ Version 3.10.14 @ 20240415 removed.
 
 $ pystand list
 3.12.3 @ 20240415 distribution="x86_64-unknown-linux-gnu-install_only_stripped"
+
+# Install all available versions from latest release:
+$ pystand install -a
+Version 3.8.19 @ 20240415 installed.
+Version 3.9.19 @ 20240415 installed.
+Version 3.10.14 @ 20240415 installed.
+Version 3.11.9 @ 20240415 installed.
+Version 3.12.3 is already installed.
 ```
 
 Here are some examples showing how to use an installed version ..
@@ -175,8 +183,8 @@ options:
 
 Commands:
   {install,update,upgrade,remove,uninstall,list,show,path,cache}
-    install             Install one or more versions from a python-build-
-                        standalone release.
+    install             Install one, more, or all versions from a python-
+                        build-standalone release.
     update (upgrade)    Update one, more, or all versions to another release.
     remove (uninstall)  Remove/uninstall one, more, or all versions.
     list                List installed versions and show which have an update
@@ -195,9 +203,10 @@ individual command:
 ### Command `install`
 
 ```
-usage: pystand install [-h] [-r RELEASE] [-f] [-s] version [version ...]
+usage: pystand install [-h] [-r RELEASE] [-a] [-A] [--skip] [-f] [-s]
+                          [version ...]
 
-Install one or more versions from a python-build-standalone release.
+Install one, more, or all versions from a python-build-standalone release.
 
 positional arguments:
   version               version to install. E.g. 3.12 or 3.12.3
@@ -208,6 +217,11 @@ options:
                         install from specified python-build-standalone
                         YYYYMMDD release (e.g. 20240415), default is latest
                         release
+  -a, --all             install ALL versions from release
+  -A, --all-prerelease  install ALL versions from release, including pre-
+                        releases
+  --skip                skip the specified versions when installing all (only
+                        can be specified with --all)
   -f, --force           force install even if already installed
   -s, --include-source  also install source files if available in distribution
                         download

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

@@ -18,7 +18,6 @@ import sys
 import time
 from collections import defaultdict
 from collections.abc import Iterable, Iterator
-from dataclasses import dataclass, field
 from datetime import date, datetime
 from pathlib import Path
 from typing import Any
@@ -71,14 +70,45 @@ COLORS = [
 ]
 
 
-@dataclass
 class ColorTable:
-    next: Iterator[str] = field(default_factory=lambda: itertools.cycle(COLORS[1:-1]))
-    table: dict[str, str] = field(default_factory=dict)
+    "Base class for color tables"
 
+    def __init__(self, initval: str, no_color: bool) -> None:
+        self.table = None if no_color else {self.parse_key(initval): COLORS[0]}
+        self.next = itertools.cycle(COLORS[1:-1])
 
-colors_rel = ColorTable()
-colors_dist = ColorTable()
+    def get_color(self, text: str) -> str:
+        "Assign a new color by cycling through the available colors"
+        if not self.table:
+            return text
+
+        if not (color := self.table.get(key := self.parse_key(text))):
+            self.table[key] = color = next(self.next)
+
+        return f'{color}{text}{COLORS[-1]}'
+
+    def parse_key(self, text: str) -> str:
+        "Parse text for color table key, default is full text"
+        return text
+
+
+class ColorRel(ColorTable):
+    "Return colored release version string"
+
+    def format(self, version: str, release: str) -> str:
+        "Return a formatted release version string"
+        return f'{version} @ {self.get_color(release)}'
+
+
+class ColorDist(ColorTable):
+    "Return colored distribution string"
+
+    def format(self, dist: str) -> str:
+        return f'distribution="{self.get_color(dist)}"'
+
+    def parse_key(self, text: str) -> str:
+        "Extract key for distribution color"
+        return text.split('-', 1)[0]
 
 
 def is_admin() -> bool:
@@ -103,36 +133,6 @@ def get_version() -> str:
     return ver
 
 
-def fmtrel(version: str, release: str, args: Namespace) -> str:
-    "Return a formatted release version string"
-    if not args.no_color:
-        if release == args._release:
-            color = COLORS[0]
-        elif not (color := colors_rel.table.get(release)):
-            # Assign a new color for this release by cycling through the
-            # available colors.
-            colors_rel.table[release] = color = next(colors_rel.next)
-
-        release = f'{color}{release}{COLORS[-1]}'
-
-    return f'{version} @ {release}'
-
-
-def fmtdist(dist: str, args: Namespace) -> str:
-    "Return a formatted distribution string"
-    if not args.no_color:
-        if dist == args._distribution:
-            color = COLORS[0]
-        elif not (color := colors_dist.table.get(dist)):
-            # Assign a new color for this distribution by cycling through the
-            # available colors.
-            colors_dist.table[dist] = color = next(colors_dist.next)
-
-        dist = f'{color}{dist}{COLORS[-1]}'
-
-    return f'distribution="{dist}"'
-
-
 def get_json(file: Path) -> dict[str, Any]:
     from json import load
 
@@ -838,6 +838,7 @@ def main() -> str | None:
 
     args._implementation = 'cpython'  # at the moment, only support CPython
     args._distribution = distribution
+    args._fmtdist = ColorDist(distribution, args.no_color).format
     args._data = f'{PROG}.json'
 
     args._versions = prefix_dir
@@ -850,12 +851,12 @@ def main() -> str | None:
     args._cert = create_cert(args.cert)
 
     # 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')
+    locks = [filelock.FileLock(d / '.lock') for d in (prefix_dir, cache_dir)]
 
     try:
-        with p_lock.acquire(blocking=False), c_lock.acquire(blocking=False):
+        with locks[0].acquire(blocking=False), locks[1].acquire(blocking=False):
             args._release = get_release_tag(args)
+            args._fmtrel = ColorRel(args._release, args.no_color).format
             result = args.func(args)
             purge_unused_releases(args)
             update_version_symlinks(args)
@@ -867,7 +868,7 @@ def main() -> str | None:
 
 # COMMAND
 class install_:
-    doc = f'Install one or more versions from a {REPO} release.'
+    doc = f'Install one, more, or all versions from a {REPO} release.'
 
     @staticmethod
     def init(parser: ArgumentParser) -> None:
@@ -878,6 +879,21 @@ class install_:
             f'YYYYMMDD release (e.g. {SAMPL_RELEASE}), '
             'default is latest release',
         )
+        parser.add_argument(
+            '-a', '--all', action='store_true', help='install ALL versions from release'
+        )
+        parser.add_argument(
+            '-A',
+            '--all-prerelease',
+            action='store_true',
+            help='install ALL versions from release, including pre-releases',
+        )
+        parser.add_argument(
+            '--skip',
+            action='store_true',
+            help='skip the specified versions when '
+            'installing all (only can be specified with --all)',
+        )
         parser.add_argument(
             '-f',
             '--force',
@@ -891,7 +907,7 @@ class install_:
             help='also install source files if available in distribution download',
         )
         parser.add_argument(
-            'version', nargs='+', help='version to install. E.g. 3.12 or 3.12.3'
+            'version', nargs='*', help='version to install. E.g. 3.12 or 3.12.3'
         )
 
     @staticmethod
@@ -902,21 +918,47 @@ class install_:
             return f'Release "{release}" not found, or has no compatible files.'
 
         matcher = VersionMatcher(files)
+
+        if args.all_prerelease:
+            args.all = True
+
+        if args.all:
+            if not args.skip and args.version:
+                args.parser.error(
+                    'Can not specify versions with --all unless also specifying --skip.'
+                )
+
+            skips = set(v for ver in args.version if (v := matcher.match(ver)))
+
+            args.version = [
+                v
+                for v in files
+                if (args.all_prerelease or is_release_version(v)) and v not in skips
+            ]
+
+        else:
+            if args.skip:
+                args.parser.error('--skip can only be specified with --all.')
+
+            if not args.version:
+                args.parser.error('Must specify at least one version, or --all.')
+
         for version in args.version:
             full_version = matcher.match(version)
             if not full_version:
-                return f'Version {fmtrel(version, release, args)} not found.'
+                return f'Version {args._fmtrel(version, release)} not found.'
 
             version = full_version
             vdir = args._versions / version
 
             if vdir.exists() and not args.force:
-                return f'Version "{version}" is already installed.'
+                print(f'Version {version} is already installed.', file=sys.stderr)
+                continue
 
             if error := install(args, vdir, release, args._distribution, files):
                 return error
 
-            print(f'Version {fmtrel(version, release, args)} installed.')
+            print(f'Version {args._fmtrel(version, release)} installed.')
 
 
 # COMMAND
@@ -978,9 +1020,9 @@ class update_:
 
             if nextver == version and args.keep and release:
                 print(
-                    f'Error: {fmtrel(version, release, args)} would not be kept '
-                    f'if update to {fmtrel(nextver, release_target, args)} '
-                    f'{fmtdist(distribution, args)}',
+                    f'Error: {args._fmtrel(version, release)} would not be kept '
+                    f'if update to {args._fmtrel(nextver, release_target)} '
+                    f'{args._fmtdist(distribution)}',
                     file=sys.stderr,
                 )
                 continue
@@ -990,9 +1032,9 @@ class update_:
                 continue
 
             print(
-                f'{fmtrel(version, release, args)} updating to '
-                f'{fmtrel(nextver, release_target, args)} '
-                f'{fmtdist(distribution, args)} ..'
+                f'{args._fmtrel(version, release)} updating to '
+                f'{args._fmtrel(nextver, release_target)} '
+                f'{args._fmtdist(distribution)} ..'
             )
 
             # If the source was originally included, then include it in
@@ -1044,7 +1086,7 @@ class remove_:
             release = get_json(dfile).get('release') or '?'
             if not release_del or release == release_del:
                 remove(args, version)
-                print(f'Version {fmtrel(version, release, args)} removed.')
+                print(f'Version {args._fmtrel(version, release)} removed.')
 
 
 # COMMAND
@@ -1107,7 +1149,7 @@ class list_:
                             )
                             app = (
                                 f' not eligible for '
-                                f'update because {fmtrel(nextver, nrelease, args)} '
+                                f'update because {args._fmtrel(nextver, nrelease)} '
                                 'is already installed.'
                             )
                     else:
@@ -1115,19 +1157,19 @@ class list_:
                         # this same distribution anymore
                         if nextver and distribution in files.get(nextver, {}):
                             upd = (
-                                f' updatable to {fmtrel(nextver, release_target, args)}'
+                                f' updatable to {args._fmtrel(nextver, release_target)}'
                             )
                         elif args.verbose:
                             app = (
                                 ' not eligible for update because '
-                                f'{fmtrel(nextver, release_target, args)} does '
-                                f'not provide {fmtdist(distribution, args)}.'
+                                f'{args._fmtrel(nextver, release_target)} does '
+                                f'not provide {args._fmtdist(distribution)}.'
                             )
 
             if release:
                 print(
-                    f'{fmtrel(version, release, args)}{upd} '
-                    f'{fmtdist(distribution, args)}{app}'
+                    f'{args._fmtrel(version, release)}{upd} '
+                    f'{args._fmtdist(distribution)}{app}'
                 )
 
 
@@ -1199,12 +1241,12 @@ class show_:
                         args.re_match, f'{version}+{distribution}'
                     ):
                         print(
-                            f'{fmtrel(version, release, args)} '
-                            f'{fmtdist(distribution, args)}{app}'
+                            f'{args._fmtrel(version, release)} '
+                            f'{args._fmtdist(distribution)}{app}'
                         )
         if not installable:
             print(
-                f'Warning: no {fmtdist(args._distribution, args)} '
+                f'Warning: no {args._fmtdist(args._distribution)} '
                 f'versions found in release "{release}".'
             )
 
@@ -1244,7 +1286,7 @@ class path_:
         else:
             path = args._versions / version
             if not path.exists():
-                return f'Version "{version}" is not installed.'
+                return f'Version {version} is not installed.'
 
             if args.resolve:
                 path = path.resolve()