omdev 0.0.0.dev44__py3-none-any.whl → 0.0.0.dev45__py3-none-any.whl

omdev/cli/install.py

@@ -120,7 +120,7 @@ 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,
@@ -148,6 +148,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/cli/managers.py

@@ -7,6 +7,16 @@ import sys
 ##
 
 
+def _normalize_pkg_name(s: str) -> str:
+    return s.lower().replace('_', '-')
+
+
+CLI_PKG = _normalize_pkg_name(__name__.split('.')[0])
+
+
+##
+
+
 class ManagerType(enum.Enum):
     UVX = 'uvx'
     PIPX = 'pipx'
@@ -14,12 +24,25 @@ class ManagerType(enum.Enum):
 
 def _detect_install_manager() -> 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:
-            if any(l.strip() == '[tool]' for l in f):
-                return ManagerType.UVX
+            dct = json.loads(f.read())
 
-    if os.path.isfile(os.path.join(sys.prefix, 'pipx_metadata.json')):
-        return ManagerType.PIPX
+        main_pkg = _normalize_pkg_name(dct.get('main_package', {}).get('package_or_url', ''))
+        if main_pkg == CLI_PKG:
+            return ManagerType.PIPX
 
     return None
 
@@ -34,17 +57,24 @@ def detect_install_manager() -> ManagerType | 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 _ensure_correct_path() -> None:
-    sp = site.getsitepackages()[0]
-    if sys.path[0] != sp:
-        sys.path.insert(0, sp)
+def _remove_empty_from_sys_path() -> None:
+    while '' in sys.path:
+        sys.path.remove('')
 
 
 class _PathHackMetaFinder:
     def find_spec(self, fullname, path, target=None):
-        _ensure_correct_path()
+        _remove_empty_from_sys_path()
         return None  # noqa
 
 

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.dist-info → omdev-0.0.0.dev45.dist-info}/METADATA

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

{omdev-0.0.0.dev44.dist-info → omdev-0.0.0.dev45.dist-info}/RECORD

@@ -56,9 +56,9 @@ omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZ
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=5IeIERm-371fSI5ZvPv8eldAJBwgKwpR0R49pTsILNM,76
 omdev/cli/clicli.py,sha256=NY4MF16007Ri31rUsq868u1V9JYDb_2atBALqjjXJK4,1624
-omdev/cli/install.py,sha256=gKqFComs8vk4h3kjXOELBSnJ_nvmzK4SCeJxAaCJCTI,4445
+omdev/cli/install.py,sha256=D-OlewQU3HJdt8F-u3C4o90Py5_XrFXhDxp_nXQvpko,4495
 omdev/cli/main.py,sha256=opoOOc_d4yCfI0_dWkwDV7O2WSnoybIH3YsylGFwqLI,2039
-omdev/cli/managers.py,sha256=FNfJ4G52un6tYGjr41WhRc6OAHlgiUsWejHEzqJPYuw,1669
+omdev/cli/managers.py,sha256=k2IkanY-vO_zSJqMrSaak3KjAhrGAjoOLBerTrM9o-A,2855
 omdev/cli/types.py,sha256=7_Owg0P8C8oOObSuOp6aEYSjkEukVFxTT00SRy1bLHM,250
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -109,13 +109,13 @@ omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/dockertools.py,sha256=x00GV8j1KReMXwxJ641GlcsVwHoWeuzdIKVBp36BqwU,5298
 omdev/tools/gittools.py,sha256=i2WFM2pX5riDJBchFXMmegOCuLSjvTkKC1ltqShSo7E,1773
 omdev/tools/importscan.py,sha256=usF35AjdMZacpe8nfP-wfzxelExT5sEQUORNcBKqr5M,3929
-omdev/tools/piptools.py,sha256=lhwzGXD-v0KFEQNyvzvdO2Kw1OA_2AfGPBs_rIkz8iE,2772
+omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
 omdev/tools/proftools.py,sha256=xKSm_yPoCnfsvS3iT9MblDqFMuZmGfI3_koGj8amMyU,145
 omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev44.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev44.dist-info/METADATA,sha256=j1hrMNfOxwMRq2knkUjKyCc6E0cYg1fP3w45COF6KhU,1252
-omdev-0.0.0.dev44.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev44.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev44.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev44.dist-info/RECORD,,
+omdev-0.0.0.dev45.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev45.dist-info/METADATA,sha256=0VYbpYlLSNXLvBrxEpOdijqa8PlkH72pNoxql6wYM8Q,1252
+omdev-0.0.0.dev45.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev45.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev45.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev45.dist-info/RECORD,,