pytest-databases 0.7.1__tar.gz → 0.8.0__tar.gz

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
 
   # Ruff replaces black, flake8, autoflake and isort
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.4.5" # make sure this is always consistent with hatch configs
+    rev: "v0.5.6" # make sure this is always consistent with hatch configs
     hooks:
       - id: ruff
         args: [--config, ./pyproject.toml]

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-databases
-Version: 0.7.1
+Version: 0.8.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

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/pyproject.toml

@@ -12,7 +12,7 @@ license = "MIT"
 name = "pytest-databases"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.7.1"
+version = "0.8.0"
 #
 authors = [{ name = "Cody Fincher", email = "cody.fincher@gmail.com" }]
 keywords = [
@@ -67,12 +67,15 @@ redis = ["redis"]
 spanner = ["google-cloud-spanner"]
 sqlite = ["aiosqlite"]
 
+
 ######################
 # Build & Versioning #
 ######################
 [tool.hatch.build.targets.sdist]
 exclude = ["/.github", "/docs"]
 
+[tool.hatch.metadata]
+allow-direct-references = true
 
 #####################
 # Environment Setup #
@@ -81,6 +84,41 @@ exclude = ["/.github", "/docs"]
 
 # Default environment with production dependencies
 [tool.hatch.envs.default]
+extra-dependencies = [
+  # tests
+  "anyio",
+  "coverage[toml]>=6.2",
+  "coverage[toml]>=6.2",
+  "pytest",
+  "pytest-cov",
+  "pytest-mock",
+  "pytest-vcr",
+  "pytest-sugar",
+  "pytest-click",
+  "pytest-xdist",
+  # lint
+  "mypy",
+  "ruff",
+  "pylint",
+  "pre-commit",
+  "types-click",
+  "types-six",
+  "types-decorator",
+  "types-pyyaml",
+  "asyncpg-stubs",
+  "types-docutils",
+  "types-redis",
+  # docs
+  "sphinx>=7.1.2",
+  "sphinx-autobuild>=2021.3.14",
+  "sphinx-copybutton>=0.5.2",
+  "litestar-sphinx-theme @ git+https://github.com/litestar-org/litestar-sphinx-theme.git",
+  "sphinx-click>=5.0.1",
+  "sphinx-toolbox>=3.5.0",
+  "sphinx-design>=0.5.0",
+  "sphinxcontrib-mermaid>=0.9.2",
+  "auto-pytabs[sphinx]>=0.4.0",
+]
 installer = "uv"
 python = "3.12"
 
@@ -88,9 +126,10 @@ python = "3.12"
 # Test environment with test-only dependencies
 [tool.hatch.envs.test]
 extra-dependencies = [
-  "cython",
+  # tests
   "anyio",
   "coverage[toml]>=6.2",
+  "coverage[toml]>=6.2",
   "pytest",
   "pytest-cov",
   "pytest-mock",
@@ -98,6 +137,28 @@ extra-dependencies = [
   "pytest-sugar",
   "pytest-click",
   "pytest-xdist",
+  # lint
+  "mypy",
+  "ruff",
+  "pylint",
+  "pre-commit",
+  "types-click",
+  "types-six",
+  "types-decorator",
+  "types-pyyaml",
+  "asyncpg-stubs",
+  "types-docutils",
+  "types-redis",
+  # docs
+  "sphinx>=7.1.2",
+  "sphinx-autobuild>=2021.3.14",
+  "sphinx-copybutton>=0.5.2",
+  "litestar-sphinx-theme @ git+https://github.com/litestar-org/litestar-sphinx-theme.git",
+  "sphinx-click>=5.0.1",
+  "sphinx-toolbox>=3.5.0",
+  "sphinx-design>=0.5.0",
+  "sphinxcontrib-mermaid>=0.9.2",
+  "auto-pytabs[sphinx]>=0.4.0",
 ]
 features = [
   "oracle",
@@ -135,11 +196,9 @@ no-cov = "cov --no-cov"
 [tool.hatch.envs.docs]
 extra-dependencies = [
   # tests
-  "nodeenv",
-  # required test dependencies
-  "cython",
   "anyio",
   "coverage[toml]>=6.2",
+  "coverage[toml]>=6.2",
   "pytest",
   "pytest-cov",
   "pytest-mock",
@@ -147,7 +206,19 @@ extra-dependencies = [
   "pytest-sugar",
   "pytest-click",
   "pytest-xdist",
-  # Plugins
+  # lint
+  "mypy",
+  "ruff",
+  "pylint",
+  "pre-commit",
+  "types-click",
+  "types-six",
+  "types-decorator",
+  "types-pyyaml",
+  "asyncpg-stubs",
+  "types-docutils",
+  "types-redis",
+  # docs
   "sphinx>=7.1.2",
   "sphinx-autobuild>=2021.3.14",
   "sphinx-copybutton>=0.5.2",
@@ -190,11 +261,9 @@ build-check = ["build", "validate"]
 [tool.hatch.envs.local]
 extra-dependencies = [
   # tests
-  "nodeenv",
-  # required test dependencies
-  "cython",
   "anyio",
   "coverage[toml]>=6.2",
+  "coverage[toml]>=6.2",
   "pytest",
   "pytest-cov",
   "pytest-mock",
@@ -202,21 +271,7 @@ extra-dependencies = [
   "pytest-sugar",
   "pytest-click",
   "pytest-xdist",
-  # Plugins
-  "sphinx>=7.1.2",
-  "sphinx-autobuild>=2021.3.14",
-  "sphinx-copybutton>=0.5.2",
-  "litestar-sphinx-theme @ git+https://github.com/litestar-org/litestar-sphinx-theme.git",
-  "sphinx-click>=5.0.1",
-  "sphinx-toolbox>=3.5.0",
-  "sphinx-design>=0.5.0",
-  "sphinxcontrib-mermaid>=0.9.2",
-  "auto-pytabs[sphinx]>=0.4.0",
-  # cli databasae brwoser
-  "harlequin",
-  # linting
-  "cython",
-  "anyio",
+  # lint
   "mypy",
   "ruff",
   "pylint",
@@ -228,6 +283,16 @@ extra-dependencies = [
   "asyncpg-stubs",
   "types-docutils",
   "types-redis",
+  # docs
+  "sphinx>=7.1.2",
+  "sphinx-autobuild>=2021.3.14",
+  "sphinx-copybutton>=0.5.2",
+  "litestar-sphinx-theme @ git+https://github.com/litestar-org/litestar-sphinx-theme.git",
+  "sphinx-click>=5.0.1",
+  "sphinx-toolbox>=3.5.0",
+  "sphinx-design>=0.5.0",
+  "sphinxcontrib-mermaid>=0.9.2",
+  "auto-pytabs[sphinx]>=0.4.0",
 ]
 features = [
   "oracle",
@@ -249,11 +314,19 @@ type = "virtual"
 
 # Lint environment
 [tool.hatch.envs.lint]
-detached = true
 extra-dependencies = [
-  "pyyaml>=6",
-  "cython",
+  # tests
   "anyio",
+  "coverage[toml]>=6.2",
+  "coverage[toml]>=6.2",
+  "pytest",
+  "pytest-cov",
+  "pytest-mock",
+  "pytest-vcr",
+  "pytest-sugar",
+  "pytest-click",
+  "pytest-xdist",
+  # lint
   "mypy",
   "ruff",
   "pylint",
@@ -265,21 +338,18 @@ extra-dependencies = [
   "asyncpg-stubs",
   "types-docutils",
   "types-redis",
+  # docs
+  "sphinx>=7.1.2",
+  "sphinx-autobuild>=2021.3.14",
+  "sphinx-copybutton>=0.5.2",
+  "litestar-sphinx-theme @ git+https://github.com/litestar-org/litestar-sphinx-theme.git",
+  "sphinx-click>=5.0.1",
+  "sphinx-toolbox>=3.5.0",
+  "sphinx-design>=0.5.0",
+  "sphinxcontrib-mermaid>=0.9.2",
+  "auto-pytabs[sphinx]>=0.4.0",
 ]
-features = [
-  "oracle",
-  "mysql",
-  "mssql",
-  "postgres",
-  "spanner",
-  "cockroachdb",
-  "redis",
-  "elasticsearch7",
-  "elasticsearch8",
-  "bigquery",
-]
-python = "3.11"
-template = "docs"
+python = "3.12"
 type = "virtual"
 
 [tool.hatch.envs.lint.scripts]
@@ -515,6 +585,10 @@ lint.ignore = [
   "COM812",
   "PLR0917",
   "CPY001",  # copywrite check
+  "DOC201",  # `return` is not documented in docstring
+  "DOC501",  # Raised exception missing from docstring
+  "DOC502",  # Raised exception missing from docstring
+  "A005",    # module shadows builtin
 ]
 lint.select = ["ALL"]
 # Allow unused variables when underscore-prefixed.

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/src/pytest_databases/docker/__init__.py

@@ -4,22 +4,21 @@ import asyncio
 import os
 import re
 import subprocess  # noqa: S404
-import sys
 import timeit
 from typing import TYPE_CHECKING, Any, Callable, Iterable
 
-import pytest
-
 from pytest_databases.helpers import simple_string_hash, wrap_sync
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Generator
     from pathlib import Path
 
+TRUE_VALUES = {"True", "true", "1", "yes", "Y", "T"}
+
 
 async def wait_until_responsive(
     check: Callable[..., Awaitable],
-    timeout: float,
+    timeout: float,  # noqa: ASYNC109
     pause: float,
     **kwargs: Any,
 ) -> None:
@@ -43,8 +42,8 @@ async def wait_until_responsive(
     raise RuntimeError(msg)
 
 
-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", False))
+SKIP_DOCKER_COMPOSE: bool = os.environ.get("SKIP_DOCKER_COMPOSE", "False") in TRUE_VALUES
+USE_LEGACY_DOCKER_COMPOSE: bool = os.environ.get("USE_LEGACY_DOCKER_COMPOSE", "False") in TRUE_VALUES
 COMPOSE_PROJECT_NAME: str = f"pytest-databases-{simple_string_hash(__file__)}"
 
 
@@ -88,7 +87,7 @@ class DockerServiceRegistry:
         docker_compose_files: list[Path],
         *,
         check: Callable[..., Any],
-        timeout: float = 30,
+        timeout: float = 30,  # noqa: ASYNC109
         pause: float = 0.1,
         **kwargs: Any,
     ) -> None:

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/src/pytest_databases/docker/docker-compose.oracle.yml

@@ -9,12 +9,12 @@ services:
       ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD:-super-secret}
       APP_USER_PASSWORD: ${ORACLE_PASSWORD:-super-secret}
       APP_USER: ${ORACLE_USER:-app}
-  oracle23c:
+  oracle23ai:
     networks:
       - default
     image: gvenzl/oracle-free:23-slim-faststart
     ports:
-      - "${ORACLE23C_PORT:-1513}:1521" # use a non-standard port here
+      - "${ORACLE23AI_PORT:-1513}:1521" # use a non-standard port here
     environment:
       ORACLE_PASSWORD: ${ORACLE_SYSTEM_PASSWORD:-super-secret}
       APP_USER_PASSWORD: ${ORACLE_PASSWORD:-super-secret}

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/src/pytest_databases/docker/oracle.py

@@ -75,13 +75,13 @@ def oracle18c_service_name() -> str:
 
 
 @pytest.fixture(scope="session")
-def oracle23c_service_name() -> str:
+def oracle23ai_service_name() -> str:
     return "FREEPDB1"
 
 
 @pytest.fixture(scope="session")
-def oracle_service_name(oracle23c_service_name: str) -> str:
-    return oracle23c_service_name
+def oracle_service_name(oracle23ai_service_name: str) -> str:
+    return oracle23ai_service_name
 
 
 @pytest.fixture(scope="session")
@@ -90,18 +90,18 @@ def oracle18c_port() -> int:
 
 
 @pytest.fixture(scope="session")
-def oracle23c_port() -> int:
+def oracle23ai_port() -> int:
     return 1513
 
 
 @pytest.fixture(scope="session")
 def default_oracle_service_name() -> str:
-    return "oracle23c"
+    return "oracle23ai"
 
 
 @pytest.fixture(scope="session")
-def oracle_port(oracle23c_port: int) -> int:
-    return oracle23c_port
+def oracle_port(oracle23ai_port: int) -> int:
+    return oracle23ai_port
 
 
 @pytest.fixture(scope="session")
@@ -115,11 +115,11 @@ def oracle_docker_ip(oracle_docker_services: DockerServiceRegistry) -> str:
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def oracle23c_service(
+async def oracle23ai_service(
     oracle_docker_services: DockerServiceRegistry,
     oracle_docker_compose_files: list[Path],
-    oracle23c_port: int,
-    oracle23c_service_name: str,
+    oracle23ai_port: int,
+    oracle23ai_service_name: str,
     oracle_system_password: str,
     oracle_user: str,
     oracle_password: str,
@@ -127,16 +127,16 @@ async def oracle23c_service(
     os.environ["ORACLE_PASSWORD"] = oracle_password
     os.environ["ORACLE_SYSTEM_PASSWORD"] = oracle_system_password
     os.environ["ORACLE_USER"] = oracle_user
-    os.environ["ORACLE23C_SERVICE_NAME"] = oracle23c_service_name
-    os.environ["ORACLE23C_PORT"] = str(oracle23c_port)
+    os.environ["ORACLE23AI_SERVICE_NAME"] = oracle23ai_service_name
+    os.environ["ORACLE23AI_PORT"] = str(oracle23ai_port)
     await oracle_docker_services.start(
-        "oracle23c",
+        "oracle23ai",
         docker_compose_files=oracle_docker_compose_files,
         timeout=90,
         pause=1,
         check=oracle_responsive,
-        port=oracle23c_port,
-        service_name=oracle23c_service_name,
+        port=oracle23ai_port,
+        service_name=oracle23ai_service_name,
         user=oracle_user,
         password=oracle_password,
     )
@@ -242,19 +242,19 @@ async def oracle18c_startup_connection(
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def oracle23c_startup_connection(
-    oracle23c_service: DockerServiceRegistry,
+async def oracle23ai_startup_connection(
+    oracle23ai_service: DockerServiceRegistry,
     oracle_docker_ip: str,
-    oracle23c_port: int,
-    oracle23c_service_name: str,
+    oracle23ai_port: int,
+    oracle23ai_service_name: str,
     oracle_user: str,
     oracle_password: str,
 ) -> AsyncGenerator[oracledb.AsyncConnection, None]:
     async with oracledb.connect_async(
         host=oracle_docker_ip,
-        port=oracle23c_port,
+        port=oracle23ai_port,
         user=oracle_user,
-        service_name=oracle23c_service_name,
+        service_name=oracle23ai_service_name,
         password=oracle_password,
     ) as db_connection:
         yield db_connection

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/src/pytest_databases/helpers.py

@@ -22,7 +22,7 @@ class _ContextManagerWrapper:
         self._cm = cm
 
     async def __aenter__(self) -> T:
-        return self._cm.__enter__()
+        return self._cm.__enter__()  # type: ignore[return-value]
 
     async def __aexit__(
         self,

{pytest_databases-0.7.1 → pytest_databases-0.8.0}/tests/docker/test_oracle.py

@@ -23,13 +23,13 @@ def test_oracle18c_default_config(
     assert oracle18c_port == 1514
 
 
-def test_oracle23c_default_config(
-    oracle_user: str, oracle_password: str, oracle23c_service_name: str, oracle23c_port: int
+def test_oracle23ai_default_config(
+    oracle_user: str, oracle_password: str, oracle23ai_service_name: str, oracle23ai_port: int
 ) -> None:
     assert oracle_user == "app"
     assert oracle_password == "super-secret"
-    assert oracle23c_service_name == "FREEPDB1"
-    assert oracle23c_port == 1513
+    assert oracle23ai_service_name == "FREEPDB1"
+    assert oracle23ai_port == 1513
 
 
 def test_oracle_default_config(
@@ -37,15 +37,15 @@ def test_oracle_default_config(
     oracle_password: str,
     oracle_service_name: str,
     oracle_port: int,
-    oracle23c_port: int,
+    oracle23ai_port: int,
     default_oracle_service_name: str,
 ) -> None:
-    assert default_oracle_service_name == "oracle23c"
+    assert default_oracle_service_name == "oracle23ai"
     assert oracle_user == "app"
     assert oracle_password == "super-secret"
     assert oracle_service_name == "FREEPDB1"
     assert oracle_port == 1513
-    assert oracle_port == oracle23c_port
+    assert oracle_port == oracle23ai_port
 
 
 async def test_oracle18c_service(
@@ -67,18 +67,18 @@ async def test_oracle18c_service(
         assert "Hello World!" in res
 
 
-async def test_oracle23c_service(
+async def test_oracle23ai_service(
     oracle_docker_ip: str,
-    oracle23c_service: DockerServiceRegistry,
-    oracle23c_service_name: str,
-    oracle23c_port: int,
+    oracle23ai_service: DockerServiceRegistry,
+    oracle23ai_service_name: str,
+    oracle23ai_port: int,
     oracle_user: str,
     oracle_password: str,
 ) -> None:
     conn = oracledb.connect(
         user=oracle_user,
         password=oracle_password,
-        dsn=f"{oracle_docker_ip}:{oracle23c_port!s}/{oracle23c_service_name}",
+        dsn=f"{oracle_docker_ip}:{oracle23ai_port!s}/{oracle23ai_service_name}",
     )
     with conn.cursor() as cur:
         cur.execute("SELECT 'Hello World!' FROM dual")
@@ -106,10 +106,10 @@ async def test_oracle18c_services_after_start(
         assert bool(result is not None and result[0][0] == 1)
 
 
-async def test_oracle23c_services_after_start(
-    oracle23c_startup_connection: oracledb.AsyncConnection,
+async def test_oracle23ai_services_after_start(
+    oracle23ai_startup_connection: oracledb.AsyncConnection,
 ) -> None:
-    async with oracle23c_startup_connection.cursor() as cursor:
+    async with oracle23ai_startup_connection.cursor() as cursor:
         await cursor.execute("CREATE or replace view simple_table as SELECT 1 as the_value from dual")
         await cursor.execute("select * from simple_table")
         result = await cursor.fetchall()