pystand 1.6__tar.gz → 1.7__tar.gz

{pystand-1.6/pystand.egg-info → pystand-1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.6
+Version: 1.7
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -121,8 +121,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]
-                  [--github-access-token GITHUB_ACCESS_TOKEN] [--do-not-strip]
-                  [-V]
+                  [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
+                  [--no-extra-strip] [-V]
                   {install,update,remove,list,show,path} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -150,7 +150,8 @@ options:
   --github-access-token GITHUB_ACCESS_TOKEN
                         optional Github access token. Can specify to reduce
                         rate limiting.
-  --do-not-strip        Do not strip unneeded symbols from binaries
+  --no-strip            do not use or create stripped binaries
+  --no-extra-strip      do not restrip already stripped source binaries
   -V                    show pystand version
 
 Commands:
@@ -344,8 +345,9 @@ anything after on a line) are ignored. Type `pystand` to see all
 supported options.
 
 The global options: `--distribution`, `--base-dir`, `--cache-minutes`,
-`--purge-days`, `--github-access-token`, `--do-not-strip` are the only
-sensible candidates to consider setting as defaults.
+`--purge-days`, `--github-access-token`, `--no-strip`,
+`--no-extra-strip` are the only sensible candidates to consider setting
+as defaults.
 
 ## Command Line Tab Completion
 

{pystand-1.6 → pystand-1.7}/README.md

@@ -105,8 +105,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]
-                  [--github-access-token GITHUB_ACCESS_TOKEN] [--do-not-strip]
-                  [-V]
+                  [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
+                  [--no-extra-strip] [-V]
                   {install,update,remove,list,show,path} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -134,7 +134,8 @@ options:
   --github-access-token GITHUB_ACCESS_TOKEN
                         optional Github access token. Can specify to reduce
                         rate limiting.
-  --do-not-strip        Do not strip unneeded symbols from binaries
+  --no-strip            do not use or create stripped binaries
+  --no-extra-strip      do not restrip already stripped source binaries
   -V                    show pystand version
 
 Commands:
@@ -328,8 +329,9 @@ anything after on a line) are ignored. Type `pystand` to see all
 supported options.
 
 The global options: `--distribution`, `--base-dir`, `--cache-minutes`,
-`--purge-days`, `--github-access-token`, `--do-not-strip` are the only
-sensible candidates to consider setting as defaults.
+`--purge-days`, `--github-access-token`, `--no-strip`,
+`--no-extra-strip` are the only sensible candidates to consider setting
+as defaults.
 
 ## Command Line Tab Completion
 

{pystand-1.6 → pystand-1.7/pystand.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.6
+Version: 1.7
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -121,8 +121,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]
-                  [--github-access-token GITHUB_ACCESS_TOKEN] [--do-not-strip]
-                  [-V]
+                  [--github-access-token GITHUB_ACCESS_TOKEN] [--no-strip]
+                  [--no-extra-strip] [-V]
                   {install,update,remove,list,show,path} ...
 
 Command line tool to download, install, and update pre-built Python versions
@@ -150,7 +150,8 @@ options:
   --github-access-token GITHUB_ACCESS_TOKEN
                         optional Github access token. Can specify to reduce
                         rate limiting.
-  --do-not-strip        Do not strip unneeded symbols from binaries
+  --no-strip            do not use or create stripped binaries
+  --no-extra-strip      do not restrip already stripped source binaries
   -V                    show pystand version
 
 Commands:
@@ -344,8 +345,9 @@ anything after on a line) are ignored. Type `pystand` to see all
 supported options.
 
 The global options: `--distribution`, `--base-dir`, `--cache-minutes`,
-`--purge-days`, `--github-access-token`, `--do-not-strip` are the only
-sensible candidates to consider setting as defaults.
+`--purge-days`, `--github-access-token`, `--no-strip`,
+`--no-extra-strip` are the only sensible candidates to consider setting
+as defaults.
 
 ## Command Line Tab Completion
 

{pystand-1.6 → pystand-1.7}/pystand.py

@@ -40,6 +40,8 @@ FIRST_RELEASE = '20210724'
 # Sample release tag for documentation/usage examples
 SAMPL_RELEASE = '20240415'
 
+STRIP_EXT = '_stripped'
+
 # The following regexp pattern is used to match the end of a release file name
 ENDPAT = r'-install_only[-\dT]*.tar.gz$'
 
@@ -234,14 +236,22 @@ def get_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 merge(files: dict, name: str, url: str, stripped: bool) -> None:
+    'Merge a file into the files dict'
+    # We store: A string url when there is no stripped version; or a
+    # tuple of string urls, the first unstripped and the second
+    # stripped. It's a bit messy but we are keeping compatibility with
+    # earlier releases (and their cached release files) which did not
+    # have stripped versions.
+    impl, ver, distrib = name.split('-', maxsplit=2)
+    if impl not in files:
+        files[impl] = defaultdict(dict)
+
+    if exist := files[impl].get(ver, {}).get(distrib, {}):
+        files[impl][ver][distrib] = (exist, url) \
+                if stripped else (url, exist[1])
+    else:
+        files[impl][ver][distrib] = ('', url) if stripped else url
 
 def get_release_files(args, tag, implementation: Optional[str] = None) -> dict:
     'Return the release files for the given tag'
@@ -260,17 +270,19 @@ def get_release_files(args, tag, implementation: Optional[str] = None) -> dict:
         except Exception:
             return {}
 
-        # Iterate over the release assets and store the files in a dict to
-        # return
-        for file in release.get_assets():
-            if not (name := get_release_name(file.name)):
-                continue
+        # Iterate over the release assets and store pertinent files in a
+        # dict to return.
+        for asset in release.get_assets():
+            name = asset.name
+            if is_stripped := (STRIP_EXT in name):
+                name = name.replace(STRIP_EXT, '')
 
