pytest-databases 0.2.2__tar.gz → 0.2.4__tar.gz

{pytest_databases-0.2.2 → pytest_databases-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-databases
-Version: 0.2.2
+Version: 0.2.4
 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

{pytest_databases-0.2.2 → pytest_databases-0.2.4}/pyproject.toml

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

{pytest_databases-0.2.2 → pytest_databases-0.2.4}/src/pytest_databases/docker/__init__.py

@@ -34,7 +34,7 @@ from typing import TYPE_CHECKING, Any, Callable
 
 import pytest
 
-from pytest_databases.helpers import wrap_sync
+from pytest_databases.helpers import simple_string_hash, wrap_sync
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Generator
@@ -70,17 +70,18 @@ SKIP_DOCKER_COMPOSE: bool = bool(os.environ.get("SKIP_DOCKER_COMPOSE", False))
 USE_LEGACY_DOCKER_COMPOSE: bool = bool(
     os.environ.get("USE_LEGACY_DOCKER_COMPOSE", os.getenv("GITHUB_ACTIONS") != "true")
 )
+COMPOSE_PROJECT_NAME: str = f"pytest-databases-{simple_string_hash(__file__)}"
 
 
 class DockerServiceRegistry:
-    def __init__(self, worker_id: str) -> None:
+    def __init__(self, worker_id: str, compose_project_name: str = COMPOSE_PROJECT_NAME) -> None:
         self._running_services: set[str] = set()
         self.docker_ip = self._get_docker_ip()
         self._base_command = ["docker-compose"] if USE_LEGACY_DOCKER_COMPOSE else ["docker", "compose"]
         self._base_command.extend(
             [
                 f"--file={Path(__file__).parent / 'docker-compose.yml'}",
-                f"--project-name=pytest-databases-{worker_id}",
+                f"--project-name={compose_project_name}-{worker_id}",
             ],
         )
 
@@ -132,11 +133,16 @@ class DockerServiceRegistry:
 
 
 @pytest.fixture(scope="session")
-def docker_services(worker_id: str = "main") -> Generator[DockerServiceRegistry, None, None]:
+def compose_project_name() -> str:
+    return os.environ.get("COMPOSE_PROJECT_NAME", COMPOSE_PROJECT_NAME)
+
+
+@pytest.fixture(scope="session")
+def docker_services(compose_project_name: str, worker_id: str = "main") -> Generator[DockerServiceRegistry, None, None]:
     if os.getenv("GITHUB_ACTIONS") == "true" and sys.platform != "linux":
         pytest.skip("Docker not available on this platform")
 
-    registry = DockerServiceRegistry(worker_id)
+    registry = DockerServiceRegistry(worker_id, compose_project_name=compose_project_name)
     try:
         yield registry
     finally:

{pytest_databases-0.2.2 → pytest_databases-0.2.4}/src/pytest_databases/docker/docker-compose.yml

@@ -4,52 +4,52 @@ services:
       - default
     image: postgres:12
     ports:
-      - "${POSTGRES12_PORT}:5432" # use a non-standard port here
+      - "${POSTGRES12_PORT:-5423}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-super-secret}
   postgres13:
     networks:
       - default
     image: postgres:13
     ports:
-      - "${POSTGRES13_PORT}:5432" # use a non-standard port here
+      - "${POSTGRES13_PORT:-5424}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-super-secret}
   postgres14:
     networks:
       - default
     image: postgres:14
     ports:
-      - "${POSTGRES14_PORT}:5432" # use a non-standard port here
+      - "${POSTGRES14_PORT:-5425}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-super-secret}
   postgres15:
     networks:
       - default
     image: postgres:15
     ports:
-      - "${POSTGRES15_PORT}:5432" # use a non-standard port here
+      - "${POSTGRES15_PORT:-5426}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-super-secret}
   postgres16:
     networks:
       - default
     image: postgres:16
     ports:
-      - "${POSTGRES16_PORT}:5432" # use a non-standard port here
+      - "${POSTGRES16_PORT:-5427}:5432" # use a non-standard port here
     environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-super-secret}
   mariadb113:
     networks:
       - default
     image: mariadb:11.3
     ports:
-      - "${MARIADB113_PORT}:3306" # use a non-standard port here
+      - "${MARIADB113_PORT:-3359}:3306" # use a non-standard port here
     environment:
-      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
-      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
-      MARIADB_USER: ${MARIADB_USER}
-      MARIADB_DATABASE: ${MARIADB_DATABASE}
+      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD:-super-secret}
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD:-super-secret}
+      MARIADB_USER: ${MARIADB_USER:-app}
+      MARIADB_DATABASE: ${MARIADB_DATABASE:-db}
       MARIADB_ROOT_HOST: "%"
       LANG: C.UTF-8
   mysql8:
@@ -57,12 +57,12 @@ services:
       - default
     image: mysql:latest
     ports:
-      - "${MYSQL8_PORT}:3306" # use a non-standard port here
+      - "${MYSQL8_PORT:-3360}:3306" # use a non-standard port here
     environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-super-secret}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-super-secret}
+      MYSQL_USER: ${MYSQL_USER:-app}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-db}
       MYSQL_ROOT_HOST: "%"
       LANG: C.UTF-8
   mysql57:
@@ -70,12 +70,12 @@ services:
       - default
     image: mysql:5.7
     ports:
-      - "${MYSQL57_PORT}:3306" # use a non-standard port here
+      - "${MYSQL57_PORT:-3362}:3306" # use a non-standard port here
     environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-super-secret}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-super-secret}
