omdev 0.0.0.dev45__tar.gz → 0.0.0.dev47__tar.gz

{omdev-0.0.0.dev45/omdev.egg-info → omdev-0.0.0.dev47}/PKG-INFO

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

{omdev-0.0.0.dev45 → omdev-0.0.0.dev47}/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-0.0.0.dev45 → omdev-0.0.0.dev47}/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.dev45 → omdev-0.0.0.dev47}/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 → omdev-0.0.0.dev47/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev45 → omdev-0.0.0.dev47}/omdev.egg-info/requires.txt

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

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