omdev 0.0.0.dev158__tar.gz → 0.0.0.dev160__tar.gz

{omdev-0.0.0.dev158/omdev.egg-info → omdev-0.0.0.dev160}/PKG-INFO

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

{omdev-0.0.0.dev158 → omdev-0.0.0.dev160}/omdev/amalg/amalg.py

@@ -41,7 +41,7 @@ import tokenize_rt as trt
 from omlish import check
 from omlish import collections as col
 from omlish import lang
-from omlish.lite.runtime import REQUIRED_PYTHON_VERSION
+from omlish.lite.runtime import LITE_REQUIRED_PYTHON_VERSION
 from omlish.logs import all as logs
 
 from .. import magic
@@ -595,11 +595,11 @@ def gen_amalg(
     out.write('\n\n')
 
     version_check_fail_msg = (
-        f'Requires python {REQUIRED_PYTHON_VERSION!r}, '
+        f'Requires python {LITE_REQUIRED_PYTHON_VERSION!r}, '
         f'got {{sys.version_info}} from {{sys.executable}}'
     )
     out.write(textwrap.dedent(f"""
-    if sys.version_info < {REQUIRED_PYTHON_VERSION!r}:
+    if sys.version_info < {LITE_REQUIRED_PYTHON_VERSION!r}:
         raise OSError(f{version_check_fail_msg!r})  # noqa
     """).lstrip())
     out.write('\n\n')

{omdev-0.0.0.dev158 → omdev-0.0.0.dev160}/omdev/cache/data/cache.py

@@ -27,7 +27,7 @@ from omlish import marshal as msh
 from omlish.formats import json
 from omlish.os.files import touch
 
-from ... import git
+from ...git.subtrees import git_clone_subtree
 from .actions import Action
 from .actions import ExtractAction
 from .manifests import Manifest
@@ -148,7 +148,7 @@ class Cache:
 
             log.info('Cloning git repo: %s -> %s', spec.url, tmp_dir)
 
-            git.git_clone_subtree(
+            git_clone_subtree(
                 base_dir=tmp_dir,
                 repo_url=spec.url,
                 repo_dir='data',

{omdev-0.0.0.dev158 → omdev-0.0.0.dev160}/omdev/cache/data/manifests.py

@@ -4,7 +4,7 @@ from omlish import __about__ as about
 from omlish import cached
 from omlish import dataclasses as dc
 
-from ...git import get_git_revision
+from ...git.revisions import get_git_revision
 from .consts import SERIALIZATION_VERSION
 from .specs import Spec
 

omdev-0.0.0.dev160/omdev/git/revisions.py

@@ -0,0 +1,50 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import os.path
+import subprocess
+import typing as ta
+
+from omlish.subprocesses import subprocess_maybe_shell_wrap_exec
+from omlish.subprocesses import subprocesses
+
+
+def get_git_revision(
+        *,
+        cwd: ta.Optional[str] = None,
+) -> ta.Optional[str]:
+    subprocesses.check_output('git', '--version')
+
+    if cwd is None:
+        cwd = os.getcwd()
+
+    if subprocess.run(  # noqa
+            subprocess_maybe_shell_wrap_exec(
+                'git',
+                'rev-parse',
+                '--is-inside-work-tree',
+            ),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+    ).returncode:
+        return None
+
+    has_untracked = bool(subprocesses.check_output(
+        'git',
+        'ls-files',
+        '.',
+        '--exclude-standard',
+        '--others',
+        cwd=cwd,
+    ).decode().strip())
+
+    dirty_rev = subprocesses.check_output(
+        'git',
+        'describe',
+        '--match=NeVeRmAtCh',
+        '--always',
+        '--abbrev=40',
+        '--dirty',
+        cwd=cwd,
+    ).decode().strip()
+
+    return dirty_rev + ('-untracked' if has_untracked else '')

omdev-0.0.0.dev158/omdev/git.py → omdev-0.0.0.dev160/omdev/git/status.py

@@ -1,11 +1,5 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
-"""
-git status
-  --porcelain=v1
-  --ignore-submodules
-  2>/dev/null
-"""
 import dataclasses as dc
 import enum
 import os.path
@@ -16,111 +10,6 @@ from omlish.lite.check import check
 from omlish.subprocesses import subprocess_maybe_shell_wrap_exec
 
 
-##
-
-
-def git_clone_subtree(
-        *,
-        base_dir: str,
-        repo_url: str,
-        repo_dir: str,
-        branch: ta.Optional[str] = None,
-        rev: ta.Optional[str] = None,
-        repo_subtrees: ta.Sequence[str],
-) -> None:
-    if not bool(branch) ^ bool(rev):
-        raise ValueError('must set branch or rev')
-
-    if isinstance(repo_subtrees, str):
-        raise TypeError(repo_subtrees)
-
-    git_opts = [
-        '-c', 'advice.detachedHead=false',
-    ]
-
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'clone',
-            '-n',
-            '--depth=1',
-            '--filter=tree:0',
-            *(['-b', branch] if branch else []),
-            '--single-branch',
-            repo_url,
-            repo_dir,
-        ),
-        cwd=base_dir,
-    )
-
-    rd = os.path.join(base_dir, repo_dir)
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'sparse-checkout',
-            'set',
-            '--no-cone',
-            *repo_subtrees,
-        ),
-        cwd=rd,
-    )
-
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'checkout',
-            *([rev] if rev else []),
-        ),
-        cwd=rd,
-    )
-
-
-def get_git_revision(
-        *,
-        cwd: ta.Optional[str] = None,
-) -> ta.Optional[str]:
-    subprocess.check_output(subprocess_maybe_shell_wrap_exec('git', '--version'))
-
-    if cwd is None:
-        cwd = os.getcwd()
-
-    if subprocess.run(  # noqa
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            'rev-parse',
-            '--is-inside-work-tree',
-        ),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    ).returncode:
-        return None
-
-    has_untracked = bool(subprocess.check_output(subprocess_maybe_shell_wrap_exec(
-        'git',
-        'ls-files',
-        '.',
-        '--exclude-standard',
-        '--others',
-    ), cwd=cwd).decode().strip())
-
-    dirty_rev = subprocess.check_output(subprocess_maybe_shell_wrap_exec(
-        'git',
-        'describe',
-        '--match=NeVeRmAtCh',
-        '--always',
-        '--abbrev=40',
-        '--dirty',
-    ), cwd=cwd).decode().strip()
-
-    return dirty_rev + ('-untracked' if has_untracked else '')
-
-
-##
-
-
 _GIT_STATUS_LINE_ESCAPE_CODES: ta.Mapping[str, str] = {
     '\\': '\\',
     '"': '"',

omdev-0.0.0.dev160/omdev/git/subtrees.py

@@ -0,0 +1,100 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import os.path
+import typing as ta
+
+from omlish.subprocesses import subprocesses
+
+
+@dc.dataclass(frozen=True)
+class GitSubtreeCloner:
+    base_dir: str
+    repo_url: str
+    repo_dir: str
+
+    # _: dc.KW_ONLY
+
+    repo_subtrees: ta.Sequence[str]
+
+    branch: ta.Optional[str] = None
+    rev: ta.Optional[str] = None
+
+    def __post_init__(self) -> None:
+        if not bool(self.branch) ^ bool(self.rev):
+            raise ValueError('must set branch or rev')
+
+        if isinstance(self.repo_subtrees, str):
+            raise TypeError(self.repo_subtrees)
+
+    @dc.dataclass(frozen=True)
+    class Command:
+        cmd: ta.Sequence[str]
+        cwd: str
+
+    def build_commands(self) -> ta.Iterator[Command]:
+        git_opts = [
+            '-c', 'advice.detachedHead=false',
+        ]
+
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'clone',
+                '-n',
+                '--depth=1',
+                '--filter=tree:0',
+                *(['-b', self.branch] if self.branch else []),
+                '--single-branch',
+                self.repo_url,
+                self.repo_dir,
+            ),
+            cwd=self.base_dir,
+        )
+
+        rd = os.path.join(self.base_dir, self.repo_dir)
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'sparse-checkout',
+                'set',
+                '--no-cone',
+                *self.repo_subtrees,
+            ),
+            cwd=rd,
+        )
+
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'checkout',
+                *([self.rev] if self.rev else []),
+            ),
+            cwd=rd,
+        )
+
+
+def git_clone_subtree(
+        *,
+        base_dir: str,
+        repo_url: str,
+        repo_dir: str,
+        branch: ta.Optional[str] = None,
+        rev: ta.Optional[str] = None,
+        repo_subtrees: ta.Sequence[str],
+) -> None:
+    for cmd in GitSubtreeCloner(
+        base_dir=base_dir,
+        repo_url=repo_url,
+        repo_dir=repo_dir,
+        branch=branch,
+        rev=rev,
+        repo_subtrees=repo_subtrees,
+    ).build_commands():
+        subprocesses.check_call(
+            *cmd.cmd,
+            cwd=cmd.cwd,
+        )

