pytest-databases 0.12.0__tar.gz → 0.12.2__tar.gz

{pytest_databases-0.12.0 → pytest_databases-0.12.2}/.github/workflows/ci.yaml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install additional dependencies
-        run: sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 libmariadb-dev
+        run: sudo apt-get update && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 libmariadb-dev && sudo apt-get autoremove -y  && sudo apt-get clean -y
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5

{pytest_databases-0.12.0 → pytest_databases-0.12.2}/.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.11.2" # make sure this is always consistent with hatch configs
+    rev: "v0.11.4" # make sure this is always consistent with hatch configs
     hooks:
       - id: ruff
         args: [--config, ./pyproject.toml]

{pytest_databases-0.12.0 → pytest_databases-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-databases
-Version: 0.12.0
+Version: 0.12.2
 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.12.0 → pytest_databases-0.12.2}/pyproject.toml

@@ -12,7 +12,7 @@ license = "MIT"
 name = "pytest-databases"
 readme = "README.md"
 requires-python = ">=3.9"
-version = "0.12.0"
+version = "0.12.2"
 #
 authors = [{ name = "Cody Fincher", email = "cody@litestar.dev" }]
 keywords = [
@@ -117,7 +117,7 @@ dev = [
 allow_dirty = true
 commit = true
 commit_args = "--no-verify"
-current_version = "0.12.0"
+current_version = "0.12.2"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"

{pytest_databases-0.12.0 → pytest_databases-0.12.2}/src/pytest_databases/docker/oracle.py

@@ -95,22 +95,46 @@ def _provide_oracle_service(
 
 
 @pytest.fixture(autouse=False, scope="session")
-def oracle_23ai_service(docker_service: DockerService) -> Generator[OracleService, None, None]:
+def oracle_23ai_image() -> str:
+    return "gvenzl/oracle-free:23-slim-faststart"
+
+
+@pytest.fixture(autouse=False, scope="session")
+def oracle_23ai_service_name() -> str:
+    return "FREEPDB1"
+
+
+@pytest.fixture(autouse=False, scope="session")
+def oracle_18c_image() -> str:
+    return "gvenzl/oracle-xe:18-slim-faststart"
+
+
+@pytest.fixture(autouse=False, scope="session")
+def oracle_18c_service_name() -> str:
+    return "xepdb1"
+
+
+@pytest.fixture(autouse=False, scope="session")
+def oracle_23ai_service(
+    docker_service: DockerService, oracle_23ai_image: str, oracle_23ai_service_name: str
+) -> Generator[OracleService, None, None]:
     with _provide_oracle_service(
-        image="gvenzl/oracle-free:23-slim-faststart",
+        image=oracle_23ai_image,
         name="oracle23ai",
-        service_name="FREEPDB1",
+        service_name=oracle_23ai_service_name,
         docker_service=docker_service,
     ) as service:
         yield service
 
 
 @pytest.fixture(autouse=False, scope="session")
-def oracle_18c_service(docker_service: DockerService) -> Generator[OracleService, None, None]:
+def oracle_18c_service(
+    docker_service: DockerService, oracle_18c_image: str, oracle_18c_service_name: str
+) -> Generator[OracleService, None, None]:
     with _provide_oracle_service(
-        image="gvenzl/oracle-free:23-slim-faststart",
+        image=oracle_18c_image,
         name="oracle18c",
-        service_name="xepdb1",
+        service_name=oracle_18c_service_name,
         docker_service=docker_service,
     ) as service:
         yield service

{pytest_databases-0.12.0 → pytest_databases-0.12.2}/src/pytest_databases/docker/postgres.py

@@ -182,27 +182,6 @@ def postgres_17_service(
         yield service
 
 
-@pytest.fixture(autouse=False, scope="session")
-def postgres_service(postgres_17_service: PostgresService) -> PostgresService:
-    return postgres_17_service
-
-
-@pytest.fixture(autouse=False, scope="session")
-def postgres_connection(
-    postgres_service: PostgresService,
-) -> Generator[psycopg.Connection, None, None]:
-    with psycopg.connect(
-        _make_connection_string(
-            host=postgres_service.host,
-            port=postgres_service.port,
-            user=postgres_service.user,
-            password=postgres_service.password,
-            database=postgres_service.database,
-        ),
-    ) as conn:
-        yield conn
-
-
 @pytest.fixture(autouse=False, scope="session")
 def postgres_11_connection(
     postgres_11_service: PostgresService,
@@ -313,3 +292,75 @@ def postgres_17_connection(
         ),
     ) as conn:
         yield conn
+
+
+@pytest.fixture(autouse=False, scope="session")
+def postgres_image() -> str:
+    return "postgres:17"
+
+
+@pytest.fixture(autouse=False, scope="session")
+def postgres_service(
+    docker_service: DockerService,
+    postgres_image: str,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
+) -> Generator[PostgresService, None, None]:
+    with _provide_postgres_service(
+        docker_service,
+        image=postgres_image,
+        name="postgres",
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
+    ) as service:
+        yield service
+
+
+@pytest.fixture(autouse=False, scope="session")
+def postgres_connection(
+    postgres_service: PostgresService,
+) -> Generator[psycopg.Connection, None, None]:
+    with psycopg.connect(
+        _make_connection_string(
+            host=postgres_service.host,
+            port=postgres_service.port,
+            user=postgres_service.user,
+            password=postgres_service.password,
+            database=postgres_service.database,
+        ),
+    ) as conn:
+        yield conn
+
+
+@pytest.fixture(autouse=False, scope="session")
+def pgvector_image() -> str:
+    return "pgvector/pgvector:latest"
+
+
+@pytest.fixture(autouse=False, scope="session")
+def pgvector_service(
+    docker_service: DockerService,
+    pgvector_image: str,
+    xdist_postgres_isolation_level: XdistIsolationLevel,
+) -> Generator[PostgresService, None, None]:
+    with _provide_postgres_service(
+        docker_service,
+        image=pgvector_image,
+        name="pgvector",
+        xdist_postgres_isolate=xdist_postgres_isolation_level,
+    ) as service:
+        yield service
+
+
+@pytest.fixture(autouse=False, scope="session")
+def pgvector_connection(
+    pgvector_service: PostgresService,
+) -> Generator[psycopg.Connection, None, None]:
+    with psycopg.connect(
+        _make_connection_string(
+            host=pgvector_service.host,
+            port=pgvector_service.port,
+            user=pgvector_service.user,
+            password=pgvector_service.password,
+            database=pgvector_service.database,
+        ),
+    ) as conn:
+        yield conn

{pytest_databases-0.12.0 → pytest_databases-0.12.2}/tests/test_oracle.py

@@ -2,15 +2,12 @@ from __future__ import annotations
 
 import pytest
 
-pytestmark = pytest.mark.skip()
-
 
 @pytest.mark.parametrize(
     "service_fixture",
     [
         "oracle_18c_service",
         "oracle_23ai_service",
-        "oracle_23ai_service",
     ],
 )
 def test_service_fixture(pytester: pytest.Pytester, service_fixture: str) -> None:
@@ -20,21 +17,23 @@ def test_service_fixture(pytester: pytest.Pytester, service_fixture: str) -> Non
 
     def test({service_fixture}):
         conn = oracledb.connect(
-            user=service_fixture.user,
-            password=service_fixture.password,
-            dsn=f"{{{service_fixture}.host}}:{{{service_fixture}.port!s}}/{{{service_fixture}.service_name}}",
+            user={service_fixture}.user,
+            password={service_fixture}.password,
+            service_name={service_fixture}.service_name,
+            host={service_fixture}.host,
+            port={service_fixture}.port,
         )
         with conn.cursor() as cur:
-            cur.execute("SELECT 'Hello World!' FROM dual")
-            res = cur.fetchall()[0][0]
-            assert "Hello World!" in res
+            cur.execute("SELECT 1 FROM dual")
+            res = cur.fetchone()[0]
+            assert res == 1
     """)
 
     result = pytester.runpytest()
     result.assert_outcomes(passed=1)
 
 
-@pytest.mark.parametrize("connection_fixture", ["oracle_18c_connection"])
+@pytest.mark.parametrize("connection_fixture", ["oracle_18c_connection", "oracle_23ai_connection"])
 def test_connection_fixture(pytester: pytest.Pytester, connection_fixture: str) -> None:
     pytester.makepyfile(f"""
     import oracledb