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

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

@@ -32,7 +32,7 @@ jobs:
         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
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -58,7 +58,7 @@ jobs:
 
       - if: matrix.python-version == '3.12'
         name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5.5.0
+        uses: codecov/codecov-action@v5.5.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: litestar-org/pytest-databases
@@ -73,7 +73,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
 

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

@@ -26,7 +26,7 @@ jobs:
         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
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.12
 

{pytest_databases-0.14.1 → pytest_databases-0.15.0}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: "^docs/conf.py"
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -19,7 +19,7 @@ repos:
 
   # Ruff replaces black, flake8, autoflake and isort
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.11.11" # make sure this is always consistent with hatch configs
+    rev: "v0.13.3" # make sure this is always consistent with hatch configs
     hooks:
       - id: ruff
         args: [--config, ./pyproject.toml]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-databases
-Version: 0.14.1
+Version: 0.15.0
 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
@@ -84,7 +84,7 @@ Ready-made database fixtures for your pytest tests.
 
 `pytest-databases` uses the Docker Python SDK to manage the startup and shutdown of database services in containers. The following databases are currently available:
 
-- **Postgres**: Version 12, 13, 14, 15, 16 and 17 are available
+- **Postgres**: Version 12, 13, 14, 15, 16, 17 and 18 are available
 - **MySQL**: Version 5.6, 5.7 and 8 are available
 - **Oracle**: Version 18c XE and 23C Free are available
 - **SQL Server**: Version 2022 is available

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

@@ -26,7 +26,7 @@ Ready-made database fixtures for your pytest tests.
 
 `pytest-databases` uses the Docker Python SDK to manage the startup and shutdown of database services in containers. The following databases are currently available:
 
-- **Postgres**: Version 12, 13, 14, 15, 16 and 17 are available
+- **Postgres**: Version 12, 13, 14, 15, 16, 17 and 18 are available
 - **MySQL**: Version 5.6, 5.7 and 8 are available
 - **Oracle**: Version 18c XE and 23C Free are available
 - **SQL Server**: Version 2022 is available

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

@@ -8,7 +8,7 @@ Installation
 
 .. code-block:: bash
 
-   pip install pytest-databases[postgres]
+    pip install pytest-databases[postgres]
 
 Usage Example
 -------------
@@ -54,6 +54,7 @@ The following version-specific fixtures are also available:
 * ``postgres_15_image``, ``postgres_15_service``, ``postgres_15_connection``: PostgreSQL 15.x
 * ``postgres_16_image``, ``postgres_16_service``, ``postgres_16_connection``: PostgreSQL 16.x
 * ``postgres_17_image``, ``postgres_17_service``, ``postgres_17_connection``: PostgreSQL 17.x
+* ``postgres_18_image``, ``postgres_18_service``, ``postgres_18_connection``: PostgreSQL 18.x
 * ``pgvector_image``, ``pgvector_service``. ``pgvector_connection``: Latest Available pgvector Docker image.
 
 Configuration
@@ -67,13 +68,13 @@ Example usage with custom host:
 
 .. code-block:: bash
 
-   export POSTGRES_HOST="192.168.1.100"
-   pytest
+    export POSTGRES_HOST="192.168.1.100"
+    pytest
 
 Service API
 -----------
 
 .. automodule:: pytest_databases.docker.postgres
-   :members:
-   :undoc-members:
-   :show-inheritance:
+    :members:
+    :undoc-members:
+    :show-inheritance:

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

@@ -12,7 +12,7 @@ license = "MIT"
 name = "pytest-databases"
 readme = "README.md"
 requires-python = ">=3.9"
