feat: valkey support & startup_connection fixture (#42)

Author: cofin

Makefile

@@ -20,25 +20,20 @@ help:  ## Display this help
 # =============================================================================
 # Developer Utils
 # =============================================================================
-install-pipx: 										## Install pipx
-	@python3 -m pip install --upgrade --user pipx
-
-install-hatch: 										## Install Hatch, UV, and Ruff
-	@pipx install hatch --force
-	@pipx inject hatch ruff uv hatch-pip-compile hatch-vcs hatch-mypyc mypy --include-deps --include-apps --force
+install-hatch: 										## Install Hatch
+	@sh ./scripts/install-hatch.sh
 
 configure-hatch: 										## Configure Hatch defaults
 	@hatch config set dirs.env.virtual .direnv
 	@hatch config set dirs.env.pip-compile .direnv
 
 upgrade-hatch: 										## Update Hatch, UV, and Ruff
-	@pipx upgrade hatch --include-injected
+	@hatch self update
 
 install: 										## Install the project and all dependencies
 	@if [ "$(VENV_EXISTS)" ]; then echo "=> Removing existing virtual environment"; $(MAKE) destroy-venv; fi
 	@$(MAKE) clean
-	@if ! pipx --version > /dev/null; then echo '=> Installing `pipx`'; $(MAKE) install-pipx ; fi
-	@if ! hatch --version > /dev/null; then echo '=> Installing `hatch` with `pipx`'; $(MAKE) install-hatch ; fi
+	@if ! hatch --version > /dev/null; then echo '=> Installing `hatch` with standalone installation'; $(MAKE) install-hatch ; fi
 	@if ! hatch-pip-compile --version > /dev/null; then echo '=> Updating `hatch` and installing plugins'; $(MAKE) upgrade-hatch ; fi
 	@echo "=> Creating Python environments..."
 	@$(MAKE) configure-hatch

pyproject.toml

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

scripts/install-hatch.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# --- Constants ---
+BASE_URL="https://github.com/pypa/hatch/releases/latest/download"
+EXTRACT_CMD="tar -xzf"
+
+# --- Handle Optional Installation Directory ---
+INSTALL_DIR="$1"  # Default: current directory
+if [[ -n "$INSTALL_DIR" ]]; then
+    if [[ ! -d "$INSTALL_DIR" ]]; then  # Check if directory exists
+        INSTALL_DIR="$HOME/.local/bin"
+        echo "Error: Invalid install directory '$INSTALL_DIR'"
+        exit 1
+    fi
+    INSTALL_DIR=$(realpath "$INSTALL_DIR")  # Get absolute path
+fi
+
+# --- Determine Platform ---
+PLATFORM=$(uname -s)
+MACHINE=$(uname -m)
+FILE_EXT="tar.gz"
+
+if [[ $PLATFORM == "Darwin" ]]; then
+    PLATFORM_NAME="apple-darwin"
+elif [[ $PLATFORM == "Linux" ]]; then
+    PLATFORM_NAME="unknown-linux-gnu"
+    if [[ $MACHINE == "aarch64" ]]; then
+        MACHINE="aarch64"
+    fi
+elif [[ $PLATFORM == "Windows" ]]; then
+    PLATFORM_NAME="pc-windows-msvc"
+    FILE_EXT="zip"
+    EXTRACT_CMD="unzip"
+else
+    echo "Unsupported platform: $PLATFORM"
+    exit 1
+fi
+
+# --- Construct File Name and URL ---
+FILENAME="hatch-$MACHINE-$PLATFORM_NAME.$FILE_EXT"
+URL="$BASE_URL/$FILENAME"
+
+# --- Download and Extract ---
+echo "Downloading Hatch binary: $FILENAME"
+curl -L -o "$FILENAME" "$URL"
+
+echo "Extracting to '$INSTALL_DIR'..."
+$EXTRACT_CMD "$FILENAME" -C "$INSTALL_DIR"  # Extract to install directory
+rm "$FILENAME"  # Remove archive
+
+HATCH_BINARY="$INSTALL_DIR/hatch"  # Path to the extracted binary
+if [[ -x "$HATCH_BINARY" ]]; then
+    echo "Hatch binary successfully installed at '$HATCH_BINARY'"
+else
+    echo "Error: Hatch binary not found or not executable."
+fi

src/pytest_databases/docker/alloydb_omni.py

@@ -118,3 +118,25 @@ async def alloydb_omni_service(
         password=postgres_password,
     )
     yield
+
+
+@pytest.fixture(autouse=False, scope="session")
+async def alloydb_omni_startup_connection(
+    alloydb_omni_service: DockerServiceRegistry,
+    alloydb_docker_ip: str,
+    alloydb_omni_port: int,
+    postgres_database: str,
+    postgres_user: str,
+    postgres_password: str,
+) -> AsyncGenerator[asyncpg.Connection[asyncpg.Record], None]:
+    conn = await asyncpg.connect(
+        host=alloydb_docker_ip,
+        port=alloydb_omni_port,
+        user=postgres_user,
+        database=postgres_database,
+        password=postgres_password,
+    )
+    try:
+        yield conn
+    finally:
+        await conn.close()

src/pytest_databases/docker/bigquery.py

@@ -140,3 +140,15 @@ async def bigquery_service(
         bigquery_client_options=bigquery_client_options,
     )
     yield
+
+
+@pytest.fixture(autouse=False, scope="session")
+async def bigquery_startup_connection(
+    bigquery_service: DockerServiceRegistry,
+    bigquery_project: str,
+    bigquery_credentials: Credentials,
+    bigquery_client_options: ClientOptions,
+) -> AsyncGenerator[bigquery.Client, None]:
+    yield bigquery.Client(
+        project=bigquery_project, client_options=bigquery_client_options, credentials=bigquery_credentials
+    )

src/pytest_databases/docker/cockroachdb.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, AsyncGenerator
 
-import psycopg
+import asyncpg
 import pytest
 
 from pytest_databases.docker import DockerServiceRegistry
@@ -21,13 +21,16 @@
 async def cockroachdb_responsive(host: str, port: int, database: str, driver_opts: dict[str, str]) -> bool:
     opts = "&".join(f"{k}={v}" for k, v in driver_opts.items()) if driver_opts else ""
     try:
-        with psycopg.connect(f"postgresql://root@{host}:{port}/{database}?{opts}") as conn, conn.cursor() as cursor:
-            cursor.execute("select 1 as is_available")
-            resp = cursor.fetchone()
-            return resp[0] if resp is not None else 0 == 1  # noqa: PLR0133
+        conn = await asyncpg.connect(f"postgresql://root@{host}:{port}/{database}?{opts}")
     except Exception:  # noqa: BLE001
         return False
 
+    try:
+        db_open = await conn.fetchrow("SELECT 1")
+        return bool(db_open is not None and db_open[0] == 1)
+    finally:
+        await conn.close()
+
 
 @pytest.fixture(scope="session")
 def cockroachdb_compose_project_name() -> str:
@@ -100,3 +103,21 @@ async def cockroachdb_service(
         driver_opts=cockroachdb_driver_opts,
     )
     yield
+
+
+@pytest.fixture(autouse=False, scope="session")
+async def cockroachdb_startup_connection(
+    cockroachdb_service: DockerServiceRegistry,
+    cockroachdb_docker_ip: str,
+    cockroachdb_port: int,
+    cockroachdb_database: str,
+    cockroachdb_driver_opts: dict[str, str],
+) -> AsyncGenerator[asyncpg.Connection[asyncpg.Record], None]:
+    opts = "&".join(f"{k}={v}" for k, v in cockroachdb_driver_opts.items()) if cockroachdb_driver_opts else ""
+    conn = await asyncpg.connect(
+        f"postgresql://root@{cockroachdb_docker_ip}:{cockroachdb_port}/{cockroachdb_database}?{opts}"
+    )
+    try:
+        yield conn
+    finally:
+        await conn.close()

src/pytest_databases/docker/docker-compose.cockroachdb.yml

@@ -1,14 +1,16 @@
 services:
   cockroachdb:
-    image: cockroachdb/cockroach:latest-v23.1
-    command: start-single-node --insecure
+    image: cockroachdb/cockroach:latest
+    command: start-single-node --insecure --http-addr=cockroachdb:8080
     restart: "no"
     expose:
       - "8080"
       - "${COCKROACHDB_PORT:-26257}"
     ports:
       - "${COCKROACHDB_PORT:-26257}:26257"
-      - "8880:8080"
+      - "${COCKROACHDB_WEB_PORT:-8880}:8080"
+    volumes:
+      - cockroach-data:/cockroach/cockroach-data/
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/health?ready=1"]
       interval: 3s
@@ -17,3 +19,5 @@ services:
 networks:
   default:
     driver: bridge
+volumes:
+  cockroach-data:

src/pytest_databases/docker/docker-compose.valkey.yml

@@ -0,0 +1,8 @@
+services:
+  valkey:
+    image: valkey/valkey
+    ports:
+      - "${VALKEY_PORT:-6308}:6379"
+networks:
+  default:
+    driver: bridge

src/pytest_databases/docker/mariadb.py

@@ -4,7 +4,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, AsyncGenerator
+from typing import TYPE_CHECKING, Any, AsyncGenerator
 
 import asyncmy
 import pytest
@@ -162,3 +162,41 @@ async def mariadb_service(
         password=mariadb_password,
     )
     yield
+
+
+@pytest.fixture(autouse=False, scope="session")
+async def mariadb_startup_connection(
+    mariadb_service: DockerServiceRegistry,
+    mariadb_docker_ip: str,
+    mariadb_port: int,
+    mariadb_database: str,
+    mariadb_user: str,
+    mariadb_password: str,
+) -> AsyncGenerator[Any, None]:
+    conn = await asyncmy.connect(
+        host=mariadb_docker_ip,
+        port=mariadb_port,
+        user=mariadb_user,
+        database=mariadb_database,
+        password=mariadb_password,
+    )
+    yield conn
+
+
+@pytest.fixture(autouse=False, scope="session")
+async def mariadb113_startup_connection(
+    mariadb113_service: DockerServiceRegistry,
+    mariadb_docker_ip: str,
+    mariadb113_port: int,
+    mariadb_database: str,
+    mariadb_user: str,
+    mariadb_password: str,
+) -> AsyncGenerator[Any, None]:
+    conn = await asyncmy.connect(
+        host=mariadb_docker_ip,
+        port=mariadb113_port,
+        user=mariadb_user,
+        database=mariadb_database,
+        password=mariadb_password,
+    )
+    yield conn

src/pytest_databases/docker/mssql.py

@@ -93,6 +93,20 @@ def mssql_docker_ip(mssql_docker_services: DockerServiceRegistry) -> str:
     return mssql_docker_services.docker_ip
 
 
+@pytest.fixture(scope="session")
+def mssql_connection_string(
+    mssql_docker_ip: str, mssql_port: int, mssql_database: str, mssql_user: str, mssql_password: str
+) -> str:
+    return f"encrypt=no; TrustServerCertificate=yes; driver={{ODBC Driver 18 for SQL Server}}; server={mssql_docker_ip},{mssql_port}; database={mssql_database}; UID={mssql_user}; PWD={mssql_password}"
+
+
+@pytest.fixture(scope="session")
+def mssql2022_connection_string(
+    mssql_docker_ip: str, mssql2022_port: int, mssql_database: str, mssql_user: str, mssql_password: str
+) -> str:
+    return f"encrypt=no; TrustServerCertificate=yes; driver={{ODBC Driver 18 for SQL Server}}; server={mssql_docker_ip},{mssql2022_port}; database={mssql_database}; UID={mssql_user}; PWD={mssql_password}"
+
+
 @pytest.fixture(autouse=False, scope="session")
 async def mssql2022_service(
     mssql_docker_services: DockerServiceRegistry,
@@ -102,19 +116,19 @@ async def mssql2022_service(
     mssql_database: str,
     mssql_user: str,
     mssql_password: str,
+    mssql2022_connection_string: str,
 ) -> AsyncGenerator[None, None]:
     os.environ["MSSQL_PASSWORD"] = mssql_password
     os.environ["MSSQL_USER"] = mssql_user
     os.environ["MSSQL_DATABASE"] = mssql_database
     os.environ["MSSQL2022_PORT"] = str(mssql2022_port)
-    connstring = f"encrypt=no; TrustServerCertificate=yes; driver={{ODBC Driver 18 for SQL Server}}; server={mssql_docker_ip},{mssql2022_port}; database={mssql_database}; UID={mssql_user}; PWD={mssql_password}"
     await mssql_docker_services.start(
         "mssql2022",
         docker_compose_files=mssql_docker_compose_files,
         timeout=120,
         pause=1,
         check=mssql_responsive,
-        connstring=connstring,
+        connstring=mssql2022_connection_string,
     )
     yield
 
@@ -129,8 +143,8 @@ async def mssql_service(
     mssql_database: str,
     mssql_user: str,
     mssql_password: str,
+    mssql_connection_string: str,
 ) -> AsyncGenerator[None, None]:
-    connstring = f"encrypt=no; TrustServerCertificate=yes; driver={{ODBC Driver 18 for SQL Server}}; server={mssql_docker_ip},{mssql_port}; database={mssql_database}; UID={mssql_user}; PWD={mssql_password}"
     os.environ["MSSQL_PASSWORD"] = mssql_password
     os.environ["MSSQL_USER"] = mssql_user
     os.environ["MSSQL_DATABASE"] = mssql_database
@@ -141,6 +155,28 @@ async def mssql_service(
         timeout=120,
         pause=1,
         check=mssql_responsive,
-        connstring=connstring,
+        connstring=mssql_connection_string,
     )
     yield
+
+
+@pytest.fixture(autouse=False, scope="session")
+async def mssql_startup_connection(
+    mssql_service: DockerServiceRegistry, mssql_connection_string: str
+) -> AsyncGenerator[aioodbc.Connection, None]:
+    async with await aioodbc.connect(
+        dsn=mssql_connection_string,
+        timeout=2,
+    ) as db_connection:
+        yield db_connection
+
+
+@pytest.fixture(autouse=False, scope="session")
+async def mssql2022_startup_connection(
+    mssql2022_service: DockerServiceRegistry, mssql2022_connection_string: str
+) -> AsyncGenerator[aioodbc.Connection, None]:
+    async with await aioodbc.connect(
+        dsn=mssql2022_connection_string,
+        timeout=2,
+    ) as db_connection:
+        yield db_connection