PyPI - omdev - Versions diffs - 0.0.0.dev38__tar.gz → 0.0.0.dev39__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev38
+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.dev38
+Requires-Dist: omlish==0.0.0.dev39
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

@@ -11,3 +11,11 @@ Core packages installable from git via:
 Core packages have no required dependencies, but numerous optional ones - see their respective ``pyproject.toml`` files
 for details.
+The cli is installable through uvx or pipx via:
+.. code-block::
+  curl -LsSf https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py | python3 -
+Additional deps to be injected may be appended to the command.

@@ -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": 87,
+    "line": 88,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "pip",

@@ -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()

@@ -132,18 +132,17 @@ def _main() -> None:
     if not (py := args.py):
         raise ValueError(f'Must specify py')
-    if not (mgr := args.mgr):
-        if shutil.which('uv'):
-            mgr = 'uv'
-        elif shutil.which('pipx'):
-            mgr = 'pipx'
+    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 package manager")
-    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}')
+            raise RuntimeError("Can't find install manager")
     for m in INSTALL_MGRS.values():
         if m.is_available():

omdev 0.0.0.dev38tar.gz → 0.0.0.dev39tar.gz

@@ -56,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()

@@ -65,6 +65,7 @@ omdev/cexts/_distutils/compilers/options.py
 omdev/cexts/_distutils/compilers/unixccompiler.py
 omdev/cli/__init__.py
 omdev/cli/__main__.py
+omdev/cli/_version.py
 omdev/cli/install.py
 omdev/cli/main.py
 omdev/cli/types.py

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev38'
+version = '0.0.0.dev39'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev38',
+    'omlish == 0.0.0.dev39',
 ]
 [project.optional-dependencies]