-version = "0.14.1"
+version = "0.15.0"
 #
 authors = [{ name = "Cody Fincher", email = "cody@litestar.dev" }]
 keywords = [
@@ -122,12 +122,12 @@ dev = [
 
 [tool.bumpversion]
 allow_dirty = true
-commit = true
+commit = false
 commit_args = "--no-verify"
-current_version = "0.14.0"
+current_version = "0.15.0"
 ignore_missing_files = false
 ignore_missing_version = false
-message = "chore(release): bump to v{new_version}"
+message = "chore(release): bump to `v{new_version}`"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 regex = false
 replace = "{new_version}"
@@ -135,7 +135,7 @@ search = "{current_version}"
 serialize = ["{major}.{minor}.{patch}"]
 sign_tags = false
 tag = false
-tag_message = "chore(release): v{new_version}"
+tag_message = "chore(release): `v{new_version}`"
 tag_name = "v{new_version}"
 
 [[tool.bumpversion.files]]

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

@@ -139,6 +139,7 @@ class DockerService(AbstractContextManager):
         shm_size: int | None = None,
         mem_limit: str | None = None,
         platform: str | None = None,
+        protocol: str = "tcp",
     ) -> Generator[ServiceContainer, None, None]:
         if check is None and wait_for_log is None:
             msg = "Must set at least check or wait_for_log"
@@ -176,17 +177,32 @@ class DockerService(AbstractContextManager):
                 # spins it up and the metadata becomes available, so we're redoing the
                 # check with a small incremental backup here
                 for i in range(10):
+                    container.reload()
                     if any(v for v in container.ports.values()):
                         break
-                    container.reload()
                     time.sleep(0.1 + (i / 10))
                 else:
                     msg = f"Service {name!r} failed to create container"
                     raise ValueError(msg)
 
-        host_port = int(
-            container.ports[next(k for k in container.ports if k.startswith(str(container_port)))][0]["HostPort"]
-        )
+        # Get port binding based on protocol configuration
+        binding = None
+        if protocol == "both":
+            binding = container.ports.get(f"{container_port}/tcp") or container.ports.get(f"{container_port}/udp")
+        elif protocol in {"tcp", "udp"}:
+            binding = container.ports.get(f"{container_port}/{protocol}")
+        else:
+            msg = f"Invalid protocol '{protocol}'. Must be 'tcp', 'udp', or 'both'."
+            raise ValueError(msg)
+
+        if not binding:
+            msg = (
+                f"Container port {container_port}/{protocol} not found in exposed ports. "
+                f"Available ports: {list(container.ports.keys())}"
+            )
+            raise RuntimeError(msg)
+
+        host_port = int(binding[0]["HostPort"])
         service = ServiceContainer(
             host=container_host,
             port=host_port,

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

@@ -244,6 +244,26 @@ def postgres_17_service(
         yield service
 
 
+@pytest.fixture(autouse=False, scope="session")
+def postgres_18_service(
+    docker_service: DockerService,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
+    postgres_host: str,
+    postgres_user: str,
+    postgres_password: str,
+) -> Generator[PostgresService, None, None]:
+    with _provide_postgres_service(
+        docker_service,
+        image="postgres:18",
+        name="postgres-18",
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
+        host=postgres_host,
+        user=postgres_user,
+        password=postgres_password,
+    ) as service:
+        yield service
+
+
 @pytest.fixture(autouse=False, scope="session")
 def postgres_11_connection(
     postgres_11_service: PostgresService,
@@ -356,9 +376,25 @@ def postgres_17_connection(
         yield conn
 
 
+@pytest.fixture(autouse=False, scope="session")
+def postgres_18_connection(
+    postgres_18_service: PostgresService,
+) -> Generator[psycopg.Connection, None, None]:
+    with psycopg.connect(
+        _make_connection_string(
+            host=postgres_18_service.host,
+            port=postgres_18_service.port,
+            user=postgres_18_service.user,
+            password=postgres_18_service.password,
+            database=postgres_18_service.database,
+        ),
+    ) as conn:
+        yield conn
+
+
 @pytest.fixture(autouse=False, scope="session")
 def postgres_image() -> str:
-    return "postgres:17"
+    return "postgres:18"
 
 
 @pytest.fixture(autouse=False, scope="session")

{pytest_databases-0.14.1 → pytest_databases-0.15.0}/tests/test_postgres.py

@@ -13,6 +13,7 @@ import pytest
         "postgres_15_service",
         "postgres_16_service",
         "postgres_17_service",
+        "postgres_18_service",
         "alloydb_omni_service",
         "pgvector_service",
     ],
@@ -57,6 +58,7 @@ def test_service_fixture(pytester: pytest.Pytester, service_fixture: str) -> Non
         "postgres_15_connection",
         "postgres_16_connection",
         "postgres_17_connection",
+        "postgres_18_connection",
         "alloydb_omni_connection",
         "pgvector_connection",
     ],

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

@@ -95,8 +95,8 @@ def test_two({redis_compatible_service}: RedisService) -> None:
     assert not client.get("one")
     client.set("one", "1")
     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)