omdev 0.0.0.dev155__py3-none-any.whl → 0.0.0.dev157__py3-none-any.whl

omdev/interp/inspect.py

@@ -5,7 +5,7 @@ import logging
 import sys
 import typing as ta
 
-from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_output
+from omlish.lite.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.logs import log
 
 from ..packaging.versions import Version
@@ -83,7 +83,7 @@ class InterpInspector:
         return cls._build_inspection(sys.executable, eval(cls._INSPECTION_CODE))  # noqa
 
     async def _inspect(self, exe: str) -> InterpInspection:
-        output = await asyncio_subprocess_check_output(exe, '-c', f'print({self._INSPECTION_CODE})', quiet=True)
+        output = await asyncio_subprocesses.check_output(exe, '-c', f'print({self._INSPECTION_CODE})', quiet=True)
         return self._build_inspection(exe, output.decode())
 
     async def inspect(self, exe: str) -> ta.Optional[InterpInspection]:

omdev/interp/pyenv.py

@@ -18,9 +18,7 @@ import shutil
 import sys
 import typing as ta
 
-from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_call
-from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_output_str
-from omlish.lite.asyncio.subprocesses import asyncio_subprocess_try_output
+from omlish.lite.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
@@ -59,7 +57,7 @@ class Pyenv:
             return self._root_kw
 
         if shutil.which('pyenv'):
-            return await asyncio_subprocess_check_output_str('pyenv', 'root')
+            return await asyncio_subprocesses.check_output_str('pyenv', 'root')
 
         d = os.path.expanduser('~/.pyenv')
         if os.path.isdir(d) and os.path.isfile(os.path.join(d, 'bin', 'pyenv')):
@@ -88,7 +86,7 @@ class Pyenv:
         if await self.root() is None:
             return []
         ret = []
-        s = await asyncio_subprocess_check_output_str(await self.exe(), 'install', '--list')
+        s = await asyncio_subprocesses.check_output_str(await self.exe(), 'install', '--list')
         for l in s.splitlines():
             if not l.startswith('  '):
                 continue
@@ -103,7 +101,7 @@ class Pyenv:
             return False
         if not os.path.isdir(os.path.join(root, '.git')):
             return False
-        await asyncio_subprocess_check_call('git', 'pull', cwd=root)
+        await asyncio_subprocesses.check_call('git', 'pull', cwd=root)
         return True
 
 
@@ -194,7 +192,7 @@ class DarwinPyenvInstallOpts(PyenvInstallOptsProvider):
         cflags = []
         ldflags = []
         for dep in self.BREW_DEPS:
