omdev 0.0.0.dev37__py3-none-any.whl → 0.0.0.dev39__py3-none-any.whl

omdev/.manifests.json

@@ -35,6 +35,18 @@
       }
     }
   },
+  {
+    "module": ".cli._version",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/cli/_version.py",
+    "line": 5,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "version",
+        "mod_name": "omdev.cli._version"
+      }
+    }
+  },
   {
     "module": ".interp.__main__",
     "attr": "_CLI_MODULE",
@@ -99,7 +111,7 @@
     "module": ".tools.piptools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/piptools.py",
-    "line": 85,
+    "line": 88,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "pip",

omdev/cli/_version.py

@@ -0,0 +1,14 @@
+from .. import __about__
+from .types import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('version', __name__)
+
+
+def _main() -> None:
+    print(__about__.__version__)
+
+
+if __name__ == '__main__':
+    _main()

omdev/cli/install.py

@@ -0,0 +1,159 @@
+#!/usr/bin/env python3
+# @omlish-lite
+# @omlish-script
+"""
+TODO:
+ - used for self-reinstall, preserving non-root dists - fix list_root_dists
+
+==
+
+curl -LsSf https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py | python3 -
+"""
+import abc
+import argparse
+import dataclasses as dc
+import itertools
+import json
+import shutil
+import subprocess
+import sys
+import typing as ta
+
+
+DEFAULT_CLI_PKG = 'omdev-cli'
+DEFAULT_PY_VER = '3.12'
+
+
+@dc.dataclass(frozen=True)
+class InstallOpts:
+    cli_pkg: str = DEFAULT_CLI_PKG
+    py_ver: str = DEFAULT_PY_VER
+
+    extras: ta.Sequence[str] = dc.field(default_factory=list)
+
+
+class InstallMgr(abc.ABC):
+    @abc.abstractmethod
+    def is_available(self) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def uninstall(self, cli_pkg: str) -> None:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def install(self, opts: InstallOpts) -> None:
+        raise NotImplementedError
+
+
+class UvInstallMgr(InstallMgr):
+    def is_available(self) -> bool:
+        return bool(shutil.which('uv'))
+
+    def uninstall(self, cli_pkg: str) -> None:
+        out = subprocess.check_output(['uv', 'tool', 'list']).decode()
+
+        installed = {
+            s.partition(' ')[0]
+            for l in out.splitlines()
+            if (s := l.strip())
+            and not s.startswith('-')
+        }
+
+        if cli_pkg not in installed:
+            return
+
+        subprocess.check_call([
+            'uv', 'tool',
+            'uninstall',
+            cli_pkg,
+        ])
+
+    def install(self, opts: InstallOpts) -> None:
+        subprocess.check_call([
+            'uv', 'tool',
+            'install',
+            '--refresh',
+            '--prerelease=allow',
+            f'--python={opts.py_ver}',
+            opts.cli_pkg,
+            *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),
+        ])
+
+
+class PipxInstallMgr(InstallMgr):
+    def is_available(self) -> bool:
+        return bool(shutil.which('pipx'))
+
+    def uninstall(self, cli_pkg: str) -> None:
+        out = subprocess.check_output(['pipx', 'list', '--json']).decode()
+
+        dct = json.loads(out)
+
+        if cli_pkg not in dct.get('venvs', {}):
+            return
+
+        subprocess.check_call([
+            'pipx',
+            'uninstall',
+            cli_pkg,
+        ])
+
+    def install(self, opts: InstallOpts) -> None:
+        subprocess.check_call([
+            'pipx',
+            'install',
+            f'--python={opts.py_ver}',
+            opts.cli_pkg,
+            *itertools.chain.from_iterable(['--preinstall', e] for e in (opts.extras or [])),
+        ])
+
+
+INSTALL_MGRS = {
+    'uv': UvInstallMgr(),
+    'pipx': PipxInstallMgr(),
+}
+
+
+def _main() -> None:
+    if sys.version_info < (3, 8):  # noqa
+        raise RuntimeError(f'Unsupported python version: {sys.version_info}')
+
+    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('extra', nargs='*')
+    args = parser.parse_args()
+
+    if not (cli := args.cli):
+        raise ValueError(f'Must specify cli')
+
+    if not (py := args.py):
+        raise ValueError(f'Must specify py')
+
+    if mgr := args.mgr:
+        if (im := INSTALL_MGRS.get(mgr)) is None:
+            raise ValueError(f'Unsupported mgr: {mgr}')
+        if not im.is_available():
+            raise ValueError(f'Unavailable mgr: {mgr}')
+    else:
+        for im in INSTALL_MGRS.values():
+            if im.is_available():
+                break
+        else:
+            raise RuntimeError("Can't find install manager")
+
+    for m in INSTALL_MGRS.values():
+        if m.is_available():
+            m.uninstall(cli)
+
+    im.install(InstallOpts(
+        cli_pkg=cli,
+        py_ver=py,
+        extras=args.extra,
+    ))
+
+
+if __name__ == '__main__':
+    _main()

