omdev 0.0.0.dev241__tar.gz → 0.0.0.dev242__tar.gz

{omdev-0.0.0.dev241/omdev.egg-info → omdev-0.0.0.dev242}/PKG-INFO

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

{omdev-0.0.0.dev241 → omdev-0.0.0.dev242}/omdev/ci/ci.py

@@ -17,6 +17,7 @@ from .compose import get_compose_service_dependencies
 from .docker.buildcaching import DockerBuildCaching
 from .docker.cache import DockerCacheKey
 from .docker.cmds import build_docker_image
+from .docker.cmds import ensure_docker_image_setup
 from .docker.imagepulling import DockerImagePulling
 from .docker.utils import build_docker_file_hash
 from .requirements import build_requirements_hash
@@ -51,6 +52,8 @@ class Ci(AsyncExitStacked):
 
         no_dependencies: bool = False
 
+        setup_only: bool = False
+
         run_options: ta.Optional[ta.Sequence[str]] = None
 
         #
@@ -174,18 +177,21 @@ class Ci(AsyncExitStacked):
     #
 
     @cached_nullary
-    def pull_dependencies_funcs(self) -> ta.Sequence[ta.Callable[[], ta.Awaitable]]:
+    def get_dependency_images(self) -> ta.Sequence[str]:
         deps = get_compose_service_dependencies(
             self._config.compose_file,
             self._config.service,
         )
+        return sorted(deps.values())
 
+    @cached_nullary
+    def pull_dependencies_funcs(self) -> ta.Sequence[ta.Callable[[], ta.Awaitable]]:
         return [
             async_cached_nullary(functools.partial(
                 self._docker_image_pulling.pull_docker_image,
                 dep_image,
             ))
-            for dep_image in deps.values()
+            for dep_image in self.get_dependency_images()
         ]
 
     #
@@ -233,7 +239,26 @@ class Ci(AsyncExitStacked):
 
     #
 
+    async def _run_setup_only(self) -> None:
+        image_ids = [
+            await self.resolve_ci_image(),
+
+            *(self.get_dependency_images() if not self._config.no_dependencies else []),
+        ]
+
+        for image_id in image_ids:
+            with log_timing_context(f'Run setup only: {image_id}'):
+                await ensure_docker_image_setup(
+                    image_id,
+                    cwd=self._config.project_dir,
+                )
+
+    #
+
     async def run(self) -> None:
         await self.setup()
 
-        await self._run_compose()
+        if self._config.setup_only:
+            await self._run_setup_only()
+        else:
+            await self._run_compose()

{omdev-0.0.0.dev241 → omdev-0.0.0.dev242}/omdev/ci/cli.py

@@ -97,6 +97,8 @@ class CiCli(ArgparseCli):
 
         argparse_arg('--no-dependencies', action='store_true'),
 
+        argparse_arg('--setup-only', action='store_true'),
+
         argparse_arg('-e', '--env', action='append'),
         argparse_arg('-v', '--volume', action='append'),
 
@@ -211,6 +213,8 @@ class CiCli(ArgparseCli):
 
             no_dependencies=self.args.no_dependencies,
 
+            setup_only=self.args.setup_only,
+
             run_options=run_options,
         )
 

{omdev-0.0.0.dev241 → omdev-0.0.0.dev242}/omdev/ci/docker/cmds.py

@@ -123,3 +123,21 @@ async def load_docker_tar(
         tar_file: str,
 ) -> str:
     return await load_docker_tar_cmd(ShellCmd(f'cat {shlex.quote(tar_file)}'))
+
+
+##
+
+
+async def ensure_docker_image_setup(
+        image: str,
+        *,
+        cwd: ta.Optional[str] = None,
+) -> None:
+    await asyncio_subprocesses.check_call(
+        'docker',
+        'run',
+        '--rm',
+        '--entrypoint', '/bin/true',  # FIXME: lol
+        image,
+        **(dict(cwd=cwd) if cwd is not None else {}),
+    )

{omdev-0.0.0.dev241 → omdev-0.0.0.dev242}/omdev/scripts/ci.py

@@ -10983,6 +10983,24 @@ async def load_docker_tar(
     return await load_docker_tar_cmd(ShellCmd(f'cat {shlex.quote(tar_file)}'))
 
 
+##
+
+
+async def ensure_docker_image_setup(
+        image: str,
+        *,
+        cwd: ta.Optional[str] = None,
+) -> None:
+    await asyncio_subprocesses.check_call(
+        'docker',
+        'run',
+        '--rm',
+        '--entrypoint', '/bin/true',  # FIXME: lol
+        image,
+        **(dict(cwd=cwd) if cwd is not None else {}),
+    )
+
+
 ########################################
 # ../docker/dataserver.py
 
@@ -11613,6 +11631,8 @@ class Ci(AsyncExitStacked):
 
         no_dependencies: bool = False
 
+        setup_only: bool = False
+
         run_options: ta.Optional[ta.Sequence[str]] = None
 
         #
@@ -11736,18 +11756,21 @@ class Ci(AsyncExitStacked):
     #
 
     @cached_nullary
-    def pull_dependencies_funcs(self) -> ta.Sequence[ta.Callable[[], ta.Awaitable]]:
+    def get_dependency_images(self) -> ta.Sequence[str]:
         deps = get_compose_service_dependencies(
             self._config.compose_file,
             self._config.service,
         )
+        return sorted(deps.values())
 
+    @cached_nullary
+    def pull_dependencies_funcs(self) -> ta.Sequence[ta.Callable[[], ta.Awaitable]]:
         return [
             async_cached_nullary(functools.partial(
                 self._docker_image_pulling.pull_docker_image,
                 dep_image,
             ))
-            for dep_image in deps.values()
+            for dep_image in self.get_dependency_images()
         ]
 
     #
@@ -11795,10 +11818,29 @@ class Ci(AsyncExitStacked):
 
     #
 
+    async def _run_setup_only(self) -> None:
+        image_ids = [
+            await self.resolve_ci_image(),
+
+            *(self.get_dependency_images() if not self._config.no_dependencies else []),
+        ]
+
+        for image_id in image_ids:
+            with log_timing_context(f'Run setup only: {image_id}'):
+                await ensure_docker_image_setup(
+                    image_id,
+                    cwd=self._config.project_dir,
+                )
+
+    #
+
     async def run(self) -> None:
         await self.setup()
 
-        await self._run_compose()
+        if self._config.setup_only:
+            await self._run_setup_only()
+        else:
+            await self._run_compose()
 
 
 ########################################
@@ -11979,6 +12021,8 @@ class CiCli(ArgparseCli):
 
         argparse_arg('--no-dependencies', action='store_true'),
 
+        argparse_arg('--setup-only', action='store_true'),
+
         argparse_arg('-e', '--env', action='append'),
         argparse_arg('-v', '--volume', action='append'),
 
@@ -12093,6 +12137,8 @@ class CiCli(ArgparseCli):
 
             no_dependencies=self.args.no_dependencies,
 
+            setup_only=self.args.setup_only,
+
             run_options=run_options,
         )
 

{omdev-0.0.0.dev241 → omdev-0.0.0.dev242/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev241 → omdev-0.0.0.dev242}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev241
+omlish==0.0.0.dev242
 
 [all]
 black~=25.1

{omdev-0.0.0.dev241 → omdev-0.0.0.dev242}/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.dev241'
+version = '0.0.0.dev242'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev241',
+    'omlish == 0.0.0.dev242',
 ]
 
 [project.optional-dependencies]