omdev 0.0.0.dev224__py3-none-any.whl → 0.0.0.dev225__py3-none-any.whl

omdev/amalg/typing.py

@@ -89,9 +89,15 @@ def skip_root_level_if_type_checking_block(
 ) -> int:
     def skip_block():
         nonlocal i
+
+        nl = cls[i]
+        if nl[0].name != 'INDENT':
+            raise RuntimeError
+        i += 1
+
         while True:
             nl = cls[i]
-            if nl and nl[0].name != 'INDENT':
+            if nl and nl[0].name == 'DEDENT':
                 return nl
             i += 1
 

omdev/ci/requirements.py

@@ -18,7 +18,7 @@ import typing as ta
 
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import defer
-from omlish.subprocesses import subprocesses
+from omlish.subprocesses.sync import subprocesses
 
 from .utils import sha256_str
 

omdev/git/revisions.py

@@ -4,8 +4,8 @@ import os.path
 import subprocess
 import typing as ta
 
-from omlish.subprocesses import subprocess_maybe_shell_wrap_exec
-from omlish.subprocesses import subprocesses
+from omlish.subprocesses.sync import subprocesses
+from omlish.subprocesses.wrap import subprocess_maybe_shell_wrap_exec
 
 
 def get_git_revision(

omdev/git/shallow.py

@@ -4,7 +4,7 @@ import dataclasses as dc
 import os.path
 import typing as ta
 
-from omlish.subprocesses import subprocesses
+from omlish.subprocesses.sync import subprocesses
 
 
 @dc.dataclass(frozen=True)

omdev/git/status.py

@@ -7,7 +7,7 @@ import subprocess
 import typing as ta
 
 from omlish.lite.check import check
-from omlish.subprocesses import subprocess_maybe_shell_wrap_exec
+from omlish.subprocesses.wrap import subprocess_maybe_shell_wrap_exec
 
 
 _GIT_STATUS_LINE_ESCAPE_CODES: ta.Mapping[str, str] = {

omdev/precheck/lite.py

@@ -9,7 +9,7 @@ import textwrap
 import typing as ta
 
 from omlish import cached
-from omlish.subprocesses import subprocess_maybe_shell_wrap_exec
+from omlish.subprocesses.wrap import subprocess_maybe_shell_wrap_exec
 
 from .. import magic
 from .base import Precheck

omdev/pyproject/pkg.py

@@ -38,7 +38,7 @@ import typing as ta
 from omlish.formats.toml.writer import TomlWriter
 from omlish.lite.cached import cached_nullary
 from omlish.lite.logs import log
-from omlish.subprocesses import subprocesses
+from omlish.subprocesses.sync import subprocesses
 
 from ..cexts.magic import CextMagic
 from ..magic.find import find_magic_files