dycw-utilities 0.175.31__py3-none-any.whl → 0.175.33__py3-none-any.whl

{dycw_utilities-0.175.31.dist-info → dycw_utilities-0.175.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dycw-utilities
-Version: 0.175.31
+Version: 0.175.33
 Summary: Miscellaneous Python utilities
 Author: Derek Wan
 Author-email: Derek Wan <d.wan@icloud.com>

{dycw_utilities-0.175.31.dist-info → dycw_utilities-0.175.33.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=y-0IecU_rQ9B_0aVstJ6gMlcyWn2-Hw_v-RcSXW8pWY,61
+utilities/__init__.py,sha256=jL_ivCZ7rlDezKhNQ0JGInHxBEA6UFb4yN1d4M7P1p4,61
 utilities/altair.py,sha256=TLfRFbG9HwG7SLXoJ-v0r-t49ZaGgTQZD82cpjVi4vs,9085
 utilities/asyncio.py,sha256=aJySVxBY0gqsIYnoNmH7-1r8djKuf4vSsU69VCD08t8,16772
 utilities/atomicwrites.py,sha256=tPo6r-Rypd9u99u66B9z86YBPpnLrlHtwox_8Z7T34Y,5790
@@ -11,7 +11,7 @@ utilities/contextvars.py,sha256=J8OhC7jqozAGYOCe2KUWysbPXNGe5JYz3HfaY_mIs08,883
 utilities/cryptography.py,sha256=5PFrzsNUGHay91dFgYnDKwYprXxahrBqztmUqViRzBk,956
 utilities/cvxpy.py,sha256=Rv1-fD-XYerosCavRF8Pohop2DBkU3AlFaGTfD8AEAA,13776
 utilities/dataclasses.py,sha256=xbU3QN1GFy7RC6hIJRZIeUZm7YRlodrgEWmahWG6k2g,32465
-utilities/docker.py,sha256=IOOdxAqfJfy1SXwy3e4VaAR9ag42W0HTcNcQz7DJPF8,10501
+utilities/docker.py,sha256=_cUgyU3207VH8e6IdQ88GNssvOVSkvEsUx95LiaayjY,10635
 utilities/enum.py,sha256=5l6pwZD1cjSlVW4ss-zBPspWvrbrYrdtJWcg6f5_J5w,5781
 utilities/errors.py,sha256=mFlDGSM0LI1jZ1pbqwLAH3ttLZ2JVIxyZLojw8tGVZU,1479
 utilities/fastapi.py,sha256=TqyKvBjiMS594sXPjrz-KRTLMb3l3D3rZ1zAYV7GfOk,1454
@@ -97,7 +97,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=F4ek0-OBWxHYrZdmoZt76N2RnNyKY5KrEHt7rqO4AQE,60183
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=tdIScrTB2-B-LH0ukb1HUXKooLknOfJNwHk10MuMYvA,3619
-dycw_utilities-0.175.31.dist-info/WHEEL,sha256=RRVLqVugUmFOqBedBFAmA4bsgFcROUBiSUKlERi0Hcg,79
-dycw_utilities-0.175.31.dist-info/entry_points.txt,sha256=cOGtKeJI0KXLSV7MJ8Dhc2G8jPgDcBDm53MVNJU4ycI,136
-dycw_utilities-0.175.31.dist-info/METADATA,sha256=WX68a6sQoOamTeIZsrXvDdI_VKItf-Jm3Cam7p1jR_U,1443
-dycw_utilities-0.175.31.dist-info/RECORD,,
+dycw_utilities-0.175.33.dist-info/WHEEL,sha256=RRVLqVugUmFOqBedBFAmA4bsgFcROUBiSUKlERi0Hcg,79
+dycw_utilities-0.175.33.dist-info/entry_points.txt,sha256=cOGtKeJI0KXLSV7MJ8Dhc2G8jPgDcBDm53MVNJU4ycI,136
+dycw_utilities-0.175.33.dist-info/METADATA,sha256=UbMzH_4ZM4Vd4DyXOwG1tJB23ThMqnLoerrDvGCm7N8,1443
+dycw_utilities-0.175.33.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.175.31"
+__version__ = "0.175.33"

utilities/docker.py

@@ -73,30 +73,36 @@ def docker_compose_pull_cmd(
 def docker_compose_up(
     *,
     files: MaybeIterable[PathLike] | None = None,
+    detach: bool = True,
     print: bool = False,  # noqa: A002
     print_stdout: bool = False,
     print_stderr: bool = False,
 ) -> None:
     """Create and start containers."""
-    args = docker_compose_up_cmd(files=files)  # pragma: no cover
+    args = docker_compose_up_cmd(files=files, detach=detach)  # pragma: no cover
     run(  # pragma: no cover
         *args, print=print, print_stdout=print_stdout, print_stderr=print_stderr
     )
 
 
-def docker_compose_up_cmd(*, files: MaybeIterable[PathLike] | None = None) -> list[str]:
+def docker_compose_up_cmd(
+    *, files: MaybeIterable[PathLike] | None = None, detach: bool = True
+) -> list[str]:
     """Command to use 'docker compose up' to create and start containers."""
-    return _docker_compose_cmd("up", files=files)
+    args: list[str] = []
+    if detach:
+        args.append("--detach")
+    return _docker_compose_cmd("up", *args, files=files)
 
 
 def _docker_compose_cmd(
-    cmd: str, /, *, files: MaybeIterable[PathLike] | None = None
+    cmd: str, /, *args: str, files: MaybeIterable[PathLike] | None = None
 ) -> list[str]:
-    args: list[str] = ["docker", "compose"]
+    all_args: list[str] = ["docker", "compose"]
     if files is not None:
         for file in always_iterable(files):
-            args.extend(["--file", str(file)])
-    return [*args, cmd]
+            all_args.extend(["--file", str(file)])
+    return [*all_args, cmd, *args]
 
 
 ##
@@ -168,7 +174,7 @@ def docker_exec(
     container: str,
     cmd: str,
     /,
-    *cmds_or_args: str,
+    *args: str,
     env: StrStrMapping | None = None,
     user: str | None = None,
     workdir: PathLike | None = None,
@@ -188,7 +194,7 @@ def docker_exec(
     container: str,
     cmd: str,
     /,
-    *cmds_or_args: str,
+    *args: str,
     env: StrStrMapping | None = None,
     user: str | None = None,
     workdir: PathLike | None = None,
@@ -208,7 +214,7 @@ def docker_exec(
     container: str,
     cmd: str,
     /,
-    *cmds_or_args: str,
+    *args: str,
     env: StrStrMapping | None = None,
     user: str | None = None,
     workdir: PathLike | None = None,
@@ -228,7 +234,7 @@ def docker_exec(
     container: str,
     cmd: str,
     /,
-    *cmds_or_args: str,
+    *args: str,
     env: StrStrMapping | None = None,
     user: str | None = None,
     workdir: PathLike | None = None,
@@ -248,7 +254,7 @@ def docker_exec(
     container: str,
     cmd: str,
     /,
-    *cmds_or_args: str,
+    *args: str,
     env: StrStrMapping | None = None,
     user: str | None = None,
     workdir: PathLike | None = None,
@@ -267,7 +273,7 @@ def docker_exec(
     container: str,
     cmd: str,
     /,
-    *cmds_or_args: str,
+    *args: str,
     env: StrStrMapping | None = None,
     user: str | None = None,
     workdir: PathLike | None = None,
@@ -283,10 +289,10 @@ def docker_exec(
     **env_kwargs: str,
 ) -> str | None:
     """Execute a command in a container."""
-    cmd_and_args = docker_exec_cmd(  # skipif-ci
+    run_cmd_and_args = docker_exec_cmd(  # skipif-ci
         container,
         cmd,
-        *cmds_or_args,
+        *args,
         env=env,
         interactive=input is not None,
         user=user,
@@ -294,7 +300,7 @@ def docker_exec(
         **env_kwargs,
     )
     return run(  # skipif-ci
-        *cmd_and_args,
+        *run_cmd_and_args,
         input=input,
         print=print,
         print_stdout=print_stdout,
@@ -311,7 +317,7 @@ def docker_exec_cmd(
     container: str,
     cmd: str,
     /,
-    *cmds_or_args: str,
+    *args: str,
     env: StrStrMapping | None = None,
     interactive: bool = False,
     user: str | None = None,
@@ -319,17 +325,17 @@ def docker_exec_cmd(
     **env_kwargs: str,
 ) -> list[str]:
     """Command to use `docker exec` to execute a command in a container."""
-    args: list[str] = ["docker", "exec"]
+    all_args: list[str] = ["docker", "exec"]
     mapping: dict[str, str] = ({} if env is None else dict(env)) | env_kwargs
     for key, value in mapping.items():
-        args.extend(["--env", f"{key}={value}"])
+        all_args.extend(["--env", f"{key}={value}"])
     if interactive:
-        args.append("--interactive")
+        all_args.append("--interactive")
     if user is not None:
-        args.extend(["--user", user])
+        all_args.extend(["--user", user])
     if workdir is not None:
-        args.extend(["--workdir", str(workdir)])
-    return [*args, container, cmd, *cmds_or_args]
+        all_args.extend(["--workdir", str(workdir)])
+    return [*all_args, container, cmd, *args]
 
 
 ##