pystand 2.20__tar.gz → 2.22__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.20
+Version: 2.22
 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
@@ -133,7 +133,7 @@ Type `pystand` or `pystand -h` to view the usage summary:
 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]
-                  [--cert {system,certifi,none}] [-V]
+                  [--no-color] [--cert {system,certifi,none}] [-V]
                   {install,update,upgrade,remove,uninstall,list,show,path,cache} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -167,6 +167,7 @@ options:
                         optional Github access token. Can specify to reduce
                         rate limiting.
   --no-strip            do not strip downloaded binaries
+  --no-color            do not use color in output
   --cert {system,certifi,none}
                         specify which SSL certificates to use for HTTPS
                         requests. Default="system".
@@ -185,7 +186,7 @@ Commands:
     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.
+default starting global options in ~/.config/pystand-flags.conf.
 ```
 
 Type `pystand <command> -h` to see specific help/usage for any

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

@@ -113,7 +113,7 @@ Type `pystand` or `pystand -h` to view the usage summary:
 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]
-                  [--cert {system,certifi,none}] [-V]
+                  [--no-color] [--cert {system,certifi,none}] [-V]
                   {install,update,upgrade,remove,uninstall,list,show,path,cache} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -147,6 +147,7 @@ options:
                         optional Github access token. Can specify to reduce
                         rate limiting.
   --no-strip            do not strip downloaded binaries
+  --no-color            do not use color in output
   --cert {system,certifi,none}
                         specify which SSL certificates to use for HTTPS
                         requests. Default="system".
@@ -165,7 +166,7 @@ Commands:
     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.
+default starting global options in ~/.config/pystand-flags.conf.
 ```
 
 Type `pystand <command> -h` to see specific help/usage for any

pystand-2.22/justfile

@@ -0,0 +1,23 @@
+PYFILES := file_name(justfile_dir()) + '.py'
+
+check:
+	ruff check {{PYFILES}}
+	ty check --python /usr/bin/python {{PYFILES}}
+	vermin -vv --no-tips -i {{PYFILES}}
+	md-link-checker
+
+build:
+	rm -rf dist
+	uv build
+
+upload: build
+	uv-publish
+
+doc:
+	update-readme-usage -A
+
+format:
+	ruff check --select I --fix {{PYFILES}} && ruff format {{PYFILES}}
+
+clean:
+	@rm -vrf *.egg-info build/ dist/ __pycache__/

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystand
-Version: 2.20
+Version: 2.22
 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
@@ -133,7 +133,7 @@ Type `pystand` or `pystand -h` to view the usage summary:
 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]
-                  [--cert {system,certifi,none}] [-V]
+                  [--no-color] [--cert {system,certifi,none}] [-V]
                   {install,update,upgrade,remove,uninstall,list,show,path,cache} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -167,6 +167,7 @@ options:
                         optional Github access token. Can specify to reduce
                         rate limiting.
   --no-strip            do not strip downloaded binaries
+  --no-color            do not use color in output
   --cert {system,certifi,none}
                         specify which SSL certificates to use for HTTPS
                         requests. Default="system".
@@ -185,7 +186,7 @@ Commands:
     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.
