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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-databases
-Version: 0.8.0
+Version: 0.9.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
@@ -8,7 +8,7 @@ Project-URL: Source, https://github.com/litestar-org/pytest-databases
 Author-email: Cody Fincher <cody.fincher@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
-Keywords: alloydb,alloydbomni,bigquery,cockroachdb,database,duckdb,elasticsearch,migration,mssql,mysql,oracle,postgres,redis,spanner
+Keywords: alloydb,alloydbomni,azure,bigquery,cockroachdb,database,duckdb,elasticsearch,migration,mssql,mysql,oracle,postgres,redis,spanner
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
@@ -29,25 +29,23 @@ Requires-Dist: psycopg; extra == 'cockroachdb'
 Provides-Extra: dragonfly
 Requires-Dist: redis; extra == 'dragonfly'
 Provides-Extra: elasticsearch7
-Requires-Dist: elasticsearch7[async]; extra == 'elasticsearch7'
+Requires-Dist: elasticsearch7; extra == 'elasticsearch7'
 Provides-Extra: elasticsearch8
-Requires-Dist: elasticsearch8[async]; extra == 'elasticsearch8'
+Requires-Dist: elasticsearch8; extra == 'elasticsearch8'
 Provides-Extra: keydb
 Requires-Dist: redis; extra == 'keydb'
 Provides-Extra: mssql
-Requires-Dist: aioodbc; extra == 'mssql'
+Requires-Dist: pymssql; extra == 'mssql'
 Provides-Extra: mysql
-Requires-Dist: asyncmy>=0.2.9; extra == 'mysql'
+Requires-Dist: pymysql; extra == 'mysql'
 Provides-Extra: oracle
 Requires-Dist: oracledb; extra == 'oracle'
 Provides-Extra: postgres
-Requires-Dist: asyncpg>=0.29.0; extra == 'postgres'
+Requires-Dist: psycopg>=3; extra == 'postgres'
 Provides-Extra: redis
 Requires-Dist: redis; extra == 'redis'
 Provides-Extra: spanner
 Requires-Dist: google-cloud-spanner; extra == 'spanner'
-Provides-Extra: sqlite
-Requires-Dist: aiosqlite; extra == 'sqlite'
 Description-Content-Type: text/markdown
 
 # Pytest Databases

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

@@ -12,7 +12,7 @@ license = "MIT"
 name = "pytest-databases"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.8.0"
