dycw-utilities 0.147.1__tar.gz → 0.147.3__tar.gz

{dycw_utilities-0.147.1 → dycw_utilities-0.147.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.147.1
+Version: 0.147.3
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.147.1 → dycw_utilities-0.147.3}/pyproject.toml

@@ -102,7 +102,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.147.1"
+version = "0.147.3"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -135,7 +135,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.147.1"
+current_version = "0.147.3"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.147.1 → dycw_utilities-0.147.3}/src/tests/test_postgres.py

@@ -53,6 +53,7 @@ class TestPGDump:
     @given(
         url=urls(),
         path=temp_paths(),
+        docker=text_ascii(min_size=1) | none(),
         format_=sampled_from(get_literal_elements(_PGDumpFormat)),
         jobs=integers(min_value=0) | none(),
         schemas=lists(text_ascii(min_size=1)) | none(),
@@ -64,6 +65,7 @@ class TestPGDump:
         *,
         url: URL,
         path: Path,
+        docker: str | None,
         format_: _PGDumpFormat,
         jobs: int | None,
         schemas: list[str] | None,
@@ -73,6 +75,7 @@ class TestPGDump:
         _ = await pg_dump(
             url,
             path,
+            docker=docker,
             format_=format_,
             jobs=jobs,
             schemas=schemas,
@@ -104,6 +107,7 @@ class TestPGRestore:
         url=urls(),
         path=temp_paths(),
         database=text_ascii(min_size=1) | none(),
+        docker=text_ascii(min_size=1) | none(),
         data_only=booleans(),
         jobs=integers(min_value=0) | none(),
         schemas=lists(text_ascii(min_size=1)) | none(),
@@ -116,6 +120,7 @@ class TestPGRestore:
         url: URL,
         path: Path,
         database: str | None,
+        docker: str | None,
         data_only: bool,
         jobs: int | None,
         schemas: list[str] | None,
@@ -126,6 +131,7 @@ class TestPGRestore:
             url,
             path,
             database=database,
+            docker=docker,
             data_only=data_only,
             jobs=jobs,
             schemas=schemas,

{dycw_utilities-0.147.1 → dycw_utilities-0.147.3}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.147.1"
+__version__ = "0.147.3"

{dycw_utilities-0.147.1 → dycw_utilities-0.147.3}/src/utilities/postgres.py

@@ -27,6 +27,7 @@ async def pg_dump(
     path: PathLike,
     /,
     *,
+    docker: str | None = None,
     format_: _PGDumpFormat = "plain",
     jobs: int | None = None,
     schemas: MaybeListStr | None = None,
@@ -43,7 +44,10 @@ async def pg_dump(
         raise _PGDumpHostError(url=url)
     if url.port is None:
         raise _PGDumpPortError(url=url)
-    parts: list[str] = [
+    parts: list[str] = []
+    if docker is not None:
+        parts.extend(["docker", "exec", "-it", docker])
+    parts.extend([
         "pg_dump",
         # general options
         f"--dbname={url.database}",
@@ -60,7 +64,7 @@ async def pg_dump(
         f"--host={url.host}",
         f"--port={url.port}",
         "--no-password",
-    ]
+    ])
     if (format_ == "directory") and (jobs is not None):
         parts.append(f"--jobs={jobs}")
     if schemas is not None:
@@ -136,6 +140,7 @@ async def pg_restore(
     /,
     *,
     database: str | None = None,
+    docker: str | None = None,
     data_only: bool = False,
     jobs: int | None = None,
     schemas: MaybeListStr | None = None,
@@ -157,7 +162,10 @@ async def pg_restore(
         raise _PGRestoreHostError(url=url)
     if url.port is None:
         raise _PGRestorePortError(url=url)
-    parts: list[str] = [
+    parts: list[str] = []
+    if docker is not None:
+        parts.extend(["docker", "exec", "-it", docker])
+    parts.extend([
         "pg_restore",
         # general options
         f"--dbname={database_use}",
@@ -171,7 +179,7 @@ async def pg_restore(
         f"--host={url.host}",
         f"--port={url.port}",
         "--no-password",
-    ]
+    ])
     if data_only:
         parts.append("--data-only")
     else:

{dycw_utilities-0.147.1 → dycw_utilities-0.147.3}/src/utilities/pottery.py

@@ -175,7 +175,9 @@ async def _get_first_available_lock(
     )
     async with timeout_td(timeout, error=error):  # skipif-ci-and-not-linux
         while True:
-            if (result := await _get_first_available_lock_if_any(locks)) is not None:
+            if (
+                (result := await _get_first_available_lock_if_any(locks)) is not None
+            ) and (await result.locked() > 0.0):
                 return result
             await sleep_td(sleep)