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

omdev/cli/install.py

@@ -86,6 +86,7 @@ class UvxInstallManager(InstallManager):
             '--from', opts.cli_pkg,
             'om',
             '_post_install',
+            opts.cli_pkg,
         ])
 
 
@@ -125,6 +126,7 @@ class PipxInstallManager(InstallManager):
         subprocess.check_call([
             exe,
             '_post_install',
+            opts.cli_pkg,
         ])
 
 

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/cli/managers.py

@@ -11,9 +11,6 @@ def _normalize_pkg_name(s: str) -> str:
     return s.lower().replace('_', '-')
 
 
-CLI_PKG = _normalize_pkg_name(__name__.split('.')[0])
-
-
 ##
 
 
@@ -22,7 +19,7 @@ class ManagerType(enum.Enum):
     PIPX = 'pipx'
 
 
-def _detect_install_manager() -> ManagerType | None:
+def detect_install_manager(cli_pkg: str) -> ManagerType | None:
     if os.path.isfile(fp := os.path.join(sys.prefix, 'uv-receipt.toml')):
         import tomllib
 
@@ -31,7 +28,7 @@ def _detect_install_manager() -> ManagerType | None:
 
         reqs = dct.get('tool', {}).get('requirements')
         main_pkg = _normalize_pkg_name(reqs[0].get('name', ''))
-        if reqs and main_pkg == CLI_PKG:
+        if reqs and main_pkg == cli_pkg:
             return ManagerType.UVX
 
     if os.path.isfile(fp := os.path.join(sys.prefix, 'pipx_metadata.json')):
@@ -41,21 +38,12 @@ def _detect_install_manager() -> ManagerType | None:
             dct = json.loads(f.read())
 
         main_pkg = _normalize_pkg_name(dct.get('main_package', {}).get('package_or_url', ''))
-        if main_pkg == CLI_PKG:
+        if main_pkg == cli_pkg:
             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
-
-
 ##
 # 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
@@ -100,8 +88,8 @@ def _install_path_hack_file() -> None:
 ##
 
 
-def setup_install_manager() -> None:
-    if detect_install_manager() is None:
+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.dev45.dist-info → omdev-0.0.0.dev46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev45
+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.dev45
+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.dev45.dist-info → omdev-0.0.0.dev46.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=D-OlewQU3HJdt8F-u3C4o90Py5_XrFXhDxp_nXQvpko,4495
-omdev/cli/main.py,sha256=opoOOc_d4yCfI0_dWkwDV7O2WSnoybIH3YsylGFwqLI,2039
-omdev/cli/managers.py,sha256=k2IkanY-vO_zSJqMrSaak3KjAhrGAjoOLBerTrM9o-A,2855
+omdev/cli/install.py,sha256=SNsCGUeX5IRR9qpkBUCeK7l0nJ_21JsmTYw7Fwu_cs8,4547
+omdev/cli/main.py,sha256=yRbomneGgDPc7cjN8nMpjLmwKqOrKM6U36b5ED9q6T8,2058
+omdev/cli/managers.py,sha256=SbI9XVP2BL8HOjOPyB8pkzB3enKfN6kabgpr9Y_VSW8,2592
 omdev/cli/types.py,sha256=7_Owg0P8C8oOObSuOp6aEYSjkEukVFxTT00SRy1bLHM,250
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -113,9 +113,9 @@ 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.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,,
+omdev-0.0.0.dev46.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev46.dist-info/METADATA,sha256=XQ_vi_7osOuVsrnp1mFQAuBGFkT317XYxBLXjWzDZBg,1252
+omdev-0.0.0.dev46.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev46.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev46.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev46.dist-info/RECORD,,