pystand 1.2__tar.gz → 1.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.2
+Version: 1.3
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -117,7 +117,8 @@ 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 download, install, and update pre-built Python versions
@@ -139,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:
@@ -333,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.2 → pystand-1.3}/README.md

@@ -101,7 +101,8 @@ 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 download, install, and update pre-built Python versions
@@ -123,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:
@@ -317,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.2 → pystand-1.3/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.2
+Version: 1.3
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -117,7 +117,8 @@ 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 download, install, and update pre-built Python versions
@@ -139,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:
@@ -333,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.2 → pystand-1.3}/pystand.py

@@ -31,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')
 
@@ -99,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:
@@ -169,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)):
@@ -193,6 +217,15 @@ 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
@@ -212,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)
 
@@ -384,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')
@@ -475,7 +505,7 @@ 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, or has no compatible files.'
@@ -519,7 +549,7 @@ class _update(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.'
@@ -602,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.'
@@ -656,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.')