pytest-databases 0.13.0__tar.gz → 0.14.1__tar.gz

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/.github/workflows/cd.yaml

@@ -13,7 +13,7 @@ jobs:
       release_body: ${{ steps.git-cliff.outputs.content }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
         cdist-group: [1, 2, 3]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install additional dependencies
         run: sudo apt-get update && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 libmariadb-dev && sudo apt-get autoremove -y  && sudo apt-get clean -y
@@ -58,7 +58,7 @@ jobs:
 
       - if: matrix.python-version == '3.12'
         name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.5.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: litestar-org/pytest-databases
@@ -70,7 +70,7 @@ jobs:
       - name: Install additional dependencies
         run: sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 libmariadb-dev
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -94,7 +94,7 @@ jobs:
   #   runs-on: ubuntu-latest
   #   steps:
   #     - name: Check out repository
-  #       uses: actions/checkout@v4
+  #       uses: actions/checkout@v5
   #       with:
   #         fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
   #     - name: Download Artifacts

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/.github/workflows/docs.yml

@@ -20,7 +20,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install additional dependencies
         run: sudo apt-get update && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 libmariadb-dev && sudo apt-get autoremove -y  && sudo apt-get clean -y
@@ -43,7 +43,7 @@ jobs:
         run: uv run scripts/build_docs.py dist/docs
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: dist/docs/
 

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/.github/workflows/pr-title.yaml

@@ -15,6 +15,6 @@ jobs:
     name: Validate PR title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
+      - uses: amannn/action-semantic-pull-request@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
         run: sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 libmariadb-dev
 
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-databases
-Version: 0.13.0
+Version: 0.14.1
 Summary: Reusable database fixtures for any and all databases.
 Project-URL: Documentation, https://github.com/litestar-org/pytest-databases#readme
 Project-URL: Issues, https://github.com/litestar-org/pytest-databases/issues
@@ -133,7 +133,7 @@ def test_one(postgres_service: PostgresService) -> None:
 
 ## Documentation
 
-Full documentation is available at [https://pytest-databases.readthedocs.io/](https://pytest-databases.readthedocs.io/)
+Full documentation is available at [https://litestar-org.github.io/pytest-databases/latest/](https://litestar-org.github.io/pytest-databases/latest/)
 
 ## Contributing
 

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/README.md

@@ -75,7 +75,7 @@ def test_one(postgres_service: PostgresService) -> None:
 
 ## Documentation
 
-Full documentation is available at [https://pytest-databases.readthedocs.io/](https://pytest-databases.readthedocs.io/)
+Full documentation is available at [https://litestar-org.github.io/pytest-databases/latest/](https://litestar-org.github.io/pytest-databases/latest/)
 
 ## Contributing
 

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/docs/supported-databases/postgres.rst

@@ -36,6 +36,7 @@ Usage Example
 Available Fixtures
 ------------------
 
+* ``postgres_host``: The PostgreSQL host address (defaults to "127.0.0.1", can be overridden with ``POSTGRES_HOST`` environment variable).
 * ``postgres_user``: The PostgreSQL user.
 * ``postgres_password``: The PostgreSQL password.
 * ``postgres_database``: The PostgreSQL database name to use.
@@ -55,6 +56,19 @@ The following version-specific fixtures are also available:
 * ``postgres_17_image``, ``postgres_17_service``, ``postgres_17_connection``: PostgreSQL 17.x
 * ``pgvector_image``, ``pgvector_service``. ``pgvector_connection``: Latest Available pgvector Docker image.
 
+Configuration
+-------------
+
+PostgreSQL services can be configured using environment variables:
+
+* ``POSTGRES_HOST``: The host address for the PostgreSQL container (default: "127.0.0.1")
+
+Example usage with custom host:
+
+.. code-block:: bash
+
+   export POSTGRES_HOST="192.168.1.100"
+   pytest
 
 Service API
 -----------

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/pyproject.toml

@@ -12,7 +12,7 @@ license = "MIT"
 name = "pytest-databases"
 readme = "README.md"
 requires-python = ">=3.9"
-version = "0.13.0"
+version = "0.14.1"
 #
 authors = [{ name = "Cody Fincher", email = "cody@litestar.dev" }]
 keywords = [
@@ -84,7 +84,6 @@ dev = [
   "pytest-mock",
   "pytest-click",
   "pytest-xdist",
-  "pytest-sugar",
   "slotscheck",
   "psycopg-binary",                                                                                                                                                    # This fixes tests failing on M series CPUs.
   # lint
@@ -125,7 +124,7 @@ dev = [
 allow_dirty = true
 commit = true
 commit_args = "--no-verify"
-current_version = "0.13.0"
+current_version = "0.14.0"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/src/pytest_databases/_service.py

@@ -126,6 +126,7 @@ class DockerService(AbstractContextManager):
         image: str,
         container_port: int,
         name: str,
+        container_host: str = "127.0.0.1",
         command: str | None = None,
         env: dict[str, Any] | None = None,
         exec_after_start: str | list[str] | None = None,
@@ -187,7 +188,7 @@ class DockerService(AbstractContextManager):
             container.ports[next(k for k in container.ports if k.startswith(str(container_port)))][0]["HostPort"]
         )
         service = ServiceContainer(
-            host="127.0.0.1",
+            host=container_host,
             port=host_port,
         )
 

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/src/pytest_databases/docker/postgres.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import dataclasses
+import os
 from contextlib import contextmanager
 from typing import TYPE_CHECKING
 
@@ -32,6 +33,11 @@ class PostgresService(ServiceContainer):
     user: str
 
 
+@pytest.fixture(autouse=False, scope="session")
+def postgres_host() -> str:
+    return os.environ.get("POSTGRES_HOST", "127.0.0.1")
+
+
 @pytest.fixture(autouse=False, scope="session")
 def postgres_password() -> str:
     return "super-secret"
@@ -47,6 +53,7 @@ def _provide_postgres_service(
     docker_service: DockerService,
     image: str,
     name: str,
+    host: str,
     user: str,
     password: str,
     xdist_postgres_isolate: XdistIsolationLevel,
@@ -79,6 +86,7 @@ def _provide_postgres_service(
     with docker_service.run(
         image=image,
         check=check,
+        container_host=host,
         container_port=5432,
         name=name,
         env={
@@ -100,6 +108,7 @@ def _provide_postgres_service(
 def postgres_11_service(
     docker_service: DockerService,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -108,6 +117,7 @@ def postgres_11_service(
         image="postgres:11",
         name="postgres-11",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -118,6 +128,7 @@ def postgres_11_service(
 def postgres_12_service(
     docker_service: DockerService,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -126,6 +137,7 @@ def postgres_12_service(
         image="postgres:12",
         name="postgres-12",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -136,6 +148,7 @@ def postgres_12_service(
 def postgres_13_service(
     docker_service: DockerService,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -144,6 +157,7 @@ def postgres_13_service(
         image="postgres:13",
         name="postgres-13",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -154,6 +168,7 @@ def postgres_13_service(
 def postgres_14_service(
     docker_service: DockerService,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -162,6 +177,7 @@ def postgres_14_service(
         image="postgres:14",
         name="postgres-14",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -172,6 +188,7 @@ def postgres_14_service(
 def postgres_15_service(
     docker_service: DockerService,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -180,6 +197,7 @@ def postgres_15_service(
         image="postgres:15",
         name="postgres-15",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -190,6 +208,7 @@ def postgres_15_service(
 def postgres_16_service(
     docker_service: DockerService,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -198,6 +217,7 @@ def postgres_16_service(
         image="postgres:16",
         name="postgres-16",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -208,6 +228,7 @@ def postgres_16_service(
 def postgres_17_service(
     docker_service: DockerService,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -216,6 +237,7 @@ def postgres_17_service(
         image="postgres:17",
         name="postgres-17",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -344,6 +366,7 @@ def postgres_service(
     docker_service: DockerService,
     postgres_image: str,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -352,6 +375,7 @@ def postgres_service(
         image=postgres_image,
         name="postgres",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -384,6 +408,7 @@ def pgvector_service(
     docker_service: DockerService,
     pgvector_image: str,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -392,6 +417,7 @@ def pgvector_service(
         image=pgvector_image,
         name="pgvector",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:
@@ -424,6 +450,7 @@ def alloydb_omni_service(
     docker_service: DockerService,
     pgvector_image: str,
     xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
     postgres_user: str,
     postgres_password: str,
 ) -> Generator[PostgresService, None, None]:
@@ -432,6 +459,7 @@ def alloydb_omni_service(
         image=pgvector_image,
         name="alloydb-omni",
         xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
         user=postgres_user,
         password=postgres_password,
     ) as service:

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/src/pytest_databases/docker/redis.py

@@ -62,8 +62,6 @@ def redis_service(
     db = 0
     if worker_num is not None:
         if xdist_redis_isolation_level == "database":
-            container_num = worker_num // 1
-            name += f"_{container_num + 1}"
             db = worker_num
         else:
             name += f"_{worker_num + 1}"
@@ -94,8 +92,6 @@ def dragonfly_service(
     db = 0
     if worker_num is not None:
         if xdist_redis_isolation_level == "database":
-            container_num = worker_num // 1
-            name += f"_{container_num + 1}"
             db = worker_num
         else:
             name += f"_{worker_num + 1}"
@@ -136,8 +132,6 @@ def keydb_service(
     db = 0
     if worker_num is not None:
         if xdist_redis_isolation_level == "database":
-            container_num = worker_num // 1
-            name += f"_{container_num + 1}"
             db = worker_num
         else:
             name += f"_{worker_num + 1}"

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/tests/test_redis.py

@@ -46,7 +46,7 @@ def redis_image():
     return "{redis_image_name}"
 
 def test_redis_service(redis_service: RedisService) -> None:
-    assert redis.Redis.from_url("redis://", host=redis_service.host, port=redis_service.port).ping()
+    assert redis.Redis(host=redis_service.host, port=redis_service.port).ping()
 """)
     result = pytester.runpytest()
     result.assert_outcomes(passed=1)
@@ -64,7 +64,7 @@ pytest_plugins = [
 ]
 
 def test_redis_service({redis_compatible_service}: RedisService) -> None:
-    assert redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port).ping()
+    assert redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port).ping()
 """)
     result = pytester.runpytest()
     result.assert_outcomes(passed=1)
@@ -82,20 +82,31 @@ pytest_plugins = [
 ]
 
 def test_one({redis_compatible_service}: RedisService) -> None:
-    client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
-    assert not client.get("one")
-    client.set("one", "1")
+    client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
     assert {redis_compatible_service}.db == get_xdist_worker_num()
+    assert not client.get("one")
+    client.set("one", "0")
+    assert client.get("one") == b"0"
 
 
 def test_two({redis_compatible_service}: RedisService) -> None:
-    client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
+    client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
+    assert {redis_compatible_service}.db == get_xdist_worker_num()
     assert not client.get("one")
     client.set("one", "1")
-    assert {redis_compatible_service}.db == get_xdist_worker_num()
+    assert client.get("one") == b"1"
+    
+    
+def test_use_same_db({redis_compatible_service}: RedisService) -> None:
+    client_0 = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db=0)
+    client_1 = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db=1)
+    client_0.set("foo", "0")
+    client_1.set("foo", "1")
+    assert client_0.get("foo") == b"0"
+    assert client_1.get("foo") == b"1"
 """)
     result = pytester.runpytest("-n", "2")
-    result.assert_outcomes(passed=2)
+    result.assert_outcomes(passed=3)
 
 
 def test_xdist_isolate_server(pytester: pytest.Pytester, redis_compatible_service: str) -> None:
@@ -115,14 +126,14 @@ def xdist_redis_isolation_level():
 
 
 def test_one({redis_compatible_service}: RedisService) -> None:
-    client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
+    client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
     assert not client.get("one")
     client.set("one", "1")
     assert {redis_compatible_service}.db == 0
 
 
 def test_two({redis_compatible_service}: RedisService) -> None:
-    client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
+    client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
     assert not client.get("one")
     client.set("one", "1")
     assert {redis_compatible_service}.db == 0

{pytest_databases-0.13.0 → pytest_databases-0.14.1}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 2
+revision = 3
 requires-python = ">=3.9"
 resolution-markers = [
     "python_full_version >= '3.13'",
@@ -2010,7 +2010,7 @@ wheels = [
 
 [[package]]
 name = "pytest-databases"
-version = "0.13.0"
+version = "0.14.1"
 source = { editable = "." }
 dependencies = [
     { name = "docker" },
@@ -2085,7 +2085,6 @@ dev = [
     { name = "pytest-cov" },
     { name = "pytest-databases", extra = ["azure-storage", "bigquery", "cockroachdb", "dragonfly", "elasticsearch7", "elasticsearch8", "keydb", "mariadb", "minio", "mssql", "mysql", "oracle", "postgres", "redis", "spanner", "valkey"] },
     { name = "pytest-mock" },
-    { name = "pytest-sugar" },
     { name = "pytest-xdist" },
     { name = "ruff" },
     { name = "shibuya" },
@@ -2154,7 +2153,6 @@ dev = [
     { name = "pytest-cov" },
     { name = "pytest-databases", extras = ["azure-storage", "bigquery", "cockroachdb", "dragonfly", "elasticsearch7", "elasticsearch8", "keydb", "mssql", "mysql", "mariadb", "oracle", "postgres", "redis", "spanner", "minio", "valkey"] },
     { name = "pytest-mock" },
-    { name = "pytest-sugar" },
     { name = "pytest-xdist" },
     { name = "ruff" },
     { name = "shibuya" },
@@ -2192,20 +2190,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/f2/3b/b26f90f74e2986a82df6e7ac7e319b8ea7ccece1caec9f8ab6104dc70603/pytest_mock-3.14.0-py3-none-any.whl", hash = "sha256:0b72c38033392a5f4621342fe11e9219ac11ec9d375f8e2a0c164539e0d70f6f", size = 9863, upload-time = "2024-03-21T22:14:02.694Z" },
 ]
 
-[[package]]
-name = "pytest-sugar"
-version = "1.0.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "packaging" },
-    { name = "pytest" },
-    { name = "termcolor" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/f5/ac/5754f5edd6d508bc6493bc37d74b928f102a5fff82d9a80347e180998f08/pytest-sugar-1.0.0.tar.gz", hash = "sha256:6422e83258f5b0c04ce7c632176c7732cab5fdb909cb39cca5c9139f81276c0a", size = 14992, upload-time = "2024-02-01T18:30:36.735Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/92/fb/889f1b69da2f13691de09a111c16c4766a433382d44aa0ecf221deded44a/pytest_sugar-1.0.0-py3-none-any.whl", hash = "sha256:70ebcd8fc5795dc457ff8b69d266a4e2e8a74ae0c3edc749381c64b5246c8dfd", size = 10171, upload-time = "2024-02-01T18:30:29.395Z" },
-]
-
 [[package]]
 name = "pytest-xdist"
 version = "3.6.1"
@@ -3042,15 +3026,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/40/44/4a5f08c96eb108af5cb50b41f76142f0afa346dfa99d5296fe7202a11854/tabulate-0.9.0-py3-none-any.whl", hash = "sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f", size = 35252, upload-time = "2022-10-06T17:21:44.262Z" },
 ]
 
-[[package]]
-name = "termcolor"
-version = "3.1.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ca/6c/3d75c196ac07ac8749600b60b03f4f6094d54e132c4d94ebac6ee0e0add0/termcolor-3.1.0.tar.gz", hash = "sha256:6a6dd7fbee581909eeec6a756cff1d7f7c376063b14e4a298dc4980309e55970", size = 14324, upload-time = "2025-04-30T11:37:53.791Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/4f/bd/de8d508070629b6d84a30d01d57e4a65c69aa7f5abe7560b8fad3b50ea59/termcolor-3.1.0-py3-none-any.whl", hash = "sha256:591dd26b5c2ce03b9e43f391264626557873ce1d379019786f99b0c2bee140aa", size = 7684, upload-time = "2025-04-30T11:37:52.382Z" },
-]
-
 [[package]]
 name = "tomli"
 version = "2.2.1"