pystand 1.1__tar.gz → 1.3__tar.gz

{pystand-1.1/pystand.egg-info → pystand-1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.1
+Version: 1.3
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -18,8 +18,8 @@ Requires-Dist: pygithub
 [![PyPi](https://img.shields.io/pypi/v/pystand)](https://pypi.org/project/pystand/)
 [![AUR](https://img.shields.io/aur/version/pystand)](https://aur.archlinux.org/packages/pystand/)
 
-[`pystand`][pystand] is a command line tool to facilitate the
-installation and update of pre-built Python versions from the
+[`pystand`][pystand] is a command line tool to facilitate the download,
+installation, and update of pre-built Python versions from the
 [`python-build-standalone`][pbs] project. The following commands are
 provided:
 
@@ -117,11 +117,13 @@ Type `pystand` or `pystand -h` to view the usage summary:
 
 ```
 usage: pystand [-h] [-D DISTRIBUTION] [-B BASE_DIR] [-C CACHE_MINUTES]
-                  [--purge-days PURGE_DAYS] [-V]
+                  [--purge-days PURGE_DAYS]
+                  [--github-access-token GITHUB_ACCESS_TOKEN] [-V]
                   {install,update,remove,list,show,path} ...
 
-Command line tool to install pre-built Python versions from the python-build-
-standalone project.
+Command line tool to download, install, and update pre-built Python versions
+from the python-build-standalone project at
+https://github.com/indygreg/python-build-standalone.
 
 options:
   -h, --help            show this help message and exit
@@ -138,8 +140,11 @@ options:
                         before rechecking for latest. Default is 60 minutes
   --purge-days PURGE_DAYS
                         cache release file lists for this number of days after
-                        last version referencing it is removed. Default is 30
+                        last version referencing it is removed. Default is 90
                         days
+  --github-access-token GITHUB_ACCESS_TOKEN
+                        Optional Github access token. Can specify to reduce
+                        rate limiting.
   -V                    show pystand version
 
 Commands:
@@ -181,7 +186,7 @@ options:
 ### Command `update`
 
 ```
-usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [version ...]
+usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [-k] [version ...]
 
 Update one, more, or all versions to another release.
 
@@ -196,6 +201,8 @@ options:
   -a, --all             update ALL versions
   --skip                skip the specified versions when updating all (only
                         can be specified with --all)
+  -k, --keep            keep old version after updating (but only if different
+                        version number)
 ```
 
 ### Command `remove`
@@ -330,8 +337,8 @@ anything after on a line) are ignored. Type `pystand` to see all
 supported options.
 
 The global options: `--distribution`, `--base-dir`, `--cache-minutes`,
-`--purge-days` are the only sensible candidates to consider setting as
-defaults.
+`--purge-days`, `--github-access-token` are the only sensible candidates
+to consider setting as defaults.
 
 ## Command Line Tab Completion
 

{pystand-1.1 → pystand-1.3}/README.md

@@ -2,8 +2,8 @@
 [![PyPi](https://img.shields.io/pypi/v/pystand)](https://pypi.org/project/pystand/)
 [![AUR](https://img.shields.io/aur/version/pystand)](https://aur.archlinux.org/packages/pystand/)
 
-[`pystand`][pystand] is a command line tool to facilitate the
-installation and update of pre-built Python versions from the
+[`pystand`][pystand] is a command line tool to facilitate the download,
+installation, and update of pre-built Python versions from the
 [`python-build-standalone`][pbs] project. The following commands are
 provided:
 
@@ -101,11 +101,13 @@ Type `pystand` or `pystand -h` to view the usage summary:
 
 ```
 usage: pystand [-h] [-D DISTRIBUTION] [-B BASE_DIR] [-C CACHE_MINUTES]
-                  [--purge-days PURGE_DAYS] [-V]
+                  [--purge-days PURGE_DAYS]
+                  [--github-access-token GITHUB_ACCESS_TOKEN] [-V]
                   {install,update,remove,list,show,path} ...
 
-Command line tool to install pre-built Python versions from the python-build-
-standalone project.
+Command line tool to download, install, and update pre-built Python versions
+from the python-build-standalone project at
+https://github.com/indygreg/python-build-standalone.
 
 options:
   -h, --help            show this help message and exit
@@ -122,8 +124,11 @@ options:
                         before rechecking for latest. Default is 60 minutes
   --purge-days PURGE_DAYS
                         cache release file lists for this number of days after
-                        last version referencing it is removed. Default is 30
+                        last version referencing it is removed. Default is 90
                         days
+  --github-access-token GITHUB_ACCESS_TOKEN
+                        Optional Github access token. Can specify to reduce
+                        rate limiting.
   -V                    show pystand version
 
 Commands:
@@ -165,7 +170,7 @@ options:
 ### Command `update`
 
 ```
-usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [version ...]
+usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [-k] [version ...]
 
 Update one, more, or all versions to another release.
 
@@ -180,6 +185,8 @@ options:
   -a, --all             update ALL versions
   --skip                skip the specified versions when updating all (only
                         can be specified with --all)
+  -k, --keep            keep old version after updating (but only if different
+                        version number)
 ```
 
 ### Command `remove`
@@ -314,8 +321,8 @@ anything after on a line) are ignored. Type `pystand` to see all
 supported options.
 
 The global options: `--distribution`, `--base-dir`, `--cache-minutes`,
-`--purge-days` are the only sensible candidates to consider setting as
-defaults.
+`--purge-days`, `--github-access-token` are the only sensible candidates
+to consider setting as defaults.
 
 ## Command Line Tab Completion
 

{pystand-1.1 → pystand-1.3/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.1
+Version: 1.3
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -18,8 +18,8 @@ Requires-Dist: pygithub
 [![PyPi](https://img.shields.io/pypi/v/pystand)](https://pypi.org/project/pystand/)
 [![AUR](https://img.shields.io/aur/version/pystand)](https://aur.archlinux.org/packages/pystand/)
 
-[`pystand`][pystand] is a command line tool to facilitate the
-installation and update of pre-built Python versions from the
+[`pystand`][pystand] is a command line tool to facilitate the download,
+installation, and update of pre-built Python versions from the
 [`python-build-standalone`][pbs] project. The following commands are
 provided:
 
@@ -117,11 +117,13 @@ Type `pystand` or `pystand -h` to view the usage summary:
 
 ```
 usage: pystand [-h] [-D DISTRIBUTION] [-B BASE_DIR] [-C CACHE_MINUTES]
-                  [--purge-days PURGE_DAYS] [-V]
+                  [--purge-days PURGE_DAYS]
+                  [--github-access-token GITHUB_ACCESS_TOKEN] [-V]
                   {install,update,remove,list,show,path} ...
 
-Command line tool to install pre-built Python versions from the python-build-
-standalone project.
+Command line tool to download, install, and update pre-built Python versions
+from the python-build-standalone project at
+https://github.com/indygreg/python-build-standalone.
 
 options:
   -h, --help            show this help message and exit
@@ -138,8 +140,11 @@ options:
                         before rechecking for latest. Default is 60 minutes
   --purge-days PURGE_DAYS
                         cache release file lists for this number of days after
-                        last version referencing it is removed. Default is 30
+                        last version referencing it is removed. Default is 90
                         days
+  --github-access-token GITHUB_ACCESS_TOKEN
+                        Optional Github access token. Can specify to reduce
+                        rate limiting.
   -V                    show pystand version
 
 Commands:
@@ -181,7 +186,7 @@ options:
 ### Command `update`
 
 ```
-usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [version ...]
+usage: pystand update [-h] [-r RELEASE] [-a] [--skip] [-k] [version ...]
 
 Update one, more, or all versions to another release.
 
@@ -196,6 +201,8 @@ options:
   -a, --all             update ALL versions
   --skip                skip the specified versions when updating all (only
                         can be specified with --all)
+  -k, --keep            keep old version after updating (but only if different
+                        version number)
 ```
 
 ### Command `remove`
@@ -330,8 +337,8 @@ anything after on a line) are ignored. Type `pystand` to see all
 supported options.
 
 The global options: `--distribution`, `--base-dir`, `--cache-minutes`,
-`--purge-days` are the only sensible candidates to consider setting as
-defaults.
+`--purge-days`, `--github-access-token` are the only sensible candidates
+to consider setting as defaults.
 
 ## Command Line Tab Completion
 

{pystand-1.1 → pystand-1.3}/pystand.py

@@ -1,8 +1,9 @@
 #!/usr/bin/python3
 # PYTHON_ARGCOMPLETE_OK
 '''
-Command line tool to install pre-built Python versions from the
-python-build-standalone project.
+Command line tool to download, install, and update pre-built Python
+versions from the python-build-standalone project at
+https://github.com/indygreg/python-build-standalone.
 '''
 from __future__ import annotations
 
@@ -30,6 +31,13 @@ GITHUB_REPO = f'{REPO_OWNER}/{REPO}'
 LATEST_RELEASE_URL = f'https://raw.githubusercontent.com/{GITHUB_REPO}'\
         '/latest-release/latest-release.json'
 
+# The following release is the first one that supports "install_only"
+# builds so this tool does not support any releases before this.
+FIRST_RELEASE = '20210724'
+
+# The following regexp pattern is used to match the end of a release file name
+ENDPAT = r'-install_only[-\dT]*.tar.gz$'
+
 PROG = Path(__file__).stem
 CNFFILE = platformdirs.user_config_path(f'{PROG}-flags.conf')
 
@@ -98,7 +106,14 @@ def get_gh(args: Namespace) -> Any:
         return get_gh_handle
 
     from github import Github
-    get_gh_handle = Github()  # type: ignore
+    if args.github_access_token:
+        from github import Auth
+        auth = Auth.Token(args.github_access_token)
+    else:
+        auth = None
+
+    # Save this handle globally for future use
+    get_gh_handle = Github(auth=auth)  # type: ignore
     return get_gh_handle
 
 def rm_path(path: Path) -> None:
@@ -168,8 +183,18 @@ def get_version_names(args: Namespace) -> list[str]:
     return sorted(all_names - given, key=parse_version) \
             if args.all else versions
 
-def get_latest_release_tag(args: Namespace) -> str:
-    'Return the latest release tag'
+def get_release_tag(args: Namespace) -> str:
+    'Return the release tag, or latest if not specified'
+    if release := args.release:
+        if not release.isdigit() or len(release) != len(FIRST_RELEASE):
+            sys.exit('Release must be a YYYYMMDD string.')
+        if release < FIRST_RELEASE:
+            sys.exit(f'Releases before "{FIRST_RELEASE}" do not '
+                     'include "*-install_only" builds so are '
+                     'not supported.')
+
+        return release
+
     if args._latest_release.exists():
         stat = args._latest_release.stat()
         if time.time() < (stat.st_mtime + int(args.cache_minutes * 60)):
@@ -192,11 +217,25 @@ def get_latest_release_tag(args: Namespace) -> str:
     args._latest_release.write_text(tag + '\n')
     return tag
 
+def get_release_name(filename: str) -> Optional[str]:
+    'Search for and strip the release name from the file name'
+    if not (m := re.search(ENDPAT, filename)):
+        return None
+
+    # Strip of end of file name and also strip any +8 digit embedded
+    # release date
+    return re.sub(r'\+\d{8}', '', filename[:m.start()])
+
 def get_release_files(args, tag, implementation: Optional[str] = None) -> dict:
     'Return the release files for the given tag'
     # Look for tag data in our release cache
     jfile = args._releases / tag
     if not (files := get_json(jfile)):
+
+        # May have read this release before but it has no assets
+        if jfile.exists():
+            return {}
+
         # Not in cache so fetch it (and also store in cache)
         gh = get_gh(args)
         try:
@@ -206,17 +245,11 @@ def get_release_files(args, tag, implementation: Optional[str] = None) -> dict:
 
         # Iterate over the release assets and store the files in a dict to
         # return
-        end = '-install_only.tar.gz'
         for file in release.get_assets():
-            name = file.name
-            if not name.endswith(end):
+            if not (name := get_release_name(file.name)):
                 continue
 
-            name = name[:-len(end)]
-            impl_ver, rest = name.split('+', maxsplit=1)
-            impl, ver = impl_ver.split('-', maxsplit=1)
-            rest = rest.split('-', maxsplit=1)[1]
-
+            impl, ver, rest = name.split('-', maxsplit=2)
             if impl not in files:
                 files[impl] = defaultdict(dict)
 
@@ -378,10 +411,13 @@ def main() -> Optional[str]:
                      help='cache latest release tag fetch for this many '
                      'minutes, before rechecking for latest. '
                      'Default is %(default)d minutes')
-    opt.add_argument('--purge-days', default=30, type=int,
+    opt.add_argument('--purge-days', default=90, type=int,
                      help='cache release file lists for this number '
                      'of days after last version referencing it is removed. '
                      'Default is %(default)d days')
+    opt.add_argument('--github-access-token',
+                     help='Optional Github access token. Can specify to reduce '
+                     'rate limiting.')
     opt.add_argument('-V', action='store_true',
                      help=f'show {PROG} version')
     cmd = opt.add_subparsers(title='Commands', dest='cmdname')
@@ -469,10 +505,10 @@ class _install(COMMAND):
 
     @staticmethod
     def run(args: Namespace) -> Optional[str]:
-        release = args.release or get_latest_release_tag(args)
+        release = get_release_tag(args)
         files = get_release_files(args, release, 'cpython')
         if not files:
-            return f'Release "{release}" not found.'
+            return f'Release "{release}" not found, or has no compatible files.'
 
         matcher = VersionMatcher(files)
         for version in args.version:
@@ -504,13 +540,16 @@ class _update(COMMAND):
         parser.add_argument('--skip', action='store_true',
                             help='skip the specified versions when '
                             'updating all (only can be specified with --all)')
+        parser.add_argument('-k', '--keep', action='store_true',
+                            help='keep old version after updating (but only '
+                            'if different version number)')
         parser.add_argument('version', nargs='*',
                             help='version to update (or to skip for '
                             '--all --skip)')
 
     @staticmethod
     def run(args: Namespace) -> Optional[str]:
-        release_target = args.release or get_latest_release_tag(args)
+        release_target = get_release_tag(args)
         files = get_release_files(args, release_target, 'cpython')
         if not files:
             return f'Release "{release_target}" not found.'
@@ -525,14 +564,21 @@ class _update(COMMAND):
                 continue
 
             nextver = matcher.match(version, upconvert_minor=True)
-            new_vdir = args._versions / nextver
-            if nextver != version and new_vdir.exists():
-                continue
 
             distribution = data.get('distribution')
             if not distribution or distribution not in files.get(nextver, {}):
                 continue
 
+            if nextver == version and args.keep:
+                print(f'Error: {fmt(version, release)} would not be kept '
+                      f'if update to {fmt(nextver, release_target)} '
+                      f'distribution="{distribution}"', file=sys.stderr)
+                continue
+
+            new_vdir = args._versions / nextver
+            if nextver != version and new_vdir.exists():
+                continue
+
             print(f'{fmt(version, release)} updating to '
                   f'{fmt(nextver, release_target)} '
                   f'distribution="{distribution}" ..')
@@ -541,7 +587,7 @@ class _update(COMMAND):
                                 files):
                 return error
 
-            if nextver != version:
+            if nextver != version and not args.keep:
                 remove(args, version)
 
 @COMMAND.add
@@ -586,7 +632,7 @@ class _list(COMMAND):
 
     @staticmethod
     def run(args: Namespace) -> Optional[str]:
-        release_target = args.release or get_latest_release_tag(args)
+        release_target = get_release_tag(args)
         files = get_release_files(args, release_target, 'cpython')
         if not files:
             return f'Release "{release_target}" not found.'
@@ -640,7 +686,7 @@ class _show(COMMAND):
 
     @staticmethod
     def run(args: Namespace) -> None:
-        release = args.release or get_latest_release_tag(args)
+        release = get_release_tag(args)
         files = get_release_files(args, release, 'cpython')
         if not files:
             sys.exit(f'Error: release "{release}" not found.')