+      MYSQL_USER: ${MYSQL_USER:-app}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-db}
       MYSQL_ROOT_HOST: "%"
       LANG: C.UTF-8
   mysql56:
@@ -83,12 +83,12 @@ services:
       - default
     image: mysql:5.6
     ports:
-      - "${MYSQL56_PORT}:3306" # use a non-standard port here
+      - "${MYSQL56_PORT:-3363}:3306" # use a non-standard port here
     environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-super-secret}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-super-secret}
+      MYSQL_USER: ${MYSQL_USER:-app}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-db}
       MYSQL_ROOT_HOST: "%"
       LANG: C.UTF-8
   oracle18c:
@@ -96,21 +96,21 @@ services:
       - default
     image: gvenzl/oracle-xe:18-slim-faststart
     ports:
-      - "${ORACLE18C_PORT}:1521" # use a non-standard port here
+      - "${ORACLE18C_PORT:-1514}:1521" # use a non-standard port here
     environment:
-      ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD}
-      APP_USER_PASSWORD: ${ORACLE_PASSWORD}
-      APP_USER: ${ORACLE_USER}
+      ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD:-super-secret}
+      APP_USER_PASSWORD: ${ORACLE_PASSWORD:-super-secret}
+      APP_USER: ${ORACLE_USER:-app}
   oracle23c:
     networks:
       - default
     image: gvenzl/oracle-free:23-slim-faststart
     ports:
-      - "${ORACLE23C_PORT}:1521" # use a non-standard port here
+      - "${ORACLE23C_PORT:-1513}:1521" # use a non-standard port here
     environment:
-      ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD}
-      APP_USER_PASSWORD: ${ORACLE_PASSWORD}
-      APP_USER: ${ORACLE_USER}
+      ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD:-super-secret}
+      APP_USER_PASSWORD: ${ORACLE_PASSWORD:-super-secret}
+      APP_USER: ${ORACLE_USER:-app}
   mssql2022:
     networks:
       - default
@@ -125,7 +125,7 @@ services:
   spanner:
     image: gcr.io/cloud-spanner-emulator/emulator:latest
     ports:
-      - "${SPANNER_PORT}:9010"
+      - "${SPANNER_PORT:-9010}:9010"
   # Init (Create Instance)
   spanner_init:
     image: gcr.io/google.com/cloudsdktool/cloud-sdk:332.0.0-slim
@@ -136,9 +136,9 @@ services:
               gcloud config set auth/disable_credentials true &&
               gcloud spanner instances create $${INSTANCE_NAME} --config=emulator-config --description=Emulator --nodes=1'
     environment:
-      PROJECT_ID: ${GOOGLE_CLOUD_PROJECT}
-      INSTANCE_NAME: ${SPANNER_INSTANCE}
-      DATABASE_NAME: ${SPANNER_DATABASE}
+      PROJECT_ID: ${GOOGLE_CLOUD_PROJECT:-emulator-test-project}
+      INSTANCE_NAME: ${SPANNER_INSTANCE:-test-instance}
+      DATABASE_NAME: ${SPANNER_DATABASE:-test-database}
     depends_on:
       - spanner
   cockroachdb:
@@ -147,9 +147,9 @@ services:
     restart: "no"
     expose:
       - "8080"
-      - "${COCKROACHDB_PORT}"
+      - "${COCKROACHDB_PORT:-26257}"
     ports:
-      - "${COCKROACHDB_PORT}:26257"
+      - "${COCKROACHDB_PORT:-26257}:26257"
       - "8880:8080"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/health?ready=1"]
@@ -159,17 +159,17 @@ services:
   redis:
     image: redis
     ports:
-      - "${REDIS_PORT}:6379"
+      - "${REDIS_PORT:-6397}:6379"
   keydb:
     image: eqalpha/keydb
     ports:
-      - "${KEYDB_PORT}:6379"
+      - "${KEYDB_PORT:-6396}:6379"
   dragonfly:
     image: "docker.dragonflydb.io/dragonflydb/dragonfly"
     ulimits:
       memlock: -1
     ports:
-      - "${DRAGONFLY_PORT}:6379"
+      - "${DRAGONFLY_PORT:-6398}:6379"
     # For better performance, consider `host` mode instead `port` to avoid docker NAT.
     # `host` mode is NOT currently supported in Swarm Mode.
     # https://docs.docker.com/compose/compose-file/compose-file-v3/#network_mode

{pytest_databases-0.2.2 → pytest_databases-0.2.4}/src/pytest_databases/helpers.py

@@ -23,6 +23,7 @@
 
 from __future__ import annotations
 
+import hashlib
 import inspect
 from contextlib import AbstractAsyncContextManager, AbstractContextManager
 from functools import partial
@@ -81,3 +82,21 @@ def wrap_sync(fn: Callable[P, T]) -> Callable[P, Awaitable[T]]:
         return await anyio.to_thread.run_sync(partial(fn, *args, **kwargs))
 
     return wrapped
+
+
+def simple_string_hash(string_to_hash: str) -> str:
+    """Generates a short hash based on a string.
+
+    Args:
+      string_to_hash: The string to hash.
+
+    Returns:
+      A short hash string.
+    """
+
+    string_bytes = string_to_hash.encode("utf-8")
+    hasher = hashlib.sha256()
+    hasher.update(string_bytes)
+    digest = hasher.digest()
+    hex_string = digest.hex()
+    return hex_string[:12]