omdev 0.0.0.dev44__tar.gz → 0.0.0.dev46__tar.gz

{omdev-0.0.0.dev44/omdev.egg-info → omdev-0.0.0.dev46}/PKG-INFO

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

{omdev-0.0.0.dev44 → omdev-0.0.0.dev46}/omdev/cli/install.py

@@ -86,6 +86,7 @@ class UvxInstallManager(InstallManager):
             '--from', opts.cli_pkg,
             'om',
             '_post_install',
+            opts.cli_pkg,
         ])
 
 
@@ -120,11 +121,12 @@ class PipxInstallManager(InstallManager):
 
         dct = self._list_installed()
 
-        exe = dct[opts.cli_pkg]['metadata']['main_package']['app_paths'][0]['__Path__']
+        exe = dct['venvs'][opts.cli_pkg]['metadata']['main_package']['app_paths'][0]['__Path__']
 
         subprocess.check_call([
             exe,
             '_post_install',
+            opts.cli_pkg,
         ])
 
 
@@ -148,6 +150,8 @@ def _main() -> None:
     if not (cli := args.cli):
         raise ValueError(f'Must specify cli')
 
+    cli = cli.lower().replace('_', '-')
+
     if not (py := args.py):
         raise ValueError(f'Must specify py')
 

{omdev-0.0.0.dev44 → omdev-0.0.0.dev46}/omdev/cli/main.py

@@ -23,10 +23,10 @@ from .types import CliModule
 ##
 
 
-def _post_install() -> None:
+def _post_install(cli_pkg: str) -> None:
     from .managers import setup_install_manager
 
-    setup_install_manager()
+    setup_install_manager(cli_pkg)
 
 
 ##

omdev-0.0.0.dev46/omdev/cli/managers.py

@@ -0,0 +1,95 @@
+import enum
+import os.path
+import site
+import sys
+
+
+##
+
+
+def _normalize_pkg_name(s: str) -> str:
+    return s.lower().replace('_', '-')
+
+
+##
+
+
+class ManagerType(enum.Enum):
+    UVX = 'uvx'
+    PIPX = 'pipx'
+
+
+def detect_install_manager(cli_pkg: str) -> ManagerType | None:
+    if os.path.isfile(fp := os.path.join(sys.prefix, 'uv-receipt.toml')):
+        import tomllib
+
+        with open(fp) as f:
+            dct = tomllib.loads(f.read())
+
+        reqs = dct.get('tool', {}).get('requirements')
+        main_pkg = _normalize_pkg_name(reqs[0].get('name', ''))
+        if reqs and main_pkg == cli_pkg:
+            return ManagerType.UVX
+
+    if os.path.isfile(fp := os.path.join(sys.prefix, 'pipx_metadata.json')):
+        import json
+
+        with open(fp) as f:
+            dct = json.loads(f.read())
+
+        main_pkg = _normalize_pkg_name(dct.get('main_package', {}).get('package_or_url', ''))
+        if main_pkg == cli_pkg:
+            return ManagerType.PIPX
+
+    return None
+
+
+##
+# Python is insistent in prepending sys.path with an empty string (translating to the current working directory),
+# which leads to problems when using the cli in directories containing python packages (such as within this very
+# source tree). This can't be done in cli main as the code frequently spawns other sys.executable processes which
+# wouldn't know to do that, so a .pth file hack is used. Cleaning sys.path solely there is also insufficient as that
+# code runs before the problematic empty string is added, so a sys.meta_path hook is prepended.
+#
+# See:
+#     https://github.com/python/cpython/blob/da1e5526aee674bb33c17a498aa3781587b9850c/Python/sysmodule.c#L3939
+
+
+def _remove_empty_from_sys_path() -> None:
+    while '' in sys.path:
+        sys.path.remove('')
+
+
+class _PathHackMetaFinder:
+    def find_spec(self, fullname, path, target=None):
+        _remove_empty_from_sys_path()
+        return None  # noqa
+
+
+def _activate_path_hack() -> None:
+    if not any(isinstance(mp, _PathHackMetaFinder) for mp in sys.meta_path):
+        sys.meta_path.insert(0, _PathHackMetaFinder())
+
+
+_PATH_HACK_FILE_NAME = f'{"-".join(__name__.split("."))}-path-hack.pth'
+
+
+def _install_path_hack_file() -> None:
+    sp = site.getsitepackages()[0]
+    if os.path.isfile(fp := os.path.join(sp, _PATH_HACK_FILE_NAME)):
+        return
+
+    with open(fp, 'w') as f:
+        f.write(f'import {__name__}; {__name__}._activate_path_hack()')
+
+    _activate_path_hack()
+
+
+##
+
+
+def setup_install_manager(cli_pkg: str) -> None:
+    if detect_install_manager(cli_pkg) is None:
+        return
+
+    _install_path_hack_file()

