omdev 0.0.0.dev185__py3-none-any.whl → 0.0.0.dev187__py3-none-any.whl

omdev/interp/cli.py

@@ -66,7 +66,7 @@ async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
     check_lite_runtime_version()
     configure_standard_logging()
 
-    cli = ArgparseCli(argv)
+    cli = InterpCli(argv)
     await cli.async_cli_run()
 
 

omdev/interp/uv/provider.py

@@ -0,0 +1,21 @@
+# ruff: noqa: UP006 UP007
+"""
+uv run pip
+uv run --python 3.11.6 pip
+uv venv --python 3.11.6 --seed barf
+python3 -m venv barf && barf/bin/pip install uv && barf/bin/uv venv --python 3.11.6 --seed barf2
+"""
+import typing as ta
+
+from ..providers.base import InterpProvider
+from ..types import Interp
+from ..types import InterpSpecifier
+from ..types import InterpVersion
+
+
+class UvInterpProvider(InterpProvider):
+    def get_installed_versions(self, spec: InterpSpecifier) -> ta.Awaitable[ta.Sequence[InterpVersion]]:
+        raise NotImplementedError
+
+    def get_installed_version(self, version: InterpVersion) -> ta.Awaitable[Interp]:
+        raise NotImplementedError

omdev/interp/uv/uv.py

@@ -1,21 +1,66 @@
 # ruff: noqa: UP006 UP007
-"""
-uv run pip
-uv run --python 3.11.6 pip
-uv venv --python 3.11.6 --seed barf
-python3 -m venv barf && barf/bin/pip install uv && barf/bin/uv venv --python 3.11.6 --seed barf2
-"""
+import dataclasses as dc
+import logging
+import os.path
+import shutil
+import sys
+import tempfile
 import typing as ta
 
-from ..providers.base import InterpProvider
-from ..types import Interp
-from ..types import InterpSpecifier
-from ..types import InterpVersion
+from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.cached import async_cached_nullary
+from omlish.lite.check import check
 
 
-class PyenvInterpProvider(InterpProvider):
-    def get_installed_versions(self, spec: InterpSpecifier) -> ta.Awaitable[ta.Sequence[InterpVersion]]:
-        raise NotImplementedError
+@dc.dataclass(frozen=True)
+class UvConfig:
+    ignore_path: bool = False
+    pip_bootstrap: bool = True
 
