pystand 2.4__tar.gz → 2.5__tar.gz

{pystand-2.4 → pystand-2.5}/Makefile

@@ -13,7 +13,7 @@ upload: build
 	twine3 upload dist/*
 
 doc:
-	update-readme-usage
+	update-readme-usage -A
 
 clean:
 	@rm -vrf *.egg-info build/ dist/ __pycache__

{pystand-2.4/pystand.egg-info → pystand-2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.4
+Version: 2.5
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -131,7 +131,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]
                   [-V]
-                  {install,update,remove,list,show,path} ...
+                  {install,update,upgrade,remove,uninstall,list,show,path} ...
 
 Command line tool to download, install, and update pre-built Python versions
 from the python-build-standalone project at
@@ -164,18 +164,18 @@ options:
   -V, --version         just show pystand version
 
 Commands:
-  {install,update,remove,list,show,path}
+  {install,update,upgrade,remove,uninstall,list,show,path}
     install             Install one or more versions from a python-build-
                         standalone release.
-    update              Update one, more, or all versions to another release.
-    remove              Remove/uninstall one, more, or all versions.
+    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
                         available.
     show                Show versions available from a release.
     path                Show path prefix to installed version base directory.
 
-Note you can set default starting global options in
-$HOME/.config/pystand-flags.conf.
+Some commands offer aliases as shown in brackets above. Note you can set
+default starting global options in $HOME/.config/pystand-flags.conf.
 ```
 
 Type `pystand <command> -h` to see specific help/usage for any
@@ -184,7 +184,7 @@ individual command:
 ### Command `install`
 
 ```
-usage: pystand install [-h] [-r RELEASE] [-f] version [version ...]
+usage: pystand install [-h] [-r RELEASE] [-f] [-s] version [version ...]
 
 Install one or more versions from a python-build-standalone release.
 
@@ -198,6 +198,8 @@ options:
                         YYYYMMDD release (e.g. 20240415), default is latest
                         release
   -f, --force           force install even if already installed
+  -s, --include-source  also install source files if available in distribution
+                        download
 ```
 
 ### Command `update`
@@ -220,6 +222,8 @@ options:
                         can be specified with --all)
   -k, --keep            keep old version after updating (but only if different
                         version number)
+
+aliases: upgrade
 ```
 
 ### Command `remove`
@@ -240,6 +244,8 @@ options:
   -r RELEASE, --release RELEASE
                         only remove versions if from specified YYYMMDD release
                         (e.g. 20240415)
+
+aliases: uninstall
 ```
 
 ### Command `list`

{pystand-2.4 → pystand-2.5}/README.md

@@ -114,7 +114,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]
                   [-V]
-                  {install,update,remove,list,show,path} ...
+                  {install,update,upgrade,remove,uninstall,list,show,path} ...
 
 Command line tool to download, install, and update pre-built Python versions
 from the python-build-standalone project at
@@ -147,18 +147,18 @@ options:
   -V, --version         just show pystand version
 
 Commands:
-  {install,update,remove,list,show,path}
+  {install,update,upgrade,remove,uninstall,list,show,path}
     install             Install one or more versions from a python-build-
                         standalone release.
-    update              Update one, more, or all versions to another release.
-    remove              Remove/uninstall one, more, or all versions.
+    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
                         available.
     show                Show versions available from a release.
     path                Show path prefix to installed version base directory.
 
-Note you can set default starting global options in
-$HOME/.config/pystand-flags.conf.
+Some commands offer aliases as shown in brackets above. Note you can set
+default starting global options in $HOME/.config/pystand-flags.conf.
 ```
 
 Type `pystand <command> -h` to see specific help/usage for any
@@ -167,7 +167,7 @@ individual command:
 ### Command `install`
 
 ```
-usage: pystand install [-h] [-r RELEASE] [-f] version [version ...]
+usage: pystand install [-h] [-r RELEASE] [-f] [-s] version [version ...]
 
 Install one or more versions from a python-build-standalone release.
 
@@ -181,6 +181,8 @@ options:
                         YYYYMMDD release (e.g. 20240415), default is latest
                         release
   -f, --force           force install even if already installed
+  -s, --include-source  also install source files if available in distribution
+                        download
 ```
 
 ### Command `update`
@@ -203,6 +205,8 @@ options:
                         can be specified with --all)
   -k, --keep            keep old version after updating (but only if different
                         version number)
+
+aliases: upgrade
 ```
 
 ### Command `remove`
@@ -223,6 +227,8 @@ options:
   -r RELEASE, --release RELEASE
                         only remove versions if from specified YYYMMDD release
                         (e.g. 20240415)
+
+aliases: uninstall
 ```
 
 ### Command `list`

{pystand-2.4 → pystand-2.5/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.4
+Version: 2.5
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -131,7 +131,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]
                   [-V]
-                  {install,update,remove,list,show,path} ...
+                  {install,update,upgrade,remove,uninstall,list,show,path} ...
 
 Command line tool to download, install, and update pre-built Python versions
 from the python-build-standalone project at
@@ -164,18 +164,18 @@ options:
   -V, --version         just show pystand version
 
 Commands:
-  {install,update,remove,list,show,path}
+  {install,update,upgrade,remove,uninstall,list,show,path}
     install             Install one or more versions from a python-build-
                         standalone release.
-    update              Update one, more, or all versions to another release.
-    remove              Remove/uninstall one, more, or all versions.
+    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
                         available.
     show                Show versions available from a release.
     path                Show path prefix to installed version base directory.
 
-Note you can set default starting global options in
-$HOME/.config/pystand-flags.conf.
+Some commands offer aliases as shown in brackets above. Note you can set
+default starting global options in $HOME/.config/pystand-flags.conf.
 ```
 
 Type `pystand <command> -h` to see specific help/usage for any
@@ -184,7 +184,7 @@ individual command:
 ### Command `install`
 
 ```
-usage: pystand install [-h] [-r RELEASE] [-f] version [version ...]
+usage: pystand install [-h] [-r RELEASE] [-f] [-s] version [version ...]
 
 Install one or more versions from a python-build-standalone release.
 
@@ -198,6 +198,8 @@ options:
                         YYYYMMDD release (e.g. 20240415), default is latest
                         release
   -f, --force           force install even if already installed
+  -s, --include-source  also install source files if available in distribution
+                        download
 ```
 
 ### Command `update`
@@ -220,6 +222,8 @@ options:
                         can be specified with --all)
   -k, --keep            keep old version after updating (but only if different
                         version number)
+
+aliases: upgrade
 ```
 
 ### Command `remove`
@@ -240,6 +244,8 @@ options:
   -r RELEASE, --release RELEASE
                         only remove versions if from specified YYYMMDD release
                         (e.g. 20240415)
+
+aliases: uninstall
 ```
 
 ### Command `list`

{pystand-2.4 → pystand-2.5}/pystand.py

@@ -163,9 +163,19 @@ def fetch(args: Namespace, release: str, url: str, tdir: Path) -> str | None:
         except Exception as e:
             error = f'Failed to unpack "{url}": {e}'
         else:
-            pdir = tmpdir / 'python' / 'install'
-            if not pdir.exists():
-                pdir = pdir.parent
+            pdir = tmpdir / 'python'
+            idir = pdir / 'install'
+            if idir.exists():
+                # This is a source distribution, copy the source if
+                # requested
+                if args.include_source:
+                    srcdir = idir / 'src'
+                    for subpath in pdir.iterdir():
+                        if subpath.name != idir.name:
+                            srcdir.mkdir(parents=True, exist_ok=True)
+                            subpath.replace(srcdir / subpath.name)
+
+                pdir = idir
 
             pdir.replace(tdir)
 
@@ -523,8 +533,9 @@ def main() -> str | None:
 
     # Parse arguments
     opt = ArgumentParser(description=__doc__,
-              epilog='Note you can set default starting global options '
-                         f'in {CNFFILE}.')
+            epilog='Some commands offer aliases as shown in brackets above. '
+                'Note you can set default starting global options in '
+                f'{CNFFILE}.')
 
     # Set up main/global arguments
     opt.add_argument('-D', '--distribution',
@@ -565,8 +576,10 @@ def main() -> str | None:
         else:
             return f'Must define a docstring for command class "{name}".'
 
+        aliases = cls.aliases if hasattr(cls, 'aliases') else []
         title = get_title(desc)
-        cmdopt = cmd.add_parser(name, description=desc, help=title)
+        cmdopt = cmd.add_parser(name, description=desc, help=title,
+                                aliases=aliases)
 
         # Set up this commands own arguments, if it has any
         if hasattr(cls, 'init'):
@@ -636,6 +649,9 @@ class _install(COMMAND):
                             'default is latest release')
         parser.add_argument('-f', '--force', action='store_true',
                             help='force install even if already installed')
+        parser.add_argument('-s', '--include-source', action='store_true',
+                            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')
 
@@ -666,6 +682,8 @@ class _install(COMMAND):
 @COMMAND.add
 class _update(COMMAND):
     'Update one, more, or all versions to another release.'
+    aliases = ['upgrade']
+
     @staticmethod
     def init(parser: ArgumentParser) -> None:
         parser.add_argument('-r', '--release',
@@ -692,7 +710,8 @@ class _update(COMMAND):
 
         matcher = VersionMatcher(files)
         for version in get_version_names(args):
-            if not (data := get_json(args._versions / version / args._data)):
+            vdir = args._versions / version
+            if not (data := get_json(vdir / args._data)):
                 continue
 
             if (release := data.get('release')) == release_target:
@@ -719,6 +738,10 @@ class _update(COMMAND):
                   f'{fmt(nextver, release_target)} '
                   f'distribution="{distribution}" ..')
 
+            # If the source was originally included, then include it in
+            # the update.
+            args.include_source = (vdir / 'src').is_dir()
+
             if error := install(args, new_vdir, release_target, distribution,
                                 files):
                 return error
@@ -729,6 +752,8 @@ class _update(COMMAND):
 @COMMAND.add
 class _remove(COMMAND):
     'Remove/uninstall one, more, or all versions.'
+    aliases = ['uninstall']
+
     @staticmethod
     def init(parser: ArgumentParser) -> None:
         parser.add_argument('-a', '--all', action='store_true',