+default starting global options in ~/.config/pystand-flags.conf.
 ```
 
 Type `pystand <command> -h` to see specific help/usage for any

{pystand-2.20 → pystand-2.22}/pystand.egg-info/SOURCES.txt

@@ -1,6 +1,6 @@
 .gitignore
-Makefile
 README.md
+justfile
 pyproject.toml
 pystand.py
 pystand.egg-info/PKG-INFO

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

@@ -8,6 +8,7 @@ https://github.com/astral-sh/python-build-standalone.
 
 from __future__ import annotations
 
+import itertools
 import os
 import platform
 import re
@@ -17,6 +18,7 @@ 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
@@ -55,6 +57,29 @@ DISTRIBUTIONS = {
 
 CERTS = ('system', 'certifi', 'none')
 
+# Define ANSI escape sequences for colors
+# Refer https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
+COLORS = [
+    '\033[32m',  # green
+    '\033[33m',  # yellow
+    '\033[35m',  # magenta
+    '\033[34m',  # blue
+    '\033[36m',  # cyan
+    '\033[31m',  # red
+    '\033[37m',  # white
+    '\033[39m',  # reset to default color
+]
+
+
+@dataclass
+class ColorTable:
+    next: Iterator[str] = field(default_factory=lambda: itertools.cycle(COLORS[1:-1]))
+    table: dict[str, str] = field(default_factory=dict)
+
+
+colors_rel = ColorTable()
+colors_dist = ColorTable()
+
 
 def is_admin() -> bool:
     "Check if we are running as root"
@@ -78,11 +103,36 @@ def get_version() -> str:
     return ver
 
 
-def fmt(version, release) -> str:
+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
 
@@ -146,14 +196,14 @@ def rm_path(path: Path) -> None:
 
 def register_zst() -> None:
     "Register custom zstandard unpacker"
-    def unpack_zst(filename: str, extract_dir: str) -> None:
-        "Unpack a zstandard compressed tar"
-        import tarfile
+    import tarfile
 
-        import zstandard
+    from zstandard import ZstdDecompressor
 
+    def unpack_zst(filename: str, extract_dir: str) -> None:
+        "Unpack a zstandard compressed tar"
         with open(filename, 'rb') as compressed:
-            dctx = zstandard.ZstdDecompressor()
+            dctx = ZstdDecompressor()
             with dctx.stream_reader(compressed) as reader:
                 with tarfile.open(fileobj=reader, mode='r|') as tar:
                     tar.extractall(path=extract_dir)
@@ -348,7 +398,7 @@ def fetch_tag_latest(args: Namespace) -> str:
 
 def get_release_tag(args: Namespace) -> str:
     "Return the release tag, or latest if not specified"
-    if release := args.release:
+    if hasattr(args, 'release') and (release := args.release):
         if err := check_release_tag(release):
             sys.exit(err)
 
@@ -507,7 +557,7 @@ def purge_unused_releases(args: Namespace) -> None:
 
 def show_list(args: Namespace) -> None:
     "Show a list of available releases"
-    latest = parse_version(get_release_tag(args))
+    latest = parse_version(args._release)
     releases = {r: d for r, d in fetch_tags(args)}
     cached = set(p.name for p in args._releases.iterdir())
     for release in sorted(cached.union(releases)):
@@ -723,6 +773,9 @@ def main() -> str | None:
     opt.add_argument(
         '--no-strip', action='store_true', help='do not strip downloaded binaries'
     )
+    opt.add_argument(
+        '--no-color', action='store_true', help='do not use color in output'
+    )
     opt.add_argument(
         '--cert',
         choices=CERTS,
@@ -775,6 +828,10 @@ def main() -> str | None:
     if not distribution:
         return 'Unknown system + machine distribution. Please specify using -D/--distribution option.'
 
+    # Only use color for terminal output
+    if not sys.stdout.isatty():
+        args.no_color = True
+
     # Keep some useful info in the namespace passed to the command
     prefix_dir = Path(args.prefix_dir).expanduser().resolve()
     cache_dir = Path(args.cache_dir).expanduser().resolve()
@@ -798,6 +855,7 @@ def main() -> str | None:
 
     try:
         with p_lock.acquire(blocking=False), c_lock.acquire(blocking=False):
+            args._release = get_release_tag(args)
             result = args.func(args)
             purge_unused_releases(args)
             update_version_symlinks(args)
@@ -838,7 +896,7 @@ class install_:
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        release = get_release_tag(args)
+        release = args._release
         files = get_release_files(args, release)
         if not files:
             return f'Release "{release}" not found, or has no compatible files.'
@@ -847,7 +905,7 @@ class install_:
         for version in args.version:
             full_version = matcher.match(version)
             if not full_version:
-                return f'Version {fmt(version, release)} not found.'
+                return f'Version {fmtrel(version, release, args)} not found.'
 
             version = full_version
             vdir = args._versions / version
@@ -858,7 +916,7 @@ class install_:
             if error := install(args, vdir, release, args._distribution, files):
                 return error
 
-            print(f'Version {fmt(version, release)} installed.')
+            print(f'Version {fmtrel(version, release, args)} installed.')
 
 
 # COMMAND
@@ -897,7 +955,7 @@ class update_:
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        release_target = get_release_tag(args)
+        release_target = args._release
         files = get_release_files(args, release_target)
         if not files:
             return f'Release "{release_target}" not found.'
@@ -918,23 +976,23 @@ class update_:
             if not distribution or distribution not in files.get(nextver, {}):
                 continue
 
-            if nextver == version and args.keep:
+            if nextver == version and args.keep and release:
                 print(
-                    f'Error: {fmt(version, release)} would not be kept '
-                    f'if update to {fmt(nextver, release_target)} '
-                    f'distribution="{distribution}"',
+                    f'Error: {fmtrel(version, release, args)} would not be kept '
+                    f'if update to {fmtrel(nextver, release_target, args)} '
+                    f'{fmtdist(distribution, args)}',
                     file=sys.stderr,
                 )
                 continue
 
             new_vdir = args._versions / nextver
-            if nextver != version and new_vdir.exists():
+            if not release or (nextver != version and new_vdir.exists()):
                 continue
 
             print(
-                f'{fmt(version, release)} updating to '
-                f'{fmt(nextver, release_target)} '
-                f'distribution="{distribution}" ..'
+                f'{fmtrel(version, release, args)} updating to '
+                f'{fmtrel(nextver, release_target, args)} '
+                f'{fmtdist(distribution, args)} ..'
             )
 
             # If the source was originally included, then include it in
@@ -986,7 +1044,7 @@ class remove_:
             release = get_json(dfile).get('release') or '?'
             if not release_del or release == release_del:
                 remove(args, version)
-                print(f'Version {fmt(version, release)} removed.')
+                print(f'Version {fmtrel(version, release, args)} removed.')
 
 
 # COMMAND
@@ -1014,7 +1072,7 @@ class list_:
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        release_target = get_release_tag(args)
+        release_target = args._release
         files = get_release_files(args, release_target)
         if not files:
             return f'Release "{release_target}" not found.'
@@ -1028,12 +1086,12 @@ class list_:
                 continue
 
             release = data.get('release')
-            distribution = data.get('distribution')
+            if not (distribution := data.get('distribution')):
+                distribution = '?'
             upd = ''
             app = ''
             if release_target and release != release_target:
-                nextver = matcher.match(version, upgrade=True)
-                if not nextver:
+                if not (nextver := matcher.match(version, upgrade=True)):
                     if args.verbose:
                         app = (
                             ' not eligible for update because '
@@ -1049,23 +1107,28 @@ class list_:
                             )
                             app = (
                                 f' not eligible for '
-                                f'update because {fmt(nextver, nrelease)} '
+                                f'update because {fmtrel(nextver, nrelease, args)} '
                                 'is already installed.'
                             )
                     else:
                         # May not be updatable if newer release does not support
                         # this same distribution anymore
                         if nextver and distribution in files.get(nextver, {}):
-                            upd = f' updatable to {fmt(nextver, release_target)}'
+                            upd = (
+                                f' updatable to {fmtrel(nextver, release_target, args)}'
+                            )
                         elif args.verbose:
                             app = (
                                 ' not eligible for update because '
-                                f'{fmt(nextver, release_target)} does '
-                                'not provide '
-                                f'distribution="{distribution}".'
+                                f'{fmtrel(nextver, release_target, args)} does '
+                                f'not provide {fmtdist(distribution, args)}.'
                             )
 
-            print(f'{fmt(version, release)}{upd} distribution="{distribution}"{app}')
+            if release:
+                print(
+                    f'{fmtrel(version, release, args)}{upd} '
+                    f'{fmtdist(distribution, args)}{app}'
+                )
 
 
 # COMMAND
@@ -1112,7 +1175,7 @@ class show_:
             show_list(args)
             return None
 
-        release = get_release_tag(args)
+        release = args._release
         files = get_release_files(args, release)
         if not files:
             return f'Error: release "{release}" not found.'
@@ -1136,14 +1199,13 @@ class show_:
                         args.re_match, f'{version}+{distribution}'
                     ):
                         print(
-                            f'{fmt(version, release)} '
-                            f'distribution="{distribution}"{app}'
+                            f'{fmtrel(version, release, args)} '
+                            f'{fmtdist(distribution, args)}{app}'
                         )
         if not installable:
             print(
-                f'Warning: no distribution="{args._distribution}" '
-                'versions found in '
-                f'release "{release}".'
+                f'Warning: no {fmtdist(args._distribution, args)} '
+                f'versions found in release "{release}".'
             )
 
 

pystand-2.20/Makefile

@@ -1,23 +0,0 @@
-PYFILES = $(wildcard *.py)
-check:
-	ruff check $(PYFILES)
-	mypy $(PYFILES)
-	pyright $(PYFILES)
-	vermin -vv --no-tips -i $(PYFILES)
-	md-link-checker
-
-build:
-	rm -rf dist
-	uv build
-
-upload: build
-	uv-publish
-
-doc:
-	update-readme-usage -A
-
-format:
-	ruff check --select I --fix $(PYFILES) && ruff format $(PYFILES)
-
-clean:
-	@rm -vrf *.egg-info build/ dist/ __pycache__