omdev 0.0.0.dev355__tar.gz → 0.0.0.dev357__tar.gz

{omdev-0.0.0.dev355/omdev.egg-info → omdev-0.0.0.dev357}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev355
+Version: 0.0.0.dev357
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev355
+Requires-Dist: omlish==0.0.0.dev357
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 186,
+    "line": 193,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/ci/docker/dataserver.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import asyncio
 import contextlib
 import logging

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/ci/docker/repositories.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import contextlib
 import shlex

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/cli/clicli.py

@@ -91,11 +91,17 @@ class CliCli(ap.Cli):
         ap.arg('--local', action='store_true'),
         ap.arg('--no-deps', action='store_true'),
         ap.arg('--dry-run', action='store_true'),
+        ap.arg('--version'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
         latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
 
+        if self.args.version is not None:
+            target_version: str = self.args.version
+        else:
+            target_version = latest_version
+
         #
 
         dep_set: set[str] = set(self.args.extra_deps or [])
@@ -142,6 +148,7 @@ class CliCli(ap.Cli):
 
         print(f'Current version: {__about__.__version__}')
         print(f'Latest version: {latest_version}')
+        print(f'Target version: {target_version}')
         print()
 
         #
@@ -163,7 +170,7 @@ class CliCli(ap.Cli):
             reco_cmd = ' '.join([
                 'curl -LsSf',
                 f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
-                f'| python3 - --version {shlex.quote(latest_version)}',
+                f'| python3 - --version {shlex.quote(target_version)}',
                 *deps,
             ])
             print(f'Recovery command:\n\n{reco_cmd}\n')
@@ -178,7 +185,7 @@ class CliCli(ap.Cli):
             sys.executable,
             sys.executable,
             '-c', install_src,
-            '--version', latest_version,
+            '--version', target_version,
             *deps,
         )
 

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/cli.py

@@ -25,6 +25,9 @@ from .resolvers import InterpResolverProviders
 from .types import InterpSpecifier
 
 
+##
+
+
 class InterpCli(ArgparseCli):
     @cached_nullary
     def injector(self) -> Injector:

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/default.py

@@ -5,6 +5,9 @@ from .inject import bind_interp
 from .resolvers import InterpResolver
 
 
+##
+
+
 @cached_nullary
 def get_default_interp_resolver() -> InterpResolver:
     return inj.create_injector(bind_interp())[InterpResolver]

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/inject.py

@@ -15,6 +15,10 @@ from .pyenv.provider import PyenvInterpProvider
 from .resolvers import InterpResolver
 from .resolvers import InterpResolverProviders
 from .uv.inject import bind_interp_uv
+from .uv.provider import UvInterpProvider
+
+
+##
 
 
 def bind_interp() -> InjectorBindings:
@@ -36,6 +40,7 @@ def bind_interp() -> InjectorBindings:
             injector.provide(c)
             for c in [
                 PyenvInterpProvider,
+                UvInterpProvider,
                 RunningInterpProvider,
                 SystemInterpProvider,
             ]

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/inspect.py

@@ -12,6 +12,9 @@ from .types import InterpOpts
 from .types import InterpVersion
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpInspection:
     exe: str

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/providers/inject.py

@@ -11,6 +11,9 @@ from .running import RunningInterpProvider
 from .system import SystemInterpProvider
 
 
+##
+
+
 def bind_interp_providers() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(InterpProvider),

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/providers/running.py

@@ -10,6 +10,9 @@ from ..types import InterpVersion
 from .base import InterpProvider
 
 
+##
+
+
 class RunningInterpProvider(InterpProvider):
     @cached_nullary
     def version(self) -> InterpVersion:

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/providers/standalone.py

@@ -36,6 +36,9 @@ from omlish.lite.check import check
 from omlish.lite.logs import log
 
 
+##
+
+
 class StandalonePythons:
     LAST_TAG_FOR_I686_LINUX = '118809599'  # tag name: "20230826"
 

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/pyenv/inject.py

@@ -10,6 +10,9 @@ from .provider import PyenvInterpProvider
 from .pyenv import Pyenv
 
 
+##
+
+
 def bind_interp_pyenv() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(Pyenv, singleton=True),

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/pyenv/provider.py

@@ -17,6 +17,9 @@ from .install import PyenvVersionInstaller
 from .pyenv import Pyenv
 
 