-            dep_prefix = await asyncio_subprocess_check_output_str('brew', '--prefix', dep)
+            dep_prefix = await asyncio_subprocesses.check_output_str('brew', '--prefix', dep)
             cflags.append(f'-I{dep_prefix}/include')
             ldflags.append(f'-L{dep_prefix}/lib')
         return PyenvInstallOpts(
@@ -204,11 +202,11 @@ class DarwinPyenvInstallOpts(PyenvInstallOptsProvider):
 
     @async_cached_nullary
     async def brew_tcl_opts(self) -> PyenvInstallOpts:
-        if await asyncio_subprocess_try_output('brew', '--prefix', 'tcl-tk') is None:
+        if await asyncio_subprocesses.try_output('brew', '--prefix', 'tcl-tk') is None:
             return PyenvInstallOpts()
 
-        tcl_tk_prefix = await asyncio_subprocess_check_output_str('brew', '--prefix', 'tcl-tk')
-        tcl_tk_ver_str = await asyncio_subprocess_check_output_str('brew', 'ls', '--versions', 'tcl-tk')
+        tcl_tk_prefix = await asyncio_subprocesses.check_output_str('brew', '--prefix', 'tcl-tk')
+        tcl_tk_ver_str = await asyncio_subprocesses.check_output_str('brew', 'ls', '--versions', 'tcl-tk')
         tcl_tk_ver = '.'.join(tcl_tk_ver_str.split()[1].split('.')[:2])
 
         return PyenvInstallOpts(conf_opts=[
@@ -316,6 +314,7 @@ class PyenvVersionInstaller:
             self._version,
         ]
 
+        full_args: ta.List[str]
         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
@@ -329,7 +328,7 @@ class PyenvVersionInstaller:
                 *conf_args,
             ]
 
-        await asyncio_subprocess_check_call(
+        await asyncio_subprocesses.check_call(
             *full_args,
             env=env,
         )

omdev/pyproject/cli.py

@@ -36,7 +36,7 @@ import typing as ta
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
 from omlish.argparse.cli import argparse_command
-from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_call
+from omlish.lite.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.logs import configure_standard_logging
@@ -167,7 +167,7 @@ class PyprojectCli(ArgparseCli):
                 else:
                     docker_env[e] = os.environ.get(e, '')
 
-            await asyncio_subprocess_check_call(
+            await asyncio_subprocesses.check_call(
                 'docker',
                 'compose',
                 '-f', 'docker/compose.yml',
@@ -218,7 +218,7 @@ class PyprojectCli(ArgparseCli):
 
         elif cmd == 'test':
             await venv.create()
-            await asyncio_subprocess_check_call(venv.exe(), '-m', 'pytest', *(self.args.args or []), *venv.srcs())
+            await asyncio_subprocesses.check_call(venv.exe(), '-m', 'pytest', *(self.args.args or []), *venv.srcs())
 
         else:
             raise Exception(f'unknown subcommand: {cmd}')

omdev/pyproject/pkg.py

@@ -37,7 +37,7 @@ import typing as ta
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.logs import log
-from omlish.lite.subprocesses import subprocess_check_call
+from omlish.lite.subprocesses import subprocesses
 
 from ..cexts.magic import CextMagic
 from ..magic.find import find_magic_files
@@ -214,7 +214,7 @@ class BasePyprojectPackageGenerator(abc.ABC):
             output_dir: ta.Optional[str] = None,
             opts: BuildOpts = BuildOpts(),
     ) -> None:
-        subprocess_check_call(
+        subprocesses.check_call(
             sys.executable,
             '-m',
             'build',
@@ -230,14 +230,14 @@ class BasePyprojectPackageGenerator(abc.ABC):
             for fn in os.listdir(dist_dir):
                 tmp_dir = tempfile.mkdtemp()
 
-                subprocess_check_call(
+                subprocesses.check_call(
                     sys.executable,
                     '-m', 'venv',
                     'test-install',
                     cwd=tmp_dir,
                 )
 
-                subprocess_check_call(
+                subprocesses.check_call(
                     os.path.join(tmp_dir, 'test-install', 'bin', 'python3'),
                     '-m', 'pip',
                     'install',

omdev/pyproject/venvs.py

@@ -3,7 +3,7 @@ import glob
 import os.path
 import typing as ta
 
-from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_call
+from omlish.lite.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
@@ -58,12 +58,12 @@ class Venv:
             return False
 
         log.info('Using interpreter %s', (ie := await self.interp_exe()))
-        await asyncio_subprocess_check_call(ie, '-m', 'venv', dn)
+        await asyncio_subprocesses.check_call(ie, '-m', 'venv', dn)
 
         ve = self.exe()
         uv = self._cfg.use_uv
 
-        await asyncio_subprocess_check_call(
+        await asyncio_subprocesses.check_call(
             ve,
             '-m', 'pip',
             'install', '-v', '--upgrade',
@@ -81,7 +81,7 @@ class Venv:
             #   Caused by: Failed to download distribution due to network timeout. Try increasing UV_HTTP_TIMEOUT (current value: 30s).  # noqa
             #   UV_CONCURRENT_DOWNLOADS=4 UV_HTTP_TIMEOUT=3600
 
-            await asyncio_subprocess_check_call(
+            await asyncio_subprocesses.check_call(
                 ve,
                 '-m',
                 *(['uv'] if uv else []),