-            impl, ver, rest = name.split('-', maxsplit=2)
-            if impl not in files:
-                files[impl] = defaultdict(dict)
+            if m := re.search(ENDPAT, name):
+                name = re.sub(r'\+\d{8}', '', name[:m.start()])
+                merge(files, name, asset.browser_download_url, is_stripped)
 
-            files[impl][ver][rest] = file.browser_download_url
+        if not files:
+            sys.exit(f'Failed to fetch any files for release {tag}')
 
         if error := set_json(jfile, files):
             sys.exit(f'Failed to write release {tag} file {jfile}: {error}')
@@ -309,13 +321,13 @@ def update_version_symlinks(args: Namespace) -> None:
     for name, tgt in oldlinks.items():
         new_tgt = newlinks.get(name)
         if not new_tgt or new_tgt != tgt:
-            Path(base / name).unlink()
+            (base / name).unlink()
 
     # Create all needed new links
     for name, tgt in newlinks.items():
         old_tgt = oldlinks.get(name)
         if not old_tgt or old_tgt != tgt:
-            Path(base / name).symlink_to(tgt, target_is_directory=True)
+            (base / name).symlink_to(tgt, target_is_directory=True)
 
 def purge_unused_releases(args: Namespace) -> None:
     'Purge old releases that are no longer needed and have expired'
@@ -368,34 +380,43 @@ def remove(args: Namespace, version: str) -> None:
 
     shutil.rmtree(vdir)
 
-def strip_binaries(vdir: Path, distribution: str) -> None:
+def strip_binaries(vdir: Path, distribution: str) -> bool:
     'Strip binaries from files in a version directory'
     # Only run the strip command on Linux hosts and for Linux distributions
-    if platform.system() != 'Linux' or '-linux-' not in distribution:
-        return
+    was_stripped = False
+    if platform.system() == 'Linux' and '-linux-' in distribution:
+        for path in ('bin', 'lib'):
+            base = vdir / path
+            if not base.is_dir():
+                continue
 
-    for path in ('bin', 'lib'):
-        base = vdir / path
-        if not base.is_dir():
-            continue
+            for file in base.iterdir():
+                if not file.is_symlink() and file.is_file():
+                    cmd = f'strip -p --strip-unneeded {file}'.split()
+                    try:
+                        subprocess.run(cmd, stderr=subprocess.DEVNULL)
+                    except Exception:
+                        pass
+                    else:
+                        was_stripped = True
 
-        for file in base.iterdir():
-            if not file.is_symlink() and file.is_file():
-                cmd = f'strip -p --strip-unneeded {file}'.split()
-                try:
-                    subprocess.run(cmd, stderr=subprocess.DEVNULL)
-                except Exception:
-                    pass
+    return was_stripped
 
 def install(args: Namespace, vdir: Path, release: str, distribution: str,
             files: dict) -> Optional[str]:
     'Install a version'
     version = vdir.name
 
-    if not (file := files[version].get(distribution)):
+    if not (fileurl := files[version].get(distribution)):
         return f'Arch "{distribution}" not found for release '\
                 f'{release} version {version}.'
 
+    if isinstance(fileurl, tuple):
+        stripped = not args.no_strip
+        fileurl = fileurl[stripped]
+    else:
+        stripped = False
+
     tmpdir = args._versions / f'.{version}-tmp'
     rm_path(tmpdir)
     tmpdir.mkdir()
@@ -403,19 +424,32 @@ def install(args: Namespace, vdir: Path, release: str, distribution: str,
     error = None
 
     try:
-        urllib.request.urlretrieve(file, tmpdir / 'tmp.tar.gz')
+        urllib.request.urlretrieve(fileurl, tmpdir / 'tmp.tar.gz')
+    except Exception as e:
+        error = f'Failed to fetch "{fileurl}": {e}'
+
+    try:
         shutil.unpack_archive(tmpdir / 'tmp.tar.gz', tmpdir)
     except Exception as e:
-        error = f'Failed to fetch "{version}": {e}'
+        error = f'Failed to unpack "{fileurl}": {e}'
 
     if not error:
         data = {'release': release, 'distribution': distribution}
+
+        if args.no_strip:
+            data['stripped'] = 'forced off'
+        elif stripped and args.no_extra_strip:
+            data['stripped'] = 'at_source_only'
+        else:
+            if strip_binaries(tmpdir_py, distribution):
+                data['stripped'] = 'at_source_and_manually' \
+                        if stripped else 'manually'
+            else:
+                data['stripped'] = 'at_source' if stripped else 'n/a'
+
         if (error := set_json(tmpdir_py / args._data, data)):
             error = f'Failed to write {version} data file: {error}'
 
-    if not args.do_not_strip:
-        strip_binaries(tmpdir_py, distribution)
-
     if not error:
         remove(args, version)
         tmpdir_py.replace(vdir)
@@ -456,8 +490,10 @@ def main() -> Optional[str]:
     opt.add_argument('--github-access-token',
                      help='optional Github access token. Can specify to reduce '
                      'rate limiting.')
-    opt.add_argument('--do-not-strip', action='store_true',
-                     help='Do not strip unneeded symbols from binaries')
+    opt.add_argument('--no-strip', action='store_true',
+                     help='do not use or create stripped binaries')
+    opt.add_argument('--no-extra-strip', action='store_true',
+                     help='do not restrip already stripped source binaries')
     opt.add_argument('-V', action='store_true',
                      help=f'show {PROG} version')
     cmd = opt.add_subparsers(title='Commands', dest='cmdname')