removed aiopg

Author: sanderegg

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -20,7 +20,6 @@
 import pytest
 import sqlalchemy as sa
 from aiodocker.containers import DockerContainer
-from aiopg.sa import Engine
 from faker import Faker
 from fastapi import FastAPI
 from helpers.shared_comp_utils import (
@@ -450,9 +449,9 @@ async def projects_networks_db(
         project_uuid=current_study.uuid, networks_with_aliases=networks_with_aliases
     )
 
-    engine: Engine = initialized_app.state.engine
+    engine: AsyncEngine = initialized_app.state.engine
 
-    async with engine.acquire() as conn:
+    async with engine.begin() as conn:
         row_data = projects_networks_to_insert.model_dump()
         insert_stmt = pg_insert(projects_networks).values(**row_data)
         upsert_snapshot = insert_stmt.on_conflict_do_update(

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py

@@ -17,7 +17,6 @@
 from typing import Any
 from unittest import mock
 
-import aiopg.sa
 import httpx
 import pytest
 import respx
@@ -63,6 +62,7 @@
     _RAM_SAFE_MARGIN_RATIO,
 )
 from simcore_service_director_v2.utils.computations import to_node_class
+from sqlalchemy.ext.asyncio import AsyncEngine
 
 pytest_simcore_core_services_selection = ["postgres", "rabbit", "redis"]
 pytest_simcore_ops_services_selection = [
@@ -169,7 +169,6 @@ def _mocked_service_resources(request) -> httpx.Response:
     def _mocked_services_details(
         request, service_key: str, service_version: str
     ) -> httpx.Response:
-
         data_published = fake_service_details.model_copy(
             update={
                 "key": urllib.parse.unquote(service_key),
@@ -500,7 +499,7 @@ async def test_create_computation_with_wallet(
     wallet_info: WalletInfo,
     project_nodes_overrides: dict[str, Any],
     default_pricing_plan_aws_ec2_type: str | None,
-    aiopg_engine: aiopg.sa.Engine,
+    sqlalchemy_async_engine: AsyncEngine,
     fake_ec2_cpus: PositiveInt,
     fake_ec2_ram: ByteSize,
 ):
@@ -541,7 +540,7 @@ async def test_create_computation_with_wallet(
             * 2
         )
         # check the project nodes were really overriden now
-        async with aiopg_engine.acquire() as connection:
+        async with sqlalchemy_async_engine.connect() as connection:
             project_nodes_repo = ProjectNodesRepo(project_uuid=proj.uuid)
             for node in await project_nodes_repo.list(connection):
                 if (