omdev 0.0.0.dev353__py3-none-any.whl → 0.0.0.dev355__py3-none-any.whl

omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 176,
+    "line": 186,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

omdev/cli/clicli.py

@@ -1,5 +1,6 @@
 import inspect
 import os
+import re
 import shlex
 import subprocess
 import sys
@@ -23,6 +24,15 @@ from .types import CliModule
 DEFAULT_REINSTALL_URL = 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py'
 
 
+_VALID_VERSION_STR = re.compile(r'\d+(\.\d+(\.\d+(\.dev\d+)?)?)?')
+
+
+def _parse_latest_version_str(s: str) -> str:
+    if not _VALID_VERSION_STR.fullmatch(s):
+        raise ValueError(f'Invalid version string: {s}')
+    return s
+
+
 class CliCli(ap.Cli):
 
     #
@@ -84,7 +94,7 @@ class CliCli(ap.Cli):
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
-        latest_version = lookup_latest_package_version(__package__.split('.')[0])
+        latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
 
         #
 
@@ -153,7 +163,7 @@ class CliCli(ap.Cli):
             reco_cmd = ' '.join([
                 'curl -LsSf',
                 f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
-                '| python3 -',
+                f'| python3 - --version {shlex.quote(latest_version)}',
                 *deps,
             ])
             print(f'Recovery command:\n\n{reco_cmd}\n')
@@ -167,8 +177,8 @@ class CliCli(ap.Cli):
         os.execl(
             sys.executable,
             sys.executable,
-            '-c',
-            install_src,
+            '-c', install_src,
+            '--version', latest_version,
             *deps,
         )
 

omdev/cli/install.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# ruff: noqa: UP045
 # @omlish-lite
 # @omlish-script
 """
@@ -25,11 +26,23 @@ DEFAULT_PY_VER = '3.13'
 @dc.dataclass(frozen=True)
 class InstallOpts:
     cli_pkg: str = DEFAULT_CLI_PKG
+    cli_ver: ta.Optional[str] = None
+
     py_ver: str = DEFAULT_PY_VER
 
     extras: ta.Sequence[str] = dc.field(default_factory=list)
 
 
+def _format_install_cli_pkg(opts: InstallOpts) -> str:
+    spec = opts.cli_pkg
+    if (ver := opts.cli_ver) is not None:
+        if any(c in ver for c in '=<>!~'):
+            spec += ver
+        else:
+            spec = f'{spec}=={ver}'
+    return spec
+
+
 class InstallManager(abc.ABC):
     @abc.abstractmethod
     def is_available(self) -> bool:
@@ -74,7 +87,7 @@ class UvxInstallManager(InstallManager):
             '--refresh',
             '--prerelease=allow',
             f'--python={opts.py_ver}',
-            opts.cli_pkg,
+            _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),
         ])
 
@@ -113,7 +126,7 @@ class PipxInstallManager(InstallManager):
             'pipx',
             'install',
             f'--python={opts.py_ver}',
-            opts.cli_pkg,
+            _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--preinstall', e] for e in (opts.extras or [])),
         ])
 
@@ -140,8 +153,9 @@ def _main() -> None:
 
     parser = argparse.ArgumentParser()
     parser.add_argument('-c', '--cli', default=DEFAULT_CLI_PKG)
-    parser.add_argument('-p', '--py', default=DEFAULT_PY_VER)
-    parser.add_argument('-m', '--mgr')
+    parser.add_argument('-V', '--version')
+    parser.add_argument('-p', '--python', default=DEFAULT_PY_VER)
+    parser.add_argument('-m', '--manager')
     parser.add_argument('extra', nargs='*')
     args = parser.parse_args()
 
@@ -150,10 +164,10 @@ def _main() -> None:
 
     cli = cli.lower().replace('_', '-')
 
-    if not (py := args.py):
+    if not (py := args.python):
         raise ValueError(f'Must specify py')
 
-    if mgr := args.mgr:
+    if mgr := args.manager:
         if (im := INSTALL_MANAGERS.get(mgr)) is None:
             raise ValueError(f'Unsupported mgr: {mgr}')
         if not im.is_available():
@@ -171,6 +185,7 @@ def _main() -> None:
 
     im.install(InstallOpts(
         cli_pkg=cli,
+        cli_ver=args.version,
         py_ver=py,
         extras=args.extra,
     ))

{omdev-0.0.0.dev353.dist-info → omdev-0.0.0.dev355.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev353
+Version: 0.0.0.dev355
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev353
+Requires-Dist: omlish==0.0.0.dev355
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev353.dist-info → omdev-0.0.0.dev355.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=fHOFj2p3JY4pmLF7FYYFODTnwvjWjhO14QbAqpG6Tdg,11870
+omdev/.manifests.json,sha256=eThNbd6bCkCK4thijDHcXDZ2eDr6i-wfnmV_qxbzino,11870
 omdev/__about__.py,sha256=2_6pQyjxqAspvwBSJUWQgdBBcGaDO3zX8yETLaspUQE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -103,8 +103,8 @@ omdev/ci/github/api/v2/client.py,sha256=bJtL_TZ4sB6IDuzfqtEXj-iWivKfyXQZ_MO30lgB
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
-omdev/cli/clicli.py,sha256=LuOdHYh_YFULDxZCX6X0sB6JFpu6ogntVtN4WdT0o3Q,4481
-omdev/cli/install.py,sha256=Vzdq66boPdbNBIC_ommPOc-fVd1gWqTTcF_Mh_JECi0,4467
+omdev/cli/clicli.py,sha256=KS6PMfqJmInQCi9dzpgKKFNQ9bO1jxlBbqypBgTZADU,4819
+omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=SH88B81otsSYNM-PM3Ry1wgLLvyg2M6fBJkWOajWIWM,485
@@ -303,9 +303,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev353.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev353.dist-info/METADATA,sha256=QYh5HbxL0eEAMdVGKbHcyCf0aPCXgqCdwj35yRG1UKo,1674
-omdev-0.0.0.dev353.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev353.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev353.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev353.dist-info/RECORD,,
+omdev-0.0.0.dev355.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev355.dist-info/METADATA,sha256=WplfvKUSZEo6fA95YNRCzzo_ki_c8UsMX3-ey9MuLIY,1674
+omdev-0.0.0.dev355.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev355.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev355.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev355.dist-info/RECORD,,