+version = "0.9.0"
 #
 authors = [{ name = "Cody Fincher", email = "cody.fincher@gmail.com" }]
 keywords = [
@@ -30,6 +30,7 @@ keywords = [
   "cockroachdb",
   "redis",
   "elasticsearch",
+  "azure",
 ]
 # options under https://pypi.org/classifiers/
 classifiers = [
@@ -56,16 +57,15 @@ azure-storage = ["azure-storage-blob"]
 bigquery = ["google-cloud-bigquery"]
 cockroachdb = ["psycopg"]
 dragonfly = ["redis"]
-elasticsearch7 = ["elasticsearch7[async]"]
-elasticsearch8 = ["elasticsearch8[async]"]
+elasticsearch7 = ["elasticsearch7"]
+elasticsearch8 = ["elasticsearch8"]
 keydb = ["redis"]
-mssql = ["aioodbc"]
-mysql = ["asyncmy>=0.2.9"]
+mssql = ["pymssql"]
+mysql = ["pymysql"]
 oracle = ["oracledb"]
-postgres = ["asyncpg>=0.29.0"]
+postgres = ["psycopg>=3"]
 redis = ["redis"]
 spanner = ["google-cloud-spanner"]
-sqlite = ["aiosqlite"]
 
 
 ######################
@@ -86,14 +86,12 @@ allow-direct-references = true
 [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
@@ -105,9 +103,9 @@ extra-dependencies = [
   "types-six",
   "types-decorator",
   "types-pyyaml",
-  "asyncpg-stubs",
   "types-docutils",
   "types-redis",
+  "types-pymysql",
   # docs
   "sphinx>=7.1.2",
   "sphinx-autobuild>=2021.3.14",
@@ -127,14 +125,12 @@ python = "3.12"
 [tool.hatch.envs.test]
 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
@@ -146,9 +142,9 @@ extra-dependencies = [
   "types-six",
   "types-decorator",
   "types-pyyaml",
-  "asyncpg-stubs",
   "types-docutils",
   "types-redis",
+  "types-pymysql",
   # docs
   "sphinx>=7.1.2",
   "sphinx-autobuild>=2021.3.14",
@@ -196,14 +192,12 @@ no-cov = "cov --no-cov"
 [tool.hatch.envs.docs]
 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
@@ -215,9 +209,9 @@ extra-dependencies = [
   "types-six",
   "types-decorator",
   "types-pyyaml",
-  "asyncpg-stubs",
   "types-docutils",
   "types-redis",
+  "types-pymysql",
   # docs
   "sphinx>=7.1.2",
   "sphinx-autobuild>=2021.3.14",
@@ -241,6 +235,7 @@ features = [
   "elasticsearch7",
   "elasticsearch8",
   "bigquery",
+  "azure-storage",
 ]
 python = "3.11"
 template = "default"
@@ -261,14 +256,12 @@ build-check = ["build", "validate"]
 [tool.hatch.envs.local]
 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
@@ -280,9 +273,9 @@ extra-dependencies = [
   "types-six",
   "types-decorator",
   "types-pyyaml",
-  "asyncpg-stubs",
   "types-docutils",
   "types-redis",
+  "types-pymysql",
   # docs
   "sphinx>=7.1.2",
   "sphinx-autobuild>=2021.3.14",
@@ -305,6 +298,7 @@ features = [
   "elasticsearch7",
   "elasticsearch8",
   "bigquery",
+  "azure-storage",
 ]
 path = ".venv/"
 python = "3.11"
@@ -316,14 +310,12 @@ type = "virtual"
 [tool.hatch.envs.lint]
 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
@@ -335,9 +327,9 @@ extra-dependencies = [
   "types-six",
   "types-decorator",
   "types-pyyaml",
-  "asyncpg-stubs",
   "types-docutils",
   "types-redis",
+  "types-pymysql",
   # docs
   "sphinx>=7.1.2",
   "sphinx-autobuild>=2021.3.14",
@@ -480,7 +472,6 @@ module = ["docutils.nodes.*"]
 [[tool.mypy.overrides]]
 ignore_missing_imports = true
 module = [
-  "asyncmy",
   "pyodbc",
   "google.auth.*",
   "google.cloud.*",

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

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-import asyncio
 import os
 import re
 import subprocess  # noqa: S404
+import time
 import timeit
 from typing import TYPE_CHECKING, Any, Callable, Iterable
 
-from pytest_databases.helpers import simple_string_hash, wrap_sync
+from pytest_databases.helpers import simple_string_hash
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Generator
@@ -16,9 +16,9 @@ if TYPE_CHECKING:
 TRUE_VALUES = {"True", "true", "1", "yes", "Y", "T"}
 
 
-async def wait_until_responsive(
-    check: Callable[..., Awaitable],
-    timeout: float,  # noqa: ASYNC109
+def wait_until_responsive(
+    check: Callable[..., bool],
+    timeout: float,
     pause: float,
     **kwargs: Any,
 ) -> None:
@@ -33,9 +33,9 @@ async def wait_until_responsive(
     ref = timeit.default_timer()
     now = ref
     while (now - ref) < timeout:  # sourcery skip
-        if await check(**kwargs):
+        if check(**kwargs):
             return
-        await asyncio.sleep(pause)
+        time.sleep(pause)
         now = timeit.default_timer()
 
     msg = "Timeout reached while waiting on service!"
@@ -81,13 +81,13 @@ class DockerServiceRegistry:
         command = [*self._base_command, *self._compose_files, *args]
         subprocess.run(command, check=True, capture_output=True)
 
-    async def start(
+    def start(
         self,
         name: str,
         docker_compose_files: list[Path],
         *,
-        check: Callable[..., Any],
-        timeout: float = 30,  # noqa: ASYNC109
+        check: Callable[..., bool],
+        timeout: float = 30,
         pause: float = 0.1,
         **kwargs: Any,
     ) -> None:
@@ -101,8 +101,8 @@ class DockerServiceRegistry:
             self.run_command("up", "--force-recreate", "-d", name)
             self._running_services.add(name)
 
-        await wait_until_responsive(
-            check=wrap_sync(check),
+        wait_until_responsive(
+            check=check,
             timeout=timeout,
             pause=pause,
             host=self.docker_ip,

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

@@ -3,9 +3,9 @@ from __future__ import annotations
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, AsyncGenerator
+from typing import TYPE_CHECKING
 
-import asyncpg
+import psycopg
 import pytest
 
 from pytest_databases.docker import DockerServiceRegistry
@@ -18,9 +18,9 @@ if TYPE_CHECKING:
 COMPOSE_PROJECT_NAME: str = f"pytest-databases-alloydb-{simple_string_hash(__file__)}"
 
 
-async def alloydb_omni_responsive(host: str, port: int, user: str, password: str, database: str) -> bool:
+def alloydb_omni_responsive(host: str, port: int, user: str, password: str, database: str) -> bool:
     try:
-        conn = await asyncpg.connect(
+        conn = psycopg.connect(
             host=host,
             port=port,
             user=user,
@@ -31,10 +31,10 @@ async def alloydb_omni_responsive(host: str, port: int, user: str, password: str
         return False
 
     try:
-        db_open = await conn.fetchrow("SELECT 1")
+        db_open = conn.fetchrow("SELECT 1")
         return bool(db_open is not None and db_open[0] == 1)
     finally:
-        await conn.close()
+        conn.close()
 
 
 @pytest.fixture(scope="session")
@@ -93,7 +93,7 @@ def alloydb_docker_ip(alloydb_docker_services: DockerServiceRegistry) -> str:
 
 # alias to the latest
 @pytest.fixture(autouse=False, scope="session")
-async def alloydb_omni_service(
+def alloydb_omni_service(
     alloydb_docker_services: DockerServiceRegistry,
     default_alloydb_omni_service_name: str,
     alloydb_docker_compose_files: list[Path],
@@ -101,12 +101,12 @@ async def alloydb_omni_service(
     postgres_database: str,
     postgres_user: str,
     postgres_password: str,
-) -> AsyncGenerator[None, None]:
+) -> Generator[None, None, None]:
     os.environ["POSTGRES_PASSWORD"] = postgres_password
     os.environ["POSTGRES_USER"] = postgres_user
     os.environ["POSTGRES_DATABASE"] = postgres_database
     os.environ[f"{default_alloydb_omni_service_name.upper()}_PORT"] = str(alloydb_omni_port)
-    await alloydb_docker_services.start(
+    alloydb_docker_services.start(
         name=default_alloydb_omni_service_name,
         docker_compose_files=alloydb_docker_compose_files,
         timeout=45,
@@ -121,22 +121,19 @@ async def alloydb_omni_service(
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def alloydb_omni_startup_connection(
+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(
+) -> Generator[psycopg.Connection, None, None]:
+    with psycopg.connect(
         host=alloydb_docker_ip,
         port=alloydb_omni_port,
         user=postgres_user,
         database=postgres_database,
         password=postgres_password,
-    )
-    try:
+    ) as conn:
         yield conn
-    finally:
-        await conn.close()

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

@@ -140,14 +140,14 @@ async def azure_blob_async_container_client(
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def azure_blob_service(
+def azure_blob_service(
     azure_blob_docker_services: DockerServiceRegistry,
     default_azure_blob_redis_service_name: str,
     azure_blob_docker_compose_files: list[Path],
     azure_blob_connection_string: str,
     azure_blob_port: int,
     azure_blob_default_container_name: str,
-) -> AsyncGenerator[None, None]:
+) -> Generator[None, None, None]:
     os.environ["AZURE_BLOB_PORT"] = str(azure_blob_port)
 
     def azurite_responsive(host: str, port: int) -> bool:
@@ -157,7 +157,7 @@ async def azure_blob_service(
         logs = _get_container_logs(str(azure_blob_docker_compose_files[0].absolute()))
         return "Azurite Blob service successfully listens on" in logs
 
-    await azure_blob_docker_services.start(
+    azure_blob_docker_services.start(
         name=default_azure_blob_redis_service_name,
         docker_compose_files=azure_blob_docker_compose_files,
         check=azurite_responsive,

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

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, AsyncGenerator
+from typing import TYPE_CHECKING
 
 import pytest
 from google.api_core.client_options import ClientOptions
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 COMPOSE_PROJECT_NAME: str = f"pytest-databases-bigquery-{simple_string_hash(__file__)}"
 
 
-async def bigquery_responsive(
+def bigquery_responsive(
     host: str,
     bigquery_endpoint: str,
     bigquery_dataset: str,
@@ -111,7 +111,7 @@ def bigquery_endpoint(bigquery_docker_ip: str, bigquery_port: int) -> str:
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def bigquery_service(
+def bigquery_service(
     bigquery_docker_services: DockerServiceRegistry,
     default_bigquery_service_name: str,
     bigquery_docker_compose_files: list[Path],
@@ -122,13 +122,13 @@ async def bigquery_service(
     bigquery_project: str,
     bigquery_credentials: Credentials,
     bigquery_client_options: ClientOptions,
-) -> AsyncGenerator[None, None]:
+) -> Generator[None, None, None]:
     os.environ["BIGQUERY_ENDPOINT"] = bigquery_endpoint
     os.environ["BIGQUERY_DATASET"] = bigquery_dataset
     os.environ["BIGQUERY_PORT"] = str(bigquery_port)
     os.environ["BIGQUERY_GRPC_PORT"] = str(bigquery_grpc_port)
     os.environ["GOOGLE_CLOUD_PROJECT"] = bigquery_project
-    await bigquery_docker_services.start(
+    bigquery_docker_services.start(
         name=default_bigquery_service_name,
         docker_compose_files=bigquery_docker_compose_files,
         timeout=60,
@@ -143,12 +143,12 @@ async def bigquery_service(
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def bigquery_startup_connection(
+def bigquery_startup_connection(
     bigquery_service: DockerServiceRegistry,
     bigquery_project: str,
     bigquery_credentials: Credentials,
     bigquery_client_options: ClientOptions,
-) -> AsyncGenerator[bigquery.Client, None]:
+) -> Generator[bigquery.Client, None, None]:
     yield bigquery.Client(
         project=bigquery_project, client_options=bigquery_client_options, credentials=bigquery_credentials
     )

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

@@ -3,9 +3,9 @@ from __future__ import annotations
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, AsyncGenerator
+from typing import TYPE_CHECKING
 
-import asyncpg
+import psycopg
 import pytest
 
 from pytest_databases.docker import DockerServiceRegistry
@@ -18,18 +18,18 @@ if TYPE_CHECKING:
 COMPOSE_PROJECT_NAME: str = f"pytest-databases-cockroachdb-{simple_string_hash(__file__)}"
 
 
-async def cockroachdb_responsive(host: str, port: int, database: str, driver_opts: dict[str, str]) -> bool:
+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:
-        conn = await asyncpg.connect(f"postgresql://root@{host}:{port}/{database}?{opts}")
+        conn = psycopg.connect(f"postgresql://root@{host}:{port}/{database}?{opts}")
     except Exception:  # noqa: BLE001
         return False
 
     try:
-        db_open = await conn.fetchrow("SELECT 1")
+        db_open = conn.execute("SELECT 1").fetchone()
         return bool(db_open is not None and db_open[0] == 1)
     finally:
-        await conn.close()
+        conn.close()
 
 
 @pytest.fixture(scope="session")
@@ -82,17 +82,17 @@ def cockroachdb_docker_ip(cockroachdb_docker_services: DockerServiceRegistry) ->
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def cockroachdb_service(
+def cockroachdb_service(
     cockroachdb_docker_services: DockerServiceRegistry,
     default_cockroachdb_service_name: str,
     cockroachdb_docker_compose_files: list[Path],
     cockroachdb_port: int,
     cockroachdb_database: str,
     cockroachdb_driver_opts: dict[str, str],
-) -> AsyncGenerator[None, None]:
+) -> Generator[None, None, None]:
     os.environ["COCKROACHDB_DATABASE"] = cockroachdb_database
     os.environ["COCKROACHDB_PORT"] = str(cockroachdb_port)
-    await cockroachdb_docker_services.start(
+    cockroachdb_docker_services.start(
         name=default_cockroachdb_service_name,
         docker_compose_files=cockroachdb_docker_compose_files,
         timeout=60,
@@ -106,18 +106,15 @@ async def cockroachdb_service(
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def cockroachdb_startup_connection(
+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]:
+) -> Generator[psycopg.Connection, None, None]:
     opts = "&".join(f"{k}={v}" for k, v in cockroachdb_driver_opts.items()) if cockroachdb_driver_opts else ""
-    conn = await asyncpg.connect(
+    with psycopg.connect(
         f"postgresql://root@{cockroachdb_docker_ip}:{cockroachdb_port}/{cockroachdb_database}?{opts}"
-    )
-    try:
+    ) as conn:
         yield conn
-    finally:
-        await conn.close()

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

@@ -3,13 +3,12 @@ from __future__ import annotations
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, AsyncGenerator
+from typing import TYPE_CHECKING
 
 import pytest
-from redis.asyncio import Redis as AsyncRedis
-from redis.exceptions import ConnectionError as RedisConnectionError
 
 from pytest_databases.docker import DockerServiceRegistry
+from pytest_databases.docker.redis import redis_responsive
 from pytest_databases.helpers import simple_string_hash
 
 if TYPE_CHECKING:
@@ -18,16 +17,6 @@ if TYPE_CHECKING:
 COMPOSE_PROJECT_NAME: str = f"pytest-databases-dragonfly-{simple_string_hash(__file__)}"
 
 
-async def dragonfly_responsive(host: str, port: int) -> bool:
-    client: AsyncRedis = AsyncRedis(host=host, port=port)
-    try:
-        return await client.ping()
-    except (ConnectionError, RedisConnectionError):
-        return False
-    finally:
-        await client.aclose()  # type: ignore[attr-defined]
-
-
 @pytest.fixture(scope="session")
 def dragonfly_compose_project_name() -> str:
     return os.environ.get("COMPOSE_PROJECT_NAME", COMPOSE_PROJECT_NAME)
@@ -68,17 +57,17 @@ def dragonfly_docker_ip(dragonfly_docker_services: DockerServiceRegistry) -> str
 
 
 @pytest.fixture(autouse=False, scope="session")
-async def dragonfly_service(
+def dragonfly_service(
     dragonfly_docker_services: DockerServiceRegistry,
     default_dragonfly_service_name: str,
     dragonfly_docker_compose_files: list[Path],
     dragonfly_port: int,
-) -> AsyncGenerator[None, None]:
+) -> Generator[None, None, None]:
     os.environ["DRAGONFLY_PORT"] = str(dragonfly_port)
-    await dragonfly_docker_services.start(
+    dragonfly_docker_services.start(
         name=default_dragonfly_service_name,
         docker_compose_files=dragonfly_docker_compose_files,
-        check=dragonfly_responsive,
+        check=redis_responsive,
         port=dragonfly_port,
     )
     yield