docker-devkit 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

docker_devkit/build_docker.py

@@ -5,11 +5,11 @@ import os
 import platform
 import re
 from pathlib import Path
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
 
 import typer
 import yaml
-from bashrun import bash, bash_output
+from bashrun.bash import bash, bash_output
 from .detect_gpu import GPU_TYPES, Gpu, detect_gpu
 from pydantic_settings import BaseSettings
 
@@ -103,18 +103,21 @@ def _load_compose(path: Path) -> dict[str, Any]:
 def build(
     upgrade: bool = typer.Option(False, "--upgrade", "-u", help="Re-resolve and rewrite base digests."),
     lock_only: bool = typer.Option(False, "--lock-only", help="Update lock file without building images."),
-    mode: Mode = typer.Option("local", "--mode", help="local: --load images; ci: --push images + registry caches."),
-    gpu: Gpu = typer.Option("auto", "--gpu", help="auto|cuda|rocm|none"),
+    mode: Annotated[
+        Mode, typer.Option("--mode", help="local: --load images; ci: --push images + registry caches.")
+    ] = "local",
+    gpu: Annotated[Gpu, typer.Option("--gpu", help="auto|cuda|rocm|none")] = "auto",
     gpu_only: bool = typer.Option(
         False, "--gpu-only", help="Build only the services suffixed for this gpu (requires a concrete --gpu)."
     ),
     no_cache: bool = typer.Option(False, "--no-cache", help="Force rebuild by disabling cache usage."),
-    targets_opt: list[str] | None = typer.Option(
-        None, "--targets", "-t", help="Build only these services (from the selected bake file)."
-    ),
-    bake_file: Path = typer.Option(
-        DEFAULT_BAKE_FILE, "--bake-file", help="Bake file to load (e.g. compose.bake.yml or compose.zed.bake.yml)."
-    ),
+    targets_opt: Annotated[
+        list[str] | None,
+        typer.Option("--targets", "-t", help="Build only these services (from the selected bake file)."),
+    ] = None,
+    bake_file: Annotated[
+        Path, typer.Option("--bake-file", help="Bake file to load (e.g. compose.bake.yml or compose.zed.bake.yml).")
+    ] = DEFAULT_BAKE_FILE,
 ) -> None:
     run_build(
         upgrade=upgrade,

docker_devkit/detect_gpu.py

@@ -1,7 +1,7 @@
 import shutil
 from typing import Literal, get_args
 
-from bashrun import bash_check
+from bashrun.bash import bash_check
 
 Gpu = Literal["auto", "cuda", "rocm", "none"]
 GPU_TYPES = tuple(g for g in get_args(Gpu) if g not in ("auto", "none"))

docker_devkit/down.py

@@ -1,8 +1,9 @@
 import os
 from pathlib import Path
+from typing import Annotated
 
 import typer
-from bashrun import bash_handoff
+from bashrun.bash import bash_handoff
 from .detect_gpu import Gpu, detect_gpu
 
 from .context_sha import compute_service_shas
@@ -23,16 +24,18 @@ app = typer.Typer(add_completion=False)
 @app.command()
 def down(
     volumes: bool = typer.Option(False, "--volumes", "-v", help="Remove named volumes."),
-    gpu: Gpu = typer.Option("auto", "--gpu", help="auto|cuda|rocm|none"),
-    compose_file: Path = typer.Option(
-        Path("compose.yml"),
-        "--compose-file",
-        help=(
-            "Base compose file. In a repo that authors its own stack (where compose.bake.yml lives) the default "
-            "compose.yml tears down the native multi-file stack. A consumer stack is torn down as the single graph "
-            "it was brought up as."
+    gpu: Annotated[Gpu, typer.Option("--gpu", help="auto|cuda|rocm|none")] = "auto",
+    compose_file: Annotated[
+        Path,
+        typer.Option(
+            "--compose-file",
+            help=(
+                "Base compose file. In a repo that authors its own stack (where compose.bake.yml lives) the default "
+                "compose.yml tears down the native multi-file stack. A consumer stack is torn down as the single graph "
+                "it was brought up as."
+            ),
         ),
-    ),
+    ] = Path("compose.yml"),
 ) -> None:
     # Mirror up: native multi-file teardown only when compose.bake.yml is present and the
     # default compose.yml was requested. A consumer stack tears down its single graph.

docker_devkit/image_refs.py

@@ -9,7 +9,7 @@ from itertools import starmap
 from pathlib import Path
 
 import yaml
-from bashrun import bash_output
+from bashrun.bash import bash_output
 from pydantic import BaseModel, ConfigDict, Field, RootModel
 
 BUILD_ARG_PATTERN = re.compile(r"\$\{[A-Za-z0-9_]+\}")

docker_devkit/up.py

@@ -1,8 +1,9 @@
 import os
 from pathlib import Path
+from typing import Annotated
 
 import typer
-from bashrun import bash_handoff
+from bashrun.bash import bash_handoff
 from .detect_gpu import Gpu, detect_gpu
 
 from .build_docker import run_build
@@ -33,18 +34,20 @@ def up(
     build: bool = typer.Option(
         False, "--build", help="Build all images locally before bringing the stack up; skips pulling"
     ),
-    gpu: Gpu = typer.Option("auto", "--gpu", help="auto|cuda|rocm|none"),
+    gpu: Annotated[Gpu, typer.Option("--gpu", help="auto|cuda|rocm|none")] = "auto",
     no_dev: bool = typer.Option(False, "--no-dev", help="Skip layering compose.dev.yml (production-shape bring-up)"),
-    compose_file: Path = typer.Option(
-        Path("compose.yml"),
-        "--compose-file",
-        help=(
-            "Base compose file. In a repo that authors its own images (where compose.bake.yml lives) the default "
-            "compose.yml triggers the native multi-file assembly. A consumer stack — a repo whose compose.yml "
-            "OCI-pulls an already-baked upstream artifact and layers on top — is run as the complete graph with "
-            "only --env-file .env."
+    compose_file: Annotated[
+        Path,
+        typer.Option(
+            "--compose-file",
+            help=(
+                "Base compose file. In a repo that authors its own images (where compose.bake.yml lives) the default "
+                "compose.yml triggers the native multi-file assembly. A consumer stack — a repo whose compose.yml "
+                "OCI-pulls an already-baked upstream artifact and layers on top — is run as the complete graph with "
+                "only --env-file .env."
+            ),
         ),
-    ),
+    ] = Path("compose.yml"),
 ) -> None:
     # A repo that authors its own stack carries compose.bake.yml and builds its own images,
     # so the default compose.yml means the native multi-file stack (postgres + gpu + dev layers,

{docker_devkit-0.1.2.dist-info → docker_devkit-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: docker-devkit
-Version: 0.1.2
+Version: 0.1.4
 Summary: Docker-stack lifecycle commands (up/down/build) with a native/consumer split
 License-File: LICENSE
 License-File: NOTICE

docker_devkit-0.1.4.dist-info/RECORD

@@ -0,0 +1,15 @@
+docker_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+docker_devkit/build_docker.py,sha256=NmAw8GXQ8xcakKWRepjtArKts738MRMTohzSIlyU2GI,11940
+docker_devkit/context_sha.py,sha256=KWwJtIKfgKkogYoPL7_KEcKX8XG3i-P6_ReIOkB5wE4,3085
+docker_devkit/detect_gpu.py,sha256=C4e3vixvSSJS6xQiMVWp2IdWSAgMr551KrBTuIrkTk4,456
+docker_devkit/down.py,sha256=dHqMqvsufCqwBD__tO2DEpyD9mS2T9ReyuqIcqUQ38c,2768
+docker_devkit/image_refs.py,sha256=CZ5ibvs2l01gqh-GwaLUYhiZ_cz2_bjBk9PlplGVlts,6441
+docker_devkit/modes.py,sha256=-6mNyvu3G97PzJ2vsfnXr5LwQhjvhlDfd11u6rkhN6M,1510
+docker_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+docker_devkit/up.py,sha256=HQH5WB0kZTST6wJHS1jjzOWAvT2bK0u_MozRieU-iJU,4185
+docker_devkit-0.1.4.dist-info/METADATA,sha256=vrb3AtKlpjITS0_fSRVoj-8GOPUy0fKu3Wz6LVNs3zg,399
+docker_devkit-0.1.4.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+docker_devkit-0.1.4.dist-info/entry_points.txt,sha256=0AJlYxdEuQ7w21s1y-07MJ4AU_aJBUfkVWrwrxCqaMI,113
+docker_devkit-0.1.4.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
+docker_devkit-0.1.4.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
+docker_devkit-0.1.4.dist-info/RECORD,,

docker_devkit-0.1.2.dist-info/RECORD

@@ -1,15 +0,0 @@
-docker_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-docker_devkit/build_docker.py,sha256=DHv2hbnUPENyZVbmyjW5AZoVmoL-VMNPakAD37CMS_g,11857
-docker_devkit/context_sha.py,sha256=KWwJtIKfgKkogYoPL7_KEcKX8XG3i-P6_ReIOkB5wE4,3085
-docker_devkit/detect_gpu.py,sha256=V7X-eu-q0HrJo_rFmviOor62tm1yKjR2PX2RLnv7JBw,451
-docker_devkit/down.py,sha256=IMl-sjsLfa53sETcss6mEiAGEUhNIo3jYvKHg-t3xqA,2669
-docker_devkit/image_refs.py,sha256=PxYDVLkP43Gmc2Qh-R5AnpwYqkaZFD-uvAE-hWpJlho,6436
-docker_devkit/modes.py,sha256=-6mNyvu3G97PzJ2vsfnXr5LwQhjvhlDfd11u6rkhN6M,1510
-docker_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-docker_devkit/up.py,sha256=_8oZY0DBCC4mroWPjFC6wPIW0raPPwUXFMRoCFU57Cs,4082
-docker_devkit-0.1.2.dist-info/METADATA,sha256=cL0qTV-32EElpdqlH-W_iTy0qhtcvpP53LBMP9R6ZRQ,399
-docker_devkit-0.1.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-docker_devkit-0.1.2.dist-info/entry_points.txt,sha256=0AJlYxdEuQ7w21s1y-07MJ4AU_aJBUfkVWrwrxCqaMI,113
-docker_devkit-0.1.2.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
-docker_devkit-0.1.2.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
-docker_devkit-0.1.2.dist-info/RECORD,,