+##
+
+
 class PyenvInterpProvider(InterpProvider):
     @dc.dataclass(frozen=True)
     class Options:

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/pyenv/pyenv.py

@@ -19,6 +19,9 @@ from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
 
 
+##
+
+
 class Pyenv:
     def __init__(
             self,

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/resolvers.py

@@ -9,6 +9,9 @@ from .types import InterpSpecifier
 from .types import InterpVersion
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpResolverProviders:
     providers: ta.Sequence[ta.Tuple[str, InterpProvider]]

omdev-0.0.0.dev357/omdev/interp/uv/inject.py

@@ -0,0 +1,24 @@
+# ruff: noqa: UP006 UP007 UP045
+import typing as ta
+
+from omlish.lite.inject import InjectorBindingOrBindings
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
+
+from ..providers.base import InterpProvider
+from .provider import UvInterpProvider
+from .uv import Uv
+
+
+##
+
+
+def bind_interp_uv() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(Uv, singleton=True),
+
+        inj.bind(UvInterpProvider, singleton=True),
+        inj.bind(InterpProvider, to_key=UvInterpProvider, array=True),
+    ]
+
+    return inj.as_bindings(*lst)

omdev-0.0.0.dev357/omdev/interp/uv/provider.py

@@ -0,0 +1,40 @@
+# ruff: noqa: UP006 UP007 UP045
+"""
+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 logging
+import typing as ta
+
+from ..inspect import InterpInspector
+from ..providers.base import InterpProvider
+from ..types import Interp
+from ..types import InterpSpecifier
+from ..types import InterpVersion
+from .uv import Uv
+
+
+##
+
+
+class UvInterpProvider(InterpProvider):
+    def __init__(
+            self,
+            *,
+            pyenv: Uv,
+            inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._pyenv = pyenv
+        self._inspector = inspector
+        self._log = log
+
+    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        return []
+
+    async def get_installed_version(self, version: InterpVersion) -> Interp:
+        raise NotImplementedError

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/interp/uv/uv.py

@@ -12,6 +12,9 @@ from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class UvConfig:
     ignore_path: bool = False

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/magic/magic.py

@@ -3,6 +3,9 @@ import dataclasses as dc
 import typing as ta
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class Magic:
     key: str

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/magic/prepare.py

@@ -2,6 +2,9 @@ import json
 import typing as ta
 
 
+##
+
+
 class MagicPrepareError(Exception):
     pass
 

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/magic/styles.py

@@ -3,6 +3,9 @@ import dataclasses as dc
 import typing as ta
 
 
+##
+
+
 MAGIC_KEY_PREFIX = '@omlish-'
 
 

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/precheck/git.py

@@ -25,7 +25,7 @@ class GitBlacklistPrecheck(Precheck['GitBlacklistPrecheck.Config']):
     def __init__(self, config: Config = Config()) -> None:
         super().__init__(config)
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for f in self._config.files:
             proc = await asyncio.create_subprocess_exec('git', 'status', '-s', f)
             await proc.communicate()

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/precheck/imports.py

@@ -35,7 +35,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
         self._headers_cache = headers_cache
         self._ast_cache = ast_cache
 
-    async def _run_py_file(self, py_file: str, src_root: str) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def _run_py_file(self, py_file: str, src_root: str) -> ta.AsyncGenerator[Precheck.Violation]:
         if isinstance(header_lines := self._headers_cache.get_file_headers(py_file), Exception):
             return
         if any(hl.src.strip() == '# ruff: noqa' for hl in header_lines):
@@ -58,7 +58,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
 
         return
 
-    async def _run_src_root(self, src_root: str) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def _run_src_root(self, src_root: str) -> ta.AsyncGenerator[Precheck.Violation]:
         py_files = [
             os.path.join(e.root, f)
             for e in self._dir_walk_cache.list_dir(src_root)
@@ -70,7 +70,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
             async for v in self._run_py_file(py_file, src_root):
                 yield v
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in self._context.src_roots:
             async for v in self._run_src_root(src_root):
                 yield v

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/precheck/lite.py

@@ -157,7 +157,7 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         else:
             raise RuntimeError(f'Unknown target kind: {tgt.kind}')
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         tgts = await self._collect_targets()
 
         sem = asyncio.Semaphore(self._config.concurrency)

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/precheck/manifests.py

@@ -20,7 +20,7 @@ class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
 
         self._context = context
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in self._context.src_roots:
             try:
                 MANIFEST_LOADER.load(src_root)

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/precheck/scripts.py

@@ -26,7 +26,7 @@ class ScriptDepsPrecheck(Precheck['ScriptDepsPrecheck.Config']):
 
         self._context = context
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for fp in magic.find_magic_files(
                 magic.PY_MAGIC_STYLE,
                 self._context.src_roots,

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/scripts/ci.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../ci/cli.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP043 UP045
 """
 Inputs:
  - requirements.txt

