omdev 0.0.0.dev122__tar.gz → 0.0.0.dev124__tar.gz

{omdev-0.0.0.dev122/omdev.egg-info → omdev-0.0.0.dev124}/PKG-INFO

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

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/.manifests.json

@@ -51,7 +51,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 113,
+    "line": 138,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",
@@ -183,7 +183,7 @@
     "module": ".scripts.importtrace",
     "attr": "_CLI_MODULE",
     "file": "omdev/scripts/importtrace.py",
-    "line": 481,
+    "line": 480,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importtrace",
@@ -243,7 +243,7 @@
     "module": ".tools.git",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/git.py",
-    "line": 196,
+    "line": 205,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",
@@ -255,7 +255,7 @@
     "module": ".tools.importscan",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/importscan.py",
-    "line": 166,
+    "line": 178,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importscan",
@@ -318,7 +318,7 @@
     "module": ".tools.prof",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/prof.py",
-    "line": 50,
+    "line": 54,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "prof",

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/amalg/amalg.py

@@ -462,10 +462,13 @@ def gen_amalg(
     out.write(SECTION_SEP)
     out.write('\n\n')
 
+    version_check_fail_msg = (
+        f'Requires python {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}:
-        raise OSError(
-            f'Requires python {REQUIRED_PYTHON_VERSION!r}, got {{sys.version_info}} from {{sys.executable}}')  # noqa
+        raise OSError(f{version_check_fail_msg!r})  # noqa
     """).lstrip())
     out.write('\n\n')
 

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/cli/clicli.py

@@ -1,6 +1,7 @@
 import inspect
 import os
 import sys
+import typing as ta
 import urllib.parse
 import urllib.request
 
@@ -18,6 +19,8 @@ DEFAULT_REINSTALL_URL = 'https://raw.githubusercontent.com/wrmsr/omlish/master/o
 
 class CliCli(ap.Cli):
 
+    #
+
     @ap.command(name='version')
     def print_version(self) -> None:
         print(__about__.__version__)
@@ -30,21 +33,43 @@ class CliCli(ap.Cli):
     def print_home(self) -> None:
         print(sys.prefix)
 
-    @ap.command(
-        ap.arg('args', nargs=ap.REMAINDER),
-        name='python',
-        accepts_unknown=True,
-    )
-    def python_cmd(self) -> None:
+    #
+
+    def _passthrough_args_cmd(
+            self,
+            exe: str,
+            pre_args: ta.Sequence[str] = (),
+            post_args: ta.Sequence[str] = (),
+    ) -> ta.NoReturn:
         os.execvp(
-            sys.executable,
+            exe,
             [
                 sys.executable,
+                *pre_args,
                 *self.unknown_args,
                 *self.args.args,
+                *post_args,
             ],
         )
 
+    @ap.command(
+        ap.arg('args', nargs=ap.REMAINDER),
+        name='python',
+        accepts_unknown=True,
+    )
+    def python_cmd(self) -> None:
+        self._passthrough_args_cmd(sys.executable)
+
+    @ap.command(
+        ap.arg('args', nargs=ap.REMAINDER),
+        name='pip',
+        accepts_unknown=True,
+    )
+    def pip_cmd(self) -> None:
+        self._passthrough_args_cmd(sys.executable, ['-m', 'pip'])
+
+    #
+
     @ap.command(
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/git.py

@@ -242,7 +242,11 @@ class GitStatusState(enum.Enum):
     SUBMODULE_MODIFIED_CONTENT = 'm'
 
 
-_EXTRA_UNMERGED_GIT_STATUS_STATES: ta.FrozenSet[ta.Tuple[GitStatusState, GitStatusState]] = frozenset([
+_UNMERGED_GIT_STATUS_STATES: ta.FrozenSet[GitStatusState] = frozenset([
+    GitStatusState.UPDATED_BUT_UNMERGED,
+])
+
+_UNMERGED_GIT_STATUS_STATE_PAIRS: ta.FrozenSet[ta.Tuple[GitStatusState, GitStatusState]] = frozenset([
     (GitStatusState.ADDED, GitStatusState.ADDED),
     (GitStatusState.DELETED, GitStatusState.DELETED),
 ])
@@ -259,9 +263,9 @@ class GitStatusItem:
     @property
     def is_unmerged(self) -> bool:
         return (
-            self.x is GitStatusState.UPDATED_BUT_UNMERGED or
-            self.y is GitStatusState.UPDATED_BUT_UNMERGED or
-            (self.x, self.y) in _EXTRA_UNMERGED_GIT_STATUS_STATES
+            self.x in _UNMERGED_GIT_STATUS_STATE_PAIRS or
+            self.y in _UNMERGED_GIT_STATUS_STATE_PAIRS or
+            (self.x, self.y) in _UNMERGED_GIT_STATUS_STATE_PAIRS
         )
 
     def __repr__(self) -> str:

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/magic/styles.py

@@ -27,7 +27,7 @@ PY_MAGIC_STYLE = MagicStyle(
 
 C_MAGIC_STYLE = MagicStyle(
     name='c',
-    exts=frozenset(['c', 'cc', 'cpp']),
+    exts=frozenset(['c', 'cc', 'cpp', 'cu']),
     line_prefix='// ',
     block_prefix_suffix=('/* ', '*/'),
 )

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/precheck/main.py

@@ -62,7 +62,12 @@ def _check_cmd(args) -> None:
         for pc in pcs:
             async for v in pc.run():
                 vs.append(v)
-                print(v)
+                print('*** VIOLATION ***')
+                print(f'Seq: {len(vs)}')
+                print(f'Precheck: {v.pc}')
+                print(f'Message:')
+                print(v.msg.strip())
+                print()
 
         return vs
 

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/scripts/importtrace.py

@@ -8,8 +8,7 @@ TODO:
  - create table paths(path varchar(1024); - norm, dedupe, index, etc (bonus points for 32bit key)
  - gviz
 
-http://www.logilab.org/856
-http://www.python.org/dev/peps/pep-0302/
+https://www.python.org/dev/peps/pep-0302/
 
 start / end / cumulative / exclusive time / vm_rss / vm_vms
 

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/scripts/interp.py

@@ -37,8 +37,7 @@ import typing as ta
 
 
 if sys.version_info < (3, 8):
-    raise OSError(
-        f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
+    raise OSError(f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
 
 
 ########################################
@@ -497,7 +496,7 @@ def cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 # ../../../omlish/lite/check.py
 
 
-def check_isinstance(v: T, spec: ta.Union[ta.Type[T], tuple]) -> T:
+def check_isinstance(v: ta.Any, spec: ta.Union[ta.Type[T], tuple]) -> T:
     if not isinstance(v, spec):
         raise TypeError(v)
     return v
@@ -509,6 +508,11 @@ def check_not_isinstance(v: T, spec: ta.Union[type, tuple]) -> T:
     return v
 
 
+def check_none(v: T) -> None:
+    if v is not None:
+        raise ValueError(v)
+
+
 def check_not_none(v: ta.Optional[T]) -> T:
     if v is None:
         raise ValueError
@@ -1508,8 +1512,7 @@ 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
+        raise OSError(f'Requires python {REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
 
 
 ########################################

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/scripts/pyproject.py

@@ -70,8 +70,7 @@ import zipfile
 
 
 if sys.version_info < (3, 8):
-    raise OSError(
-        f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
+    raise OSError(f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
 
 
 ########################################
@@ -174,7 +173,7 @@ PY_MAGIC_STYLE = MagicStyle(
 
 C_MAGIC_STYLE = MagicStyle(
     name='c',
-    exts=frozenset(['c', 'cc', 'cpp']),
+    exts=frozenset(['c', 'cc', 'cpp', 'cu']),
     line_prefix='// ',
     block_prefix_suffix=('/* ', '*/'),
 )
@@ -1787,7 +1786,7 @@ def cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 # ../../../omlish/lite/check.py
 
 
-def check_isinstance(v: T, spec: ta.Union[ta.Type[T], tuple]) -> T:
+def check_isinstance(v: ta.Any, spec: ta.Union[ta.Type[T], tuple]) -> T:
     if not isinstance(v, spec):
         raise TypeError(v)
     return v
@@ -1799,6 +1798,11 @@ def check_not_isinstance(v: T, spec: ta.Union[type, tuple]) -> T:
     return v
 
 
+def check_none(v: T) -> None:
+    if v is not None:
+        raise ValueError(v)
+
+
 def check_not_none(v: ta.Optional[T]) -> T:
     if v is None:
         raise ValueError
@@ -3377,8 +3381,7 @@ 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
+        raise OSError(f'Requires python {REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
 
 
 ########################################
@@ -4007,7 +4010,11 @@ class GitStatusState(enum.Enum):
     SUBMODULE_MODIFIED_CONTENT = 'm'
 
 
-_EXTRA_UNMERGED_GIT_STATUS_STATES: ta.FrozenSet[ta.Tuple[GitStatusState, GitStatusState]] = frozenset([
+_UNMERGED_GIT_STATUS_STATES: ta.FrozenSet[GitStatusState] = frozenset([
+    GitStatusState.UPDATED_BUT_UNMERGED,
+])
+
+_UNMERGED_GIT_STATUS_STATE_PAIRS: ta.FrozenSet[ta.Tuple[GitStatusState, GitStatusState]] = frozenset([
     (GitStatusState.ADDED, GitStatusState.ADDED),
     (GitStatusState.DELETED, GitStatusState.DELETED),
 ])
@@ -4024,9 +4031,9 @@ class GitStatusItem:
     @property
     def is_unmerged(self) -> bool:
         return (
-            self.x is GitStatusState.UPDATED_BUT_UNMERGED or
-            self.y is GitStatusState.UPDATED_BUT_UNMERGED or
-            (self.x, self.y) in _EXTRA_UNMERGED_GIT_STATUS_STATES
+            self.x in _UNMERGED_GIT_STATUS_STATE_PAIRS or
+            self.y in _UNMERGED_GIT_STATUS_STATE_PAIRS or
+            (self.x, self.y) in _UNMERGED_GIT_STATUS_STATE_PAIRS
         )
 
     def __repr__(self) -> str:

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/tools/git.py

@@ -177,6 +177,8 @@ class Cli(ap.Cli):
         else:
             print(json.dumps_pretty([gsi_dct(gsi) for gsi in st]))
 
+    # Lazy helpers
+
     @ap.command(
         ap.arg('-m', '--message', default='--'),
         aliases=['acp'],
@@ -192,6 +194,13 @@ class Cli(ap.Cli):
 
         subprocess.check_call(['git', 'push'])
 
+    @ap.command(
+        aliases=['psu'],
+    )
+    def pull_submodule_update(self) -> None:
+        subprocess.check_call(['git', 'pull'])
+        subprocess.check_call(['git', 'submodule', 'update'])
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('git', __name__)

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/tools/importscan.py

@@ -1,4 +1,11 @@
 """
+Imports given python modules, each in isolation, outputting for each:
+ - "time" - time taken
+ - "rss" - final RSS
+ - "imported" - imported modules in import order
+
+Can be run on external python interpreters.
+
 TODO:
  - dump agg stats
  - graphviz
@@ -6,6 +13,7 @@ TODO:
 import argparse
 import dataclasses as dc
 import inspect
+import itertools
 import json
 import os
 import re
@@ -14,6 +22,7 @@ import subprocess
 import sys
 import typing as ta
 
+from omlish import check
 from omlish import concurrent as cu
 from omlish import lang
 
@@ -108,13 +117,7 @@ def run_one(
 ##
 
 
-def _find_specs(
-        *roots: str,
-        filters: ta.Iterable[str] | None = None,
-) -> ta.Sequence[str]:
-    filter_pats = [re.compile(f) for f in filters or []]
-
-    out: list[str] = []
+def _find_root_specs(*roots: str) -> ta.Iterator[str]:
     stk: list[str] = list(reversed(roots))
     while stk:
         cur = stk.pop()
@@ -134,21 +137,30 @@ def _find_specs(
         else:
             spec = cur
 
-        if any(p.fullmatch(spec) for p in filter_pats):
-            continue
-
-        out.append(spec)
-
-    return out
+        yield spec
 
 
 def run(
-        *roots: str,
+        *,
+        roots: lang.SequenceNotStr[str] | None = None,
+        modules: lang.SequenceNotStr[str] | None = None,
+
         filters: ta.Iterable[str] | None = None,
         num_threads: int | None = 0,
+
         **kwargs: ta.Any,
 ) -> ta.Mapping[str, Item]:
-    specs = _find_specs(*roots, filters=filters)
+    filter_pats = [re.compile(f) for f in filters or []]
+
+    specs: list[str] = []
+    for spec in itertools.chain(
+        *([_find_root_specs(*check.not_isinstance(roots, str))] if roots is not None else []),
+        *([check.not_isinstance(modules, str)] if modules is not None else []),
+    ):
+        if any(p.fullmatch(spec) for p in filter_pats):
+            continue
+
+        specs.append(spec)
 
     out: dict[str, Item] = {}
     with cu.new_executor(num_threads) as ex:
@@ -173,7 +185,8 @@ def _main() -> None:
     parser.add_argument('-f', '--filter', action='append')
     parser.add_argument('-t', '--filter-tests', action='store_true')
     parser.add_argument('--python', default=sys.executable)
-    parser.add_argument('root', nargs='+')
+    parser.add_argument('-m', '--module', action='append')
+    parser.add_argument('root', nargs='*')
     args = parser.parse_args()
 
     filters = [*(args.filter or [])]
@@ -184,7 +197,8 @@ def _main() -> None:
         ])
 
     for item in run(
-            *args.root,
+            roots=args.root,
+            modules=args.module,
             filters=filters,
             num_threads=args.jobs,
             python=args.python,

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev/tools/prof.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - a general purpose profile tool lol - or is this for / in bootstrap?
+"""
 import os.path
 import subprocess
 import sys

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev122
+omlish==0.0.0.dev124
 
 [all]
 black~=24.10

{omdev-0.0.0.dev122 → omdev-0.0.0.dev124}/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.dev122'
+version = '0.0.0.dev124'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev122',
+    'omlish == 0.0.0.dev124',
 ]
 
 [project.optional-dependencies]
@@ -95,4 +95,5 @@ exclude = [
     '*.h',
     '.manifests.json',
     'LICENSE',
+    'LICENSE.txt',
 ]