omdev/tools/piptools.py

@@ -9,6 +9,7 @@ from omlish import check
 
 from ..cli import CliModule
 from ..packaging.names import canonicalize_name
+from ..packaging.requires import RequiresVariable
 from ..packaging.requires import parse_requirement
 
 
@@ -55,6 +56,7 @@ class Cli(ap.Cli):
         ap.arg('path', nargs='*'),
     )
     def list_root_dists(self) -> None:
+        # FIXME: track req extras - tuple[str, str] with ('pkg', '') as 'bare'?
         paths = self.args.path or sys.path
 
         dists: set[str] = set()
@@ -70,7 +72,8 @@ class Cli(ap.Cli):
             dists.add(dist_cn)
             for req_str in dist.requires or []:
                 req = parse_requirement(req_str)
-                if req.extras:
+
+                if any(v.value == 'extra' for m in req.marker or [] if isinstance(v := m[0], RequiresVariable)):
                     continue
 
                 req_cn = canonicalize_name(req.name)

{omdev-0.0.0.dev37.dist-info → omdev-0.0.0.dev39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev37
+Version: 0.0.0.dev39
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev37
+Requires-Dist: omlish ==0.0.0.dev39
 Provides-Extra: all
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
 Requires-Dist: cffi ~=1.17 ; extra == 'all'

{omdev-0.0.0.dev37.dist-info → omdev-0.0.0.dev39.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=Rb0JnDKfdMCMgojZmR1CfzyvnjPrToEaRJ3Pa4Tr0_E,2595
+omdev/.manifests.json,sha256=X-jJNWiAfaldoc7wO3STlzuU0GxQDqZecTg7Lcp-IrI,2848
 omdev/__about__.py,sha256=LqSNNFFcT84xW3W8fIOJ78kPYJKFLIXZyDX-AJREvN0,1005
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
@@ -55,6 +55,8 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZmCiwwxJuTmOirvBSL-Qw,15419
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=d23loR_cKfTYZwYiqpt_CmKI7dd5WcYFgIYzqMep75E,68
+omdev/cli/_version.py,sha256=coRbrHd53G7GLE3lg1KzG0GajUwEIr5kGzeJ_ABvPFc,217
+omdev/cli/install.py,sha256=9YegrJLDQYFYof6uB0S3ttAVvGCwtfMJypkFFkH63qI,3930
 omdev/cli/main.py,sha256=0Wq2tlaRDelpSEUZDKwOginpBrdcE3hgWQqD6syaIvE,1413
 omdev/cli/types.py,sha256=rYM5jogfZqC3tpWLOHSDL6iaV3XWGWM1hJYd11I-ImA,107
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -105,12 +107,12 @@ omdev/tools/dockertools.py,sha256=x00GV8j1KReMXwxJ641GlcsVwHoWeuzdIKVBp36BqwU,52
 omdev/tools/gittools.py,sha256=s_-cxh-4Nv2a_bJtHZ6AiKF8kx2IjDrt_GOH8Wjz-3M,669
 omdev/tools/importscan.py,sha256=XRLiasVSaTIp-jnO0-Nfhi0t6gnv_hVy5j2nVfEvuMI,3831
 omdev/tools/importtrace.py,sha256=oDry9CwIv5h96wSaTVKJ0qQ5vMGxYE5oBtfF-GYNLJs,13430
-omdev/tools/piptools.py,sha256=ANlJTM6ozbSkI6KPNNg7LIVg8wDc2OoK-M8GhjnFTiw,2559
+omdev/tools/piptools.py,sha256=lhwzGXD-v0KFEQNyvzvdO2Kw1OA_2AfGPBs_rIkz8iE,2772
 omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev37.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev37.dist-info/METADATA,sha256=IQuSit_OCW_wTB9O_EGapsmDJd8tGiZRG5b8X1qzmog,1252
-omdev-0.0.0.dev37.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev37.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev37.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev37.dist-info/RECORD,,
+omdev-0.0.0.dev39.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev39.dist-info/METADATA,sha256=t9mSly9pUKgpLgRdHoRVQrvCKyOPRW7s8m3dc-Y_wTM,1252
+omdev-0.0.0.dev39.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev39.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev39.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev39.dist-info/RECORD,,