{omdev-0.0.0.dev355 → omdev-0.0.0.dev357}/omdev/scripts/interp.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../interp/cli.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 UP006 UP007 UP036 UP043 UP045
 """
 TODO:
  - partial best-matches - '3.12'
@@ -34,6 +34,7 @@ import shlex
 import shutil
 import subprocess
 import sys
+import tempfile
 import threading
 import time
 import types
@@ -4020,16 +4021,6 @@ class Interp:
     version: InterpVersion
 
 
-########################################
-# ../uv/inject.py
-
-
-def bind_interp_uv() -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = []
-
-    return inj.as_bindings(*lst)
-
-
 ########################################
 # ../../../omlish/logs/standard.py
 """
@@ -4435,6 +4426,9 @@ class BaseSubprocesses(abc.ABC):  # noqa
 # ../resolvers.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpResolverProviders:
     providers: ta.Sequence[ta.Tuple[str, InterpProvider]]
@@ -4829,6 +4823,9 @@ asyncio_subprocesses = AsyncioSubprocesses()
 # ../inspect.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpInspection:
     exe: str
@@ -4938,6 +4935,9 @@ TODO:
 """
 
 
+##
+
+
 class Pyenv:
     def __init__(
             self,
@@ -5005,10 +5005,74 @@ class Pyenv:
         return True
 
 
+########################################
+# ../uv/uv.py
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class UvConfig:
+    ignore_path: bool = False
+    pip_bootstrap: bool = True
+
+
+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
+
+
 ########################################
 # ../providers/running.py
 
 
+##
+
+
 class RunningInterpProvider(InterpProvider):
     @cached_nullary
     def version(self) -> InterpVersion:
@@ -5415,10 +5479,47 @@ class PyenvVersionInstaller:
         return exe
 
 
+########################################
+# ../uv/provider.py
+"""
+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
+"""
+
+
+##
+
+
+class UvInterpProvider(InterpProvider):
+    def __init__(
+            self,
+            *,
+            pyenv: Uv,
+            inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._pyenv = pyenv
+        self._inspector = inspector
+        self._log = log
+
+    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        return []
+
+    async def get_installed_version(self, version: InterpVersion) -> Interp:
+        raise NotImplementedError
+
+
 ########################################
 # ../providers/inject.py
 
 
+##
+
+
 def bind_interp_providers() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(InterpProvider),
@@ -5438,6 +5539,9 @@ def bind_interp_providers() -> InjectorBindings:
 # ../pyenv/provider.py
 
 
+##
+
+
 class PyenvInterpProvider(InterpProvider):
     @dc.dataclass(frozen=True)
     class Options:
@@ -5565,10 +5669,31 @@ class PyenvInterpProvider(InterpProvider):
         return Interp(exe, version)
 
 
+########################################
+# ../uv/inject.py
+
+
+##
+
+
+def bind_interp_uv() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(Uv, singleton=True),
+
+        inj.bind(UvInterpProvider, singleton=True),
+        inj.bind(InterpProvider, to_key=UvInterpProvider, array=True),
+    ]
+
+    return inj.as_bindings(*lst)
+
+
 ########################################
 # ../pyenv/inject.py
 
 
+##
+
+
 def bind_interp_pyenv() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(Pyenv, singleton=True),
@@ -5584,6 +5709,9 @@ def bind_interp_pyenv() -> InjectorBindings:
 # ../inject.py
 
 
+##
+
+
 def bind_interp() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         bind_interp_providers(),
@@ -5603,6 +5731,7 @@ def bind_interp() -> InjectorBindings:
             injector.provide(c)
             for c in [
                 PyenvInterpProvider,
+                UvInterpProvider,
                 RunningInterpProvider,
                 SystemInterpProvider,
             ]
@@ -5625,6 +5754,9 @@ def bind_interp() -> InjectorBindings:
 # cli.py
 
 
+##
+
+
 class InterpCli(ArgparseCli):
     @cached_nullary
     def injector(self) -> Injector: