pystand 1.10__py3-none-any.whl → 1.12__py3-none-any.whl

{pystand-1.10.dist-info → pystand-1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 1.10
+Version: 1.12
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -155,7 +155,7 @@ options:
                         rate limiting.
   --no-strip            do not use or create stripped binaries
   --no-extra-strip      do not restrip already stripped source binaries
-  -V                    show pystand version
+  -V, --version         just show pystand version
 
 Commands:
   {install,update,remove,list,show,path}
@@ -280,8 +280,8 @@ usage: pystand path [-h] [-p] [version]
 Show path prefix to installed version base directory.
 
 positional arguments:
-  version            version to return path for, or latest release version if
-                     not specified
+  version            version to return path for, or latest installed version
+                     if not specified
 
 options:
   -h, --help         show this help message and exit

pystand-1.12.dist-info/RECORD

@@ -0,0 +1,6 @@
+pystand.py,sha256=lWNyCZTLNNmh6OoKrAG7pKCqOaoZollVpCWbAHrCxeM,32450
+pystand-1.12.dist-info/METADATA,sha256=VV3aLNNThQ0p06Hk_MWTN79jZ4MaKCgF273oMuRrZBE,15923
+pystand-1.12.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pystand-1.12.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
+pystand-1.12.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
+pystand-1.12.dist-info/RECORD,,

{pystand-1.10.dist-info → pystand-1.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pystand.py

@@ -167,11 +167,11 @@ class VersionMatcher:
             version += '.'
 
         # Only allow upgrade of formal release to another formal
-        # release, or alpha/beta release to another alpha/beta release.
+        # release.
         for full_version in self.seq:
             if full_version.startswith(version):
-                if not upgrade \
-                        or is_release_version(full_version) == is_release:
+                if not upgrade or not is_release \
+                        or is_release_version(full_version):
                     return full_version
 
         return None
@@ -529,8 +529,8 @@ def main() -> str | None:
                      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')
+    opt.add_argument('-V', '--version', action='store_true',
+                     help=f'just show {PROG} version')
     cmd = opt.add_subparsers(title='Commands', dest='cmdname')
 
     # Add each command ..
@@ -569,12 +569,12 @@ def main() -> str | None:
 
     args = opt.parse_args(shlex.split(cnflines) + sys.argv[1:])
 
-    if args.V:
-        print(get_version())
-
     if 'func' not in args:
-        if not args.V:
-            opt.print_help()
+        if args.version:
+            print(get_version())
+            return None
+
+        opt.print_help()
         return None
 
     distribution = args.distribution or distro_default
@@ -670,11 +670,11 @@ class _update(COMMAND):
             if not (data := get_json(args._versions / version / args._data)):
                 continue
 
-            release = data.get('release')
-            if release == release_target:
+            if (release := data.get('release')) == release_target:
                 continue
 
-            nextver = matcher.match(version, upgrade=True)
+            if not (nextver := matcher.match(version, upgrade=True)):
+                continue
 
             distribution = data.get('distribution')
             if not distribution or distribution not in files.get(nextver, {}):
@@ -768,23 +768,31 @@ class _list(COMMAND):
             app = ''
             if release_target and release != release_target:
                 nextver = matcher.match(version, upgrade=True)
-                new_vdir = args._versions / nextver
-                if nextver != version and new_vdir.exists():
+                if not nextver:
                     if args.verbose:
-                        nrelease = get_json(
-                                new_vdir / args._data).get('release', '?')
-                        app = f' not eligible for '\
-                                f'update because {fmt(nextver, nrelease)} '\
-                                'is already installed.'
+                        app = ' not eligible for update because '\
+                                f'release {release_target} does not provide '\
+                                'this version.'
                 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)}'
-                    elif args.verbose:
-                        app = f' not eligible for update because '\
-                                f'{fmt(nextver, release_target)} does '\
-                                f'not provide distribution="{distribution}".'
+                    new_vdir = args._versions / nextver
+                    if nextver != version and new_vdir.exists():
+                        if args.verbose:
+                            nrelease = get_json(
+                                    new_vdir / args._data).get('release', '?')
+                            app = f' not eligible for '\
+                                    f'update because {fmt(nextver, nrelease)} '\
+                                    '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 = ' updatable to '\
+                                    f'{fmt(nextver, release_target)}'
+                        elif args.verbose:
+                            app = ' not eligible for update because '\
+                                    f'{fmt(nextver, release_target)} does '\
+                                    'not provide '\
+                                    f'distribution="{distribution}".'
 
             print(f'{fmt(version, release)}{upd} '
                     f'distribution="{distribution}"{app}')
@@ -841,12 +849,15 @@ class _path(COMMAND):
                             help='return full path to python executable')
         parser.add_argument('version', nargs='?',
                             help='version to return path for, or latest '
-                            'release version if not specified')
+                            'installed version if not specified')
 
     @staticmethod
     def run(args: Namespace) -> str | None:
         matcher = VersionMatcher([f.name for f in iter_versions(args)])
         version = matcher.match(args.version) or args.version
+        if not version:
+            return 'No Python version installed.'
+
         path = args._versions / version
         if not path.is_dir():
             return f'Version "{version}" is not installed.'

pystand-1.10.dist-info/RECORD

@@ -1,6 +0,0 @@
-pystand.py,sha256=KJbvxHMzi28M4HqgGS9A4YaGYrpDn-T4hhuaQqbGW2E,31942
-pystand-1.10.dist-info/METADATA,sha256=f_l5yws3MCMJicGVN-o40gj1RlehBZ_Hg9jeYxLzLb4,15916
-pystand-1.10.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-pystand-1.10.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
-pystand-1.10.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
-pystand-1.10.dist-info/RECORD,,