-    def get_installed_version(self, version: InterpVersion) -> ta.Awaitable[Interp]:
-        raise NotImplementedError
+
+class Uv:
+    def __init__(
+            self,
+            config: UvConfig = UvConfig(),
+            *,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._config = config
+        self._log = log
+
+        self._bootstrap_dir: ta.Optional[str] = None
+
+    def delete_bootstrap_dir(self) -> bool:
+        if (bs := self._bootstrap_dir) is None:
+            return False
+
+        shutil.rmtree(bs)
+        self._bootstrap_dir = None
+        return True
+
+    @async_cached_nullary
+    async def uv_exe(self) -> ta.Optional[str]:
+        if not self._config.ignore_path and (uv := shutil.which('uv')):
+            return uv
+
+        if self._config.pip_bootstrap:
+            if (bd := self._bootstrap_dir) is None:
+                bd = self._bootstrap_dir = tempfile.mkdtemp()
+
+            if self._log is not None:
+                self._log.info(f'Bootstrapping uv into %s', bd)
+
+            vn = 'uv-bootstrap'
+            await asyncio_subprocesses.check_call(os.path.realpath(sys.executable), '-m', 'venv', vn, cwd=bd)
+
+            vx = os.path.join(bd, vn, 'bin', 'python3')
+            await asyncio_subprocesses.check_call(vx, '-m', 'pip', 'install', 'uv', cwd=bd)
+
+            ux = os.path.join(bd, vn, 'bin', 'uv')
+            check.state(os.path.isfile(ux))
+
+            return ux
+
+        return None

omdev/scripts/interp.py

@@ -5070,7 +5070,7 @@ async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
     check_lite_runtime_version()
     configure_standard_logging()
 
-    cli = ArgparseCli(argv)
+    cli = InterpCli(argv)
     await cli.async_cli_run()
 
 

{omdev-0.0.0.dev185.dist-info → omdev-0.0.0.dev187.dist-info}/METADATA

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

{omdev-0.0.0.dev185.dist-info → omdev-0.0.0.dev187.dist-info}/RECORD

@@ -82,7 +82,7 @@ omdev/git/status.py,sha256=s_5kzyaSO-ikimdi54A6DrjOQPMeM5SRXLTrb22Alp4,8106
 omdev/git/subtrees.py,sha256=XFxE74PBqu_E5arpkCRRgsus5nof0TBfd2nmgh4cczA,2398
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
-omdev/interp/cli.py,sha256=_oaG5fN-UE2sQUNeCi4b9m5UF_lPEJ2S9nO_no1cvXI,2394
+omdev/interp/cli.py,sha256=RMmMPYMbWnsb8mkmUaa2JKLoEvbLn201v41ExgZGfi0,2392
 omdev/interp/default.py,sha256=FTFQVvA8Lipe8k5eFbf-mLIbrcmfuEXka4ifPyQP8CA,285
 omdev/interp/inject.py,sha256=fJyYvGqYVmXweKDFN-B_y8pemIYhWS9Y9qM3IApBz0M,1482
 omdev/interp/inspect.py,sha256=UnRA1w-tm5xrFR0ovlLHo_smDqmzoF7TuZBQbhYF_CA,2966
@@ -102,7 +102,8 @@ omdev/interp/pyenv/provider.py,sha256=RvPWnT5Fpj85gYxfw9o8E4kNtgvM0AcXk8_7FUk7rT
 omdev/interp/pyenv/pyenv.py,sha256=1Gt77di-lxeje9SnNYCWhYRo7CHdhTWZD0whvPanNP8,2643
 omdev/interp/uv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/interp/uv/inject.py,sha256=3nHYu8qQMbV5iXdp-ItzNtfYE0zkIxrzmt7QdV7WiXU,314
-omdev/interp/uv/uv.py,sha256=oP4V6WJ0aYLIzFwkIvKMPLD_5HxppTuhd8fvtz6UoXs,671
+omdev/interp/uv/provider.py,sha256=_4EoNPv1pDK8d_r1z_eES1pEW6ci4UPvefYWGOWeSPg,668
+omdev/interp/uv/uv.py,sha256=O1fArTkjwddVYyFe0hL1tB2TIUoCX8CD0FCRRfnD9T0,1773
 omdev/magic/__init__.py,sha256=CBzRB71RLyylkrj8dph6JUEddA8KSMJvDgriHqFfJGU,478
 omdev/magic/__main__.py,sha256=1_BAKDtA6Rn5hswyl4S5J78BPRbynX4is_wQsD0U7jI,161
 omdev/magic/cli.py,sha256=puL5Snnc-i9Dpa3AU8DtaCp5qUd_7RXwv-qWU_B2fa8,1184
@@ -150,7 +151,7 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=mkHsByunXDVHLYOZgc17UDXtHPJl8dFRbJmwUptmuOg,140900
+omdev/scripts/interp.py,sha256=M_xCcROzRJsE0VpHRqMNoRjwRUy0XnQBZ7lb7nrDNW0,140898
 omdev/scripts/pyproject.py,sha256=ox4UoF2Uafvv_T6qwxe4tdifmiEp4g1pHKMAcnLDokE,242509
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
@@ -180,9 +181,9 @@ omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev185.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev185.dist-info/METADATA,sha256=pVWh-eMPpr72jIRhNOB1Wxt27Hd4ZKFVC6T0Itrphm8,1760
-omdev-0.0.0.dev185.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev185.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev185.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev185.dist-info/RECORD,,
+omdev-0.0.0.dev187.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev187.dist-info/METADATA,sha256=7LD-wzkcezxDM_DpPMUrxCiljCvJXBgF5gb_zvgXNXI,1760
+omdev-0.0.0.dev187.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev187.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev187.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev187.dist-info/RECORD,,