{omdev-0.0.0.dev44 → omdev-0.0.0.dev46}/omdev/tools/piptools.py

@@ -66,7 +66,7 @@ class Cli(ap.Cli):
             dist_cn = canonicalize_name(dist.metadata['Name'], validate=True)
             if dist_cn in dists:
                 # raise NameError(dist_cn)
-                print(f'!! duplicate dist: {dist_cn}', file=sys.stderr)
+                # print(f'!! duplicate dist: {dist_cn}', file=sys.stderr)
                 continue
 
             dists.add(dist_cn)

{omdev-0.0.0.dev44 → omdev-0.0.0.dev46/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev44 → omdev-0.0.0.dev46}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev44
+omlish==0.0.0.dev46
 
 [all]
 pycparser~=2.22

{omdev-0.0.0.dev44 → omdev-0.0.0.dev46}/pyproject.toml

@@ -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.dev44'
+version = '0.0.0.dev46'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev44',
+    'omlish == 0.0.0.dev46',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev44/omdev/cli/managers.py

@@ -1,77 +0,0 @@
-import enum
-import os.path
-import site
-import sys
-
-
-##
-
-
-class ManagerType(enum.Enum):
-    UVX = 'uvx'
-    PIPX = 'pipx'
-
-
-def _detect_install_manager() -> ManagerType | None:
-    if os.path.isfile(fp := os.path.join(sys.prefix, 'uv-receipt.toml')):
-        with open(fp) as f:
-            if any(l.strip() == '[tool]' for l in f):
-                return ManagerType.UVX
-
-    if os.path.isfile(os.path.join(sys.prefix, 'pipx_metadata.json')):
-        return ManagerType.PIPX
-
-    return None
-
-
-def detect_install_manager() -> ManagerType | None:
-    try:
-        return globals()['_DETECTED_MANAGER_TYPE']
-    except KeyError:
-        pass
-    ret = globals()['_DETECTED_MANAGER_TYPE'] = _detect_install_manager()
-    return ret
-
-
-##
-
-
-def _ensure_correct_path() -> None:
-    sp = site.getsitepackages()[0]
-    if sys.path[0] != sp:
-        sys.path.insert(0, sp)
-
-
-class _PathHackMetaFinder:
-    def find_spec(self, fullname, path, target=None):
-        _ensure_correct_path()
-        return None  # noqa
-
-
-def _activate_path_hack() -> None:
-    if not any(isinstance(mp, _PathHackMetaFinder) for mp in sys.meta_path):
-        sys.meta_path.insert(0, _PathHackMetaFinder())
-
-
-_PATH_HACK_FILE_NAME = f'{"-".join(__name__.split("."))}-path-hack.pth'
-
-
-def _install_path_hack_file() -> None:
-    sp = site.getsitepackages()[0]
-    if os.path.isfile(fp := os.path.join(sp, _PATH_HACK_FILE_NAME)):
-        return
-
-    with open(fp, 'w') as f:
-        f.write(f'import {__name__}; {__name__}._activate_path_hack()')
-
-    _activate_path_hack()
-
-
-##
-
-
-def setup_install_manager() -> None:
-    if detect_install_manager() is None:
-        return
-
-    _install_path_hack_file()