omdev 0.0.0.dev148__py3-none-any.whl → 0.0.0.dev150__py3-none-any.whl

omdev/amalg/amalg.py

@@ -4,6 +4,7 @@ Conventions:
  - must import 'from' items for local modules
 
 TODO:
+ - !! check only importing lite code
  - !! strip manifests? or relegate them to a separate tiny module ala __main__.py?
   - # @omlish-no-amalg ? in cli.types? will strip stmt (more than 1 line) following @manifest, so shouldn't import
  - more sanity checks lol
@@ -233,7 +234,7 @@ def _is_typing(
     if any(es.endswith(sfx) for sfx in (TYPE_ALIAS_COMMENT, NOQA_TYPE_ALIAS_COMMENT)):
         return True
 
-    wts = list(tks.ignore_ws(lts))
+    wts = list(tks.ignore_ws(lts, keep=['INDENT', 'UNINDENT']))
     if not tks.match_toks(wts, [
         ('NAME', None),
         ('OP', '='),

omdev/cli/clicli.py

@@ -6,7 +6,7 @@ import urllib.parse
 import urllib.request
 
 from omlish import __about__
-from omlish import argparse as ap
+from omlish.argparse import all as ap
 
 from ..pip import get_root_dists
 from ..pip import lookup_latest_package_version

omdev/git.py

@@ -12,7 +12,7 @@ import os.path
 import subprocess
 import typing as ta
 
-from omlish.lite.check import check_state
+from omlish.lite.check import check
 from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
 
 
@@ -288,7 +288,7 @@ def parse_git_status_line(l: str) -> GitStatusItem:
     if len(fields) == 1:
         a, b = fields[0], None
     elif len(fields) == 3:
-        check_state(fields[1] == '->', l)
+        check.state(fields[1] == '->', l)
         a, b = fields[0], fields[2]
     else:
         raise ValueError(l)

omdev/imgur.py

@@ -27,9 +27,9 @@ import os.path
 import typing as ta
 
 from omlish import check
-from omlish import http as hu
 from omlish import marshal as msh
 from omlish.formats import json
+from omlish.http import all as hu
 from omlish.secrets import Secret
 
 from .cli import CliModule
@@ -104,7 +104,7 @@ def upload_image(
 
 
 def _main() -> None:
-    from omlish import argparse as ap
+    from omlish.argparse import all as ap
 
     class Cli(ap.Cli):
         @ap.command(

omdev/interp/cli.py

@@ -11,7 +11,7 @@ import argparse
 import asyncio
 import typing as ta
 
-from omlish.lite.check import check_not_none
+from omlish.lite.check import check
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.runtime import check_runtime_version
 
@@ -34,7 +34,7 @@ async def _resolve_cmd(args) -> None:
     else:
         r = DEFAULT_INTERP_RESOLVER
     s = InterpSpecifier.parse(args.version)
-    print(check_not_none(await r.resolve(s, install=bool(args.install))).exe)
+    print(check.not_none(await r.resolve(s, install=bool(args.install))).exe)
 
 
 def _build_parser() -> argparse.ArgumentParser:

omdev/interp/pyenv.py

@@ -23,7 +23,7 @@ from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_output_str
 from omlish.lite.asyncio.subprocesses import asyncio_subprocess_try_output
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
-from omlish.lite.check import check_not_none
+from omlish.lite.check import check
 from omlish.lite.logs import log
 
 from ..packaging.versions import InvalidVersion
@@ -69,7 +69,7 @@ class Pyenv:
 
     @async_cached_nullary
     async def exe(self) -> str:
-        return os.path.join(check_not_none(await self.root()), 'bin', 'pyenv')
+        return os.path.join(check.not_none(await self.root()), 'bin', 'pyenv')
 
     async def version_exes(self) -> ta.List[ta.Tuple[str, str]]:
         if (root := await self.root()) is None:
@@ -295,7 +295,7 @@ class PyenvVersionInstaller:
 
     @async_cached_nullary
     async def install_dir(self) -> str:
-        return str(os.path.join(check_not_none(await self._pyenv.root()), 'versions', self.install_name()))
+        return str(os.path.join(check.not_none(await self._pyenv.root()), 'versions', self.install_name()))
 
     @async_cached_nullary
     async def install(self) -> str:
@@ -318,7 +318,7 @@ class PyenvVersionInstaller:
 
         if self._given_install_name is not None:
             full_args = [
-                os.path.join(check_not_none(await self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),  # noqa
+                os.path.join(check.not_none(await self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),  # noqa
                 *conf_args,
                 self.install_dir(),
             ]
@@ -390,7 +390,7 @@ class PyenvInterpProvider(InterpProvider):
         iv: ta.Optional[InterpVersion]
         if self._inspect:
             try:
-                iv = check_not_none(await self._inspector.inspect(ep)).iv
+                iv = check.not_none(await self._inspector.inspect(ep)).iv
             except Exception as e:  # noqa
                 return None
         else:

omdev/interp/standalone.py

@@ -32,7 +32,7 @@ import urllib.parse
 import urllib.request
 
 from omlish.lite.cached import cached_nullary
-from omlish.lite.check import check_not_none
+from omlish.lite.check import check
 from omlish.lite.logs import log
 
 
@@ -143,7 +143,7 @@ class StandalonePythons:
         python_versions: ta.Dict[str, str] = {}
         for link in available_python_links:
             match = self.PYTHON_VERSION_REGEX.search(link)
-            python_version = check_not_none(match)[1]
+            python_version = check.not_none(match)[1]
             # Don't override already found versions, as they are in order of preference
             if python_version in python_versions:
                 continue

omdev/packaging/requires.py

@@ -28,8 +28,7 @@ import dataclasses as dc
 import re
 import typing as ta
 
-from omlish.lite.check import check_not_none
-from omlish.lite.check import check_state
+from omlish.lite.check import check
 
 from .specifiers import Specifier
 
@@ -130,8 +129,8 @@ class RequiresTokenizer:
             self.read()
 
     def check(self, name: str, *, peek: bool = False) -> bool:
-        check_state(self.next_token is None, f'Cannot check for {name!r}, already have {self.next_token!r}')
-        check_state(name in self.rules, f'Unknown token name: {name!r}')
+        check.state(self.next_token is None, f'Cannot check for {name!r}, already have {self.next_token!r}')
+        check.state(name in self.rules, f'Unknown token name: {name!r}')
 
         expression = self.rules[name]
 
@@ -149,12 +148,12 @@ class RequiresTokenizer:
 
     def read(self) -> RequiresToken:
         token = self.next_token
-        check_state(token is not None)
+        check.state(token is not None)
 
-        self.position += len(check_not_none(token).text)
+        self.position += len(check.not_none(token).text)
         self.next_token = None
 
-        return check_not_none(token)
+        return check.not_none(token)
 
     def raise_syntax_error(
         self,

omdev/pycharm/cli.py

@@ -13,7 +13,7 @@ import subprocess
 import sys
 import tempfile
 
-from omlish import argparse as ap
+from omlish.argparse import all as ap
 from omlish.diag.pycharm import get_pycharm_version
 
 

omdev/pyproject/cli.py

@@ -36,8 +36,7 @@ import typing as ta
 
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
-from omlish.lite.check import check_not
-from omlish.lite.check import check_not_none
+from omlish.lite.check import check
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
 from omlish.lite.runtime import check_runtime_version
@@ -124,8 +123,8 @@ class Venv:
 
     @async_cached_nullary
     async def interp_exe(self) -> str:
-        i = InterpSpecifier.parse(check_not_none(self._cfg.interp))
-        return check_not_none(await DEFAULT_INTERP_RESOLVER.resolve(i, install=True)).exe
+        i = InterpSpecifier.parse(check.not_none(self._cfg.interp))
+        return check.not_none(await DEFAULT_INTERP_RESOLVER.resolve(i, install=True)).exe
 
     @cached_nullary
     def exe(self) -> str:
@@ -290,24 +289,24 @@ async def _venv_cmd(args) -> None:
 
     elif cmd == 'exe':
         await venv.create()
-        check_not(args.args)
+        check.arg(not args.args)
         print(venv.exe())
 
     elif cmd == 'run':
         await venv.create()
-        sh = check_not_none(shutil.which('bash'))
+        sh = check.not_none(shutil.which('bash'))
         script = ' '.join(args.args)
         if not script:
             script = sh
         os.execl(
-            (bash := check_not_none(sh)),
+            (bash := check.not_none(sh)),
             bash,
             '-c',
             f'. {venv.dir_name}/bin/activate && ' + script,
         )
 
     elif cmd == 'srcs':
-        check_not(args.args)
+        check.arg(not args.args)
         print('\n'.join(venv.srcs()))
 
     elif cmd == 'test':

omdev/revisions.py

@@ -14,7 +14,7 @@ import typing as ta
 import zipfile
 
 from omlish.lite.cached import cached_nullary
-from omlish.lite.check import check_non_empty_str
+from omlish.lite.check import check
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
 
@@ -39,7 +39,7 @@ class GitRevisionAdder:
     def revision(self) -> str:
         if self._given_revision is not None:
             return self._given_revision
-        return check_non_empty_str(get_git_revision())
+        return check.non_empty_str(get_git_revision())
 
     REVISION_ATTR = '__revision__'