{omdev-0.0.0.dev158 → omdev-0.0.0.dev160}/omdev/interp/cli.py

@@ -12,7 +12,7 @@ import asyncio
 import typing as ta
 
 from omlish.lite.check import check
-from omlish.lite.runtime import check_runtime_version
+from omlish.lite.runtime import check_lite_runtime_version
 from omlish.logs.standard import configure_standard_logging
 
 from .resolvers import DEFAULT_INTERP_RESOLVER
@@ -58,7 +58,7 @@ def _build_parser() -> argparse.ArgumentParser:
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-    check_runtime_version()
+    check_lite_runtime_version()
     configure_standard_logging()
 
     parser = _build_parser()

{omdev-0.0.0.dev158 → omdev-0.0.0.dev160}/omdev/pyproject/cli.py

@@ -39,7 +39,7 @@ from omlish.argparse.cli import argparse_command
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.runtime import check_runtime_version
+from omlish.lite.runtime import check_lite_runtime_version
 from omlish.logs.standard import configure_standard_logging
 
 from ..toml.parser import toml_loads
@@ -288,7 +288,7 @@ class PyprojectCli(ArgparseCli):
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-    check_runtime_version()
+    check_lite_runtime_version()
     configure_standard_logging()
 
     await PyprojectCli(argv).async_cli_run()

