pystand 2.0__py3-none-any.whl → 2.2__py3-none-any.whl

{pystand-2.0.dist-info → pystand-2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pystand
-Version: 2.0
+Version: 2.2
 Summary: Install Python versions from python-build-standalone project
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License: GPLv3
@@ -281,17 +281,17 @@ options:
 ### Command `path`
 
 ```
-usage: pystand path [-h] [-p] [version]
+usage: pystand path [-h] [-p] [-c | version]
 
 Show path prefix to installed version base directory.
 
 positional arguments:
-  version            version to return path for, or latest installed version
-                     if not specified
+  version             print resolved path for specified version
 
 options:
-  -h, --help         show this help message and exit
-  -p, --python-path  return full path to python executable
+  -h, --help          show this help message and exit
+  -p, --python-path   show full path to python executable
+  -c, --cache-prefix  print path to cache dir
 ```
 
 ## Installation and Upgrade

pystand-2.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+pystand.py,sha256=tOQ4SxeqAtz3Tc-kd9jt_v-Hbx_vXnatHPkT5f1pdAA,33114
+pystand-2.2.dist-info/METADATA,sha256=45hYFkXnngYMEDtsQ_lciU38qxK-Jl98ZxXyjvhhd2I,17403
+pystand-2.2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+pystand-2.2.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
+pystand-2.2.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
+pystand-2.2.dist-info/RECORD,,

pystand.py

@@ -126,7 +126,8 @@ def rm_path(path: Path) -> None:
     elif path.exists():
         path.unlink()
 
-def unpack_zst(filename, extract_dir):
+def unpack_zst(filename: str, extract_dir: str) -> None:
+    'Unpack a zstandard compressed tar'
     with open(filename, 'rb') as compressed:
         dctx = zstandard.ZstdDecompressor()
         with dctx.stream_reader(compressed) as reader:
@@ -218,7 +219,8 @@ class VersionMatcher:
 def iter_versions(args: Namespace) -> Iterator[Path]:
     'Iterate over all version dirs'
     for f in args._versions.iterdir():
-        if f.is_dir() and not f.is_symlink() and not f.name.startswith('.'):
+        if f.is_dir() and not f.is_symlink() \
+                and f.name[0] != '.' and f.name[0].isdigit():
             yield f
 
 def get_version_names(args: Namespace) -> list[str]:
@@ -359,7 +361,7 @@ def update_version_symlinks(args: Namespace) -> None:
     oldlinks = {}
     vers = []
     for path in base.iterdir():
-        if not path.name.startswith('.'):
+        if path.name[0] != '.' and path.name[0].isdigit():
             if path.is_symlink():
                 oldlinks[path.name] = os.readlink(str(path))
             else:
@@ -602,8 +604,8 @@ def main() -> str | None:
                 'using -D/--distribution option.')
 
     # Keep some useful info in the namespace passed to the command
-    prefix_dir = Path(args.prefix_dir).expanduser()
-    cache_dir = Path(args.cache_dir).expanduser()
+    prefix_dir = Path(args.prefix_dir).expanduser().resolve()
+    cache_dir = Path(args.cache_dir).expanduser().resolve()
 
     args._distribution = distribution
     args._data = f'{PROG}.json'
@@ -869,15 +871,29 @@ class _path(COMMAND):
     @staticmethod
     def init(parser: ArgumentParser) -> None:
         parser.add_argument('-p', '--python-path', action='store_true',
-                            help='return full path to python executable')
-        parser.add_argument('version', nargs='?',
-                            help='version to return path for, or latest '
-                            'installed version if not specified')
+                            help='show full path to python executable')
+        group = parser.add_mutually_exclusive_group()
+        group.add_argument('-c', '--cache-prefix', action='store_true',
+                           help='print path to cache dir')
+        group.add_argument('version', nargs='?',
+                           help='print resolved path for specified version')
 
     @staticmethod
     def run(args: Namespace) -> str | None:
+        if args.cache_prefix:
+            if args.python_path:
+                args.parser.error('Can not specify --python-path.')
+            print(args._downloads.parent)
+            return
+
+        if not args.version:
+            if args.python_path:
+                args.parser.error('Can not specify --python-path.')
+            print(args._versions)
+            return
+
         matcher = VersionMatcher([f.name for f in iter_versions(args)])
-        version = matcher.match(args.version) or args.version
+        version = matcher.match(args.version)
         if not version:
             return 'No Python version installed.'
 

pystand-2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-pystand.py,sha256=UqlzHehVQ6gsP0p4CmVqrkYoaV6w5t0mO7y1d6VYkR0,32507
-pystand-2.0.dist-info/METADATA,sha256=P6edgnJxiBTLN_iRj9fphdhOLW3nmRMJsZo4SOZA-EI,17403
-pystand-2.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-pystand-2.0.dist-info/entry_points.txt,sha256=DG4ps3I3nni1bubV1tXs6u8FARgkdbAYaEAzZD4RAo8,41
-pystand-2.0.dist-info/top_level.txt,sha256=NoWUh19UQymAJLHTCdxMnVwV6Teftef5fzyF3OWLyNY,8
-pystand-2.0.dist-info/RECORD,,