fix(oracle): use the 18c xe image (#70)

cofin · web-flow · commit 0a2a5ed79140 · 2025-04-06T13:31:42.000-05:00
diff --git a/.github/workflows/ci.yaml b/.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
diff --git a/.pre-commit-config.yaml b/.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]
diff --git a/pyproject.toml b/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.1"
 #
 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.1"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"
diff --git a/src/pytest_databases/docker/oracle.py b/src/pytest_databases/docker/oracle.py
@@ -108,7 +108,7 @@ def oracle_23ai_service(docker_service: DockerService) -> Generator[OracleServic
 @pytest.fixture(autouse=False, scope="session")
 def oracle_18c_service(docker_service: DockerService) -> Generator[OracleService, None, None]:
     with _provide_oracle_service(
-        image="gvenzl/oracle-free:23-slim-faststart",
+        image="gvenzl/oci-oracle-xe:18-slim-faststart",
         name="oracle18c",
         service_name="xepdb1",
         docker_service=docker_service,
diff --git a/src/pytest_databases/docker/postgres.py b/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
diff --git a/uv.lock b/uv.lock