{omdev-0.0.0.dev158 → omdev-0.0.0.dev160}/omdev/revisions.py

@@ -18,7 +18,7 @@ from omlish.lite.check import check
 from omlish.lite.logs import log
 from omlish.logs.standard import configure_standard_logging
 
-from .git import get_git_revision
+from .git.revisions import get_git_revision
 from .wheelfile import WheelFile
 
 

{omdev-0.0.0.dev158 → omdev-0.0.0.dev160}/omdev/scripts/interp.py

@@ -1086,6 +1086,10 @@ def is_new_type(spec: ta.Any) -> bool:
         return isinstance(spec, types.FunctionType) and spec.__code__ is ta.NewType.__code__.co_consts[1]  # type: ignore  # noqa
 
 
+def get_new_type_supertype(spec: ta.Any) -> ta.Any:
+    return spec.__supertype__
+
+
 def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))
@@ -1806,12 +1810,12 @@ def is_debugger_attached() -> bool:
     return any(frame[1].endswith('pydevd.py') for frame in inspect.stack())
 
 
-REQUIRED_PYTHON_VERSION = (3, 8)
+LITE_REQUIRED_PYTHON_VERSION = (3, 8)
 
 
-def check_runtime_version() -> None:
-    if sys.version_info < REQUIRED_PYTHON_VERSION:
-        raise OSError(f'Requires python {REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
+def check_lite_runtime_version() -> None:
+    if sys.version_info < LITE_REQUIRED_PYTHON_VERSION:
+        raise OSError(f'Requires python {LITE_REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
 
 
 ########################################
@@ -1968,6 +1972,7 @@ TODO:
  - structured
  - prefixed
  - debug
+ - optional noisy? noisy will never be lite - some kinda configure_standard callback mechanism?
 """
 
 
@@ -2004,8 +2009,9 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardLogHandler(ProxyLogHandler):
-    pass
+class StandardConfiguredLogHandler(ProxyLogHandler):
+    def __init_subclass__(cls, **kwargs):
+        raise TypeError('This class serves only as a marker and should not be subclassed.')
 
 
 ##
@@ -2036,7 +2042,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardLogHandler]:
+) -> ta.Optional[StandardConfiguredLogHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -2044,7 +2050,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -2078,7 +2084,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardLogHandler(handler)
+        return StandardConfiguredLogHandler(handler)
 
 
 ########################################
@@ -3486,7 +3492,7 @@ def _build_parser() -> argparse.ArgumentParser:
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-    check_runtime_version()
+    check_lite_runtime_version()
     configure_standard_logging()
 
     parser = _build_parser()