pytest-databases 0.9.0__tar.gz → 0.10.0__tar.gz

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-databases
-Version: 0.9.0
+Version: 0.10.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
@@ -82,7 +82,7 @@ It is designed to offer pre-configured testing setups for many different types a
 
 `pytest-databases` currently utilizes `docker compose` (or the legacy `docker-compose`) commands to manage the startup and shutdown of each database service. The following databases are currently available:
 
-- **Postgres**: Version 12, 13, 14, 15, and 16 are available
+- **Postgres**: Version 12, 13, 14, 15, 16 and 17 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.9.0 → pytest_databases-0.10.0}/README.md

@@ -32,7 +32,7 @@ It is designed to offer pre-configured testing setups for many different types a
 
 `pytest-databases` currently utilizes `docker compose` (or the legacy `docker-compose`) commands to manage the startup and shutdown of each database service. The following databases are currently available:
 
-- **Postgres**: Version 12, 13, 14, 15, and 16 are available
+- **Postgres**: Version 12, 13, 14, 15, 16 and 17 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.9.0 → pytest_databases-0.10.0}/pyproject.toml

@@ -12,7 +12,7 @@ license = "MIT"
 name = "pytest-databases"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.9.0"
+version = "0.10.0"
 #
 authors = [{ name = "Cody Fincher", email = "cody.fincher@gmail.com" }]
 keywords = [

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/__init__.py

@@ -5,6 +5,7 @@ import re
 import subprocess  # noqa: S404
 import time
 import timeit
+from contextlib import AbstractContextManager
 from typing import TYPE_CHECKING, Any, Callable, Iterable
 
 from pytest_databases.helpers import simple_string_hash
@@ -12,6 +13,7 @@ from pytest_databases.helpers import simple_string_hash
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Generator
     from pathlib import Path
+    from types import TracebackType
 
 TRUE_VALUES = {"True", "true", "1", "yes", "Y", "T"}
 
@@ -47,7 +49,7 @@ USE_LEGACY_DOCKER_COMPOSE: bool = os.environ.get("USE_LEGACY_DOCKER_COMPOSE", "F
 COMPOSE_PROJECT_NAME: str = f"pytest-databases-{simple_string_hash(__file__)}"
 
 
-class DockerServiceRegistry:
+class DockerServiceRegistry(AbstractContextManager):
     def __init__(
         self,
         worker_id: str,
@@ -65,6 +67,15 @@ class DockerServiceRegistry:
         )
         self._before_start = list(before_start) if before_start else []
 
+    def __exit__(
+        self,
+        /,
+        __exc_type: type[BaseException] | None,
+        __exc_value: BaseException | None,
+        __traceback: TracebackType | None,
+    ) -> None:
+        self.down()
+
     @staticmethod
     def _get_docker_ip() -> str:
         docker_host = os.environ.get("DOCKER_HOST", "").strip()
@@ -114,4 +125,4 @@ class DockerServiceRegistry:
 
     def down(self) -> None:
         if not SKIP_DOCKER_COMPOSE:
-            self.run_command("down", "-t", "10")
+            self.run_command("down", "-t", "10", "--volumes")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/alloydb_omni.py

@@ -49,11 +49,8 @@ def alloydb_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=alloydb_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=alloydb_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/azure_blob.py

@@ -62,14 +62,11 @@ def azure_blob_docker_services(
     azure_blob_service_startup_delay: int,
     worker_id: str = "main",
 ) -> Generator[DockerServiceRegistry, None, None]:
-    registry = DockerServiceRegistry(
+    with DockerServiceRegistry(
         worker_id,
         compose_project_name=azure_blob_compose_project_name,
-    )
-    try:
+    ) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/bigquery.py

@@ -53,11 +53,8 @@ def bigquery_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=bigquery_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=bigquery_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/cockroachdb.py

@@ -44,11 +44,8 @@ def cockroachdb_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=cockroachdb_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=cockroachdb_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/docker-compose.postgres.yml

@@ -39,6 +39,14 @@ services:
       - "${POSTGRES16_PORT:-5427}:5432" # use a non-standard port here
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-super-secret}
+  postgres17:
+    networks:
+      - default
+    image: postgres:17
+    ports:
+      - "${POSTGRES17_PORT:-5428}:5432" # use a non-standard port here
+    environment:
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-super-secret}
 networks:
   default:
     driver: bridge

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/dragonfly.py

@@ -29,11 +29,8 @@ def dragonfly_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=dragonfly_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=dragonfly_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/elastic_search.py

@@ -51,11 +51,8 @@ def elasticsearch_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=elasticsearch_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=elasticsearch_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/keydb.py

@@ -30,11 +30,8 @@ def keydb_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=keydb_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=keydb_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/mariadb.py

@@ -31,11 +31,8 @@ def mariadb_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=mariadb_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=mariadb_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/mssql.py

@@ -48,11 +48,8 @@ def mssql_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=mssql_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=mssql_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/mysql.py

@@ -53,11 +53,8 @@ def mysql_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=mysql_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=mysql_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/oracle.py

@@ -47,11 +47,8 @@ def oracle_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=oracle_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=oracle_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/postgres.py

@@ -45,11 +45,8 @@ def postgres_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=postgres_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=postgres_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")
@@ -96,15 +93,19 @@ def postgres15_port() -> int:
 def postgres16_port() -> int:
     return 5427
 
+@pytest.fixture(scope="session")
+def postgres17_port() -> int:
+    return 5428
+
 
 @pytest.fixture(scope="session")
 def default_postgres_service_name() -> str:
-    return "postgres16"
+    return "postgres17"
 
 
 @pytest.fixture(scope="session")
-def postgres_port(postgres16_port: int) -> int:
-    return postgres16_port
+def postgres_port(postgres17_port: int) -> int:
+    return postgres17_port
 
 
 @pytest.fixture(scope="session")
@@ -125,7 +126,7 @@ def postgres12_service(
     postgres_database: str,
     postgres_user: str,
     postgres_password: str,
-) -> Generator[DockerServiceRegistry, None, None]:
+) -> DockerServiceRegistry:
     os.environ["POSTGRES_PASSWORD"] = postgres_password
     os.environ["POSTGRES_USER"] = postgres_user
     os.environ["POSTGRES_DATABASE"] = postgres_database
@@ -141,7 +142,7 @@ def postgres12_service(
         user=postgres_user,
         password=postgres_password,
     )
-    yield postgres_docker_services
+    return postgres_docker_services
 
 
 @pytest.fixture(autouse=False, scope="session")
@@ -152,7 +153,7 @@ def postgres13_service(
     postgres_database: str,
     postgres_user: str,
     postgres_password: str,
-) -> Generator[DockerServiceRegistry, None, None]:
+) -> DockerServiceRegistry:
     os.environ["POSTGRES_PASSWORD"] = postgres_password
     os.environ["POSTGRES_USER"] = postgres_user
     os.environ["POSTGRES_DATABASE"] = postgres_database
@@ -168,7 +169,7 @@ def postgres13_service(
         user=postgres_user,
         password=postgres_password,
     )
-    yield postgres_docker_services
+    return postgres_docker_services
 
 
 @pytest.fixture(autouse=False, scope="session")
@@ -179,7 +180,7 @@ def postgres14_service(
     postgres_database: str,
     postgres_user: str,
     postgres_password: str,
-) -> Generator[DockerServiceRegistry, None, None]:
+) -> DockerServiceRegistry:
     os.environ["POSTGRES_PASSWORD"] = postgres_password
     os.environ["POSTGRES_USER"] = postgres_user
     os.environ["POSTGRES_DATABASE"] = postgres_database
@@ -195,7 +196,7 @@ def postgres14_service(
         user=postgres_user,
         password=postgres_password,
     )
-    yield postgres_docker_services
+    return postgres_docker_services
 
 
 @pytest.fixture(autouse=False, scope="session")
@@ -206,7 +207,7 @@ def postgres15_service(
     postgres_database: str,
     postgres_user: str,
     postgres_password: str,
-) -> Generator[DockerServiceRegistry, None, None]:
+) -> DockerServiceRegistry:
     os.environ["POSTGRES_PASSWORD"] = postgres_password
     os.environ["POSTGRES_USER"] = postgres_user
     os.environ["POSTGRES_DATABASE"] = postgres_database
@@ -222,7 +223,7 @@ def postgres15_service(
         user=postgres_user,
         password=postgres_password,
     )
-    yield postgres_docker_services
+    return postgres_docker_services
 
 
 @pytest.fixture(autouse=False, scope="session")
@@ -233,7 +234,7 @@ def postgres16_service(
     postgres_database: str,
     postgres_user: str,
     postgres_password: str,
-) -> Generator[DockerServiceRegistry, None, None]:
+) -> DockerServiceRegistry:
     os.environ["POSTGRES_PASSWORD"] = postgres_password
     os.environ["POSTGRES_USER"] = postgres_user
     os.environ["POSTGRES_DATABASE"] = postgres_database
@@ -249,6 +250,33 @@ def postgres16_service(
         user=postgres_user,
         password=postgres_password,
     )
+    return postgres_docker_services
+
+
+@pytest.fixture(autouse=False, scope="session")
+def postgres17_service(
+    postgres_docker_services: DockerServiceRegistry,
+    postgres_docker_compose_files: list[Path],
+    postgres17_port: int,
+    postgres_database: str,
+    postgres_user: str,
+    postgres_password: str,
+) -> Generator[DockerServiceRegistry, None, None]:
+    os.environ["POSTGRES_PASSWORD"] = postgres_password
+    os.environ["POSTGRES_USER"] = postgres_user
+    os.environ["POSTGRES_DATABASE"] = postgres_database
+    os.environ["POSTGRES17_PORT"] = str(postgres17_port)
+    postgres_docker_services.start(
+        "postgres17",
+        docker_compose_files=postgres_docker_compose_files,
+        timeout=45,
+        pause=1,
+        check=postgres_responsive,
+        port=postgres17_port,
+        database=postgres_database,
+        user=postgres_user,
+        password=postgres_password,
+    )
     yield postgres_docker_services
 
 
@@ -262,7 +290,7 @@ def postgres_service(
     postgres_database: str,
     postgres_user: str,
     postgres_password: str,
-) -> Generator[DockerServiceRegistry, None, None]:
+) -> DockerServiceRegistry:
     os.environ["POSTGRES_PASSWORD"] = postgres_password
     os.environ["POSTGRES_USER"] = postgres_user
     os.environ["POSTGRES_DATABASE"] = postgres_database
@@ -278,7 +306,7 @@ def postgres_service(
         user=postgres_user,
         password=postgres_password,
     )
-    yield postgres_docker_services
+    return postgres_docker_services
 
 
 @pytest.fixture(autouse=False, scope="session")
@@ -301,6 +329,25 @@ def postgres_startup_connection(
     ) as conn:
         yield conn
 
+@pytest.fixture(autouse=False, scope="session")
+def postgres17_startup_connection(
+    postgres17_service: DockerServiceRegistry,
+    postgres_docker_ip: str,
+    postgres17_port: int,
+    postgres_database: str,
+    postgres_user: str,
+    postgres_password: str,
+) -> Generator[psycopg.Connection, None, None]:
+    with psycopg.connect(
+        _make_connection_string(
+            host=postgres_docker_ip,
+            port=postgres17_port,
+            user=postgres_user,
+            password=postgres_password,
+            database=postgres_database,
+        ),
+    ) as conn:
+        yield conn
 
 @pytest.fixture(autouse=False, scope="session")
 def postgres16_startup_connection(

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/redis.py

@@ -41,11 +41,8 @@ def redis_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=redis_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=redis_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/spanner.py

@@ -57,11 +57,8 @@ def spanner_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=spanner_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=spanner_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/src/pytest_databases/docker/valkey.py

@@ -30,11 +30,8 @@ def valkey_docker_services(
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id, compose_project_name=valkey_compose_project_name)
-    try:
+    with DockerServiceRegistry(worker_id, compose_project_name=valkey_compose_project_name) as registry:
         yield registry
-    finally:
-        registry.down()
 
 
 @pytest.fixture(scope="session")

{pytest_databases-0.9.0 → pytest_databases-0.10.0}/tests/docker/test_postgres.py

@@ -21,8 +21,8 @@ def test_postgres_default_config(
     postgres_user: str,
     postgres_password: str,
 ) -> None:
-    assert default_postgres_service_name == "postgres16"
-    assert postgres_port == 5427
+    assert default_postgres_service_name == "postgres17"
+    assert postgres_port == 5428
     assert postgres_database == "postgres"
     assert postgres_user == "postgres"
     assert postgres_password == "super-secret"
@@ -87,6 +87,16 @@ def test_postgres_16_config(
     assert postgres_user == "postgres"
     assert postgres_password == "super-secret"
 
+def test_postgres_17_config(
+    postgres17_port: int,
+    postgres_database: str,
+    postgres_user: str,
+    postgres_password: str,
+) -> None:
+    assert postgres17_port == 5428
+    assert postgres_database == "postgres"
+    assert postgres_user == "postgres"
+    assert postgres_password == "super-secret"
 
 def test_postgres_services(
     postgres_docker_ip: str,
@@ -195,6 +205,29 @@ def test_postgres_16_services(
     )
     assert ping
 
+def test_postgres_17_services(
+    postgres_docker_ip: str,
+    postgres17_service: DockerServiceRegistry,
+    postgres17_port: int,
+    postgres_database: str,
+    postgres_user: str,
+    postgres_password: str,
+) -> None:
+    ping = postgres_responsive(
+        postgres_docker_ip,
+        port=postgres17_port,
+        database=postgres_database,
+        user=postgres_user,
+        password=postgres_password,
+    )
+    assert ping
+
+def test_postgres_17_services_after_start(
+    postgres17_startup_connection: psycopg.Connection,
+) -> None:
+    postgres17_startup_connection.execute("CREATE TABLE if not exists simple_table as SELECT 1")
+    result = postgres17_startup_connection.execute("select * from simple_table").fetchone()
+    assert bool(result is not None and result[0] == 1)
 
 def test_postgres_16_services_after_start(
     postgres16_startup_connection: psycopg.Connection,