♻️ Maintenance: pytest-simcore initial cleanup (#5986)

Author: pcrespov

packages/aws-library/tests/conftest.py

@@ -7,13 +7,13 @@
 import pytest
 
 pytest_plugins = [
-    "pytest_simcore.aws_server",
     "pytest_simcore.aws_ec2_service",
     "pytest_simcore.aws_s3_service",
+    "pytest_simcore.aws_server",
     "pytest_simcore.environment_configs",
-    "pytest_simcore.repository_paths",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
+    "pytest_simcore.repository_paths",
 ]
 
 

packages/aws-library/tests/test_s3_client.py

@@ -17,7 +17,7 @@
 from models_library.api_schemas_storage import S3BucketName
 from moto.server import ThreadedMotoServer
 from pydantic import AnyUrl
-from pytest_simcore.helpers.utils_envs import EnvVarsDict
+from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict
 from settings_library.s3 import S3Settings
 from types_aiobotocore_s3 import S3Client
 

packages/dask-task-models-library/tests/conftest.py

@@ -7,9 +7,9 @@
 import pytest
 
 pytest_plugins = [
-    "pytest_simcore.repository_paths",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
+    "pytest_simcore.repository_paths",
 ]
 
 

packages/models-library/tests/test_utils_string_substitution.py

@@ -15,7 +15,7 @@
     substitute_all_legacy_identifiers,
     upgrade_identifier,
 )
-from pytest_simcore.helpers.utils_envs import load_dotenv
+from pytest_simcore.helpers.monkeypatch_envs import load_dotenv
 
 
 @pytest.mark.parametrize(

packages/notifications-library/tests/conftest.py

@@ -17,15 +17,14 @@
 from simcore_postgres_database.models.products import Vendor
 
 pytest_plugins = [
+    "pytest_simcore.docker_compose",
+    "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
-    "pytest_simcore.repository_paths",
     "pytest_simcore.faker_payments_data",
     "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_users_data",
-    "pytest_simcore.docker_compose",
     "pytest_simcore.postgres_service",
-    "pytest_simcore.docker_swarm",
-    "pytest_simcore.tmp_path_extra",
+    "pytest_simcore.repository_paths",
 ]
 
 

packages/notifications-library/tests/email/conftest.py

@@ -3,8 +3,8 @@
 import pytest
 from pydantic import EmailStr
 from pytest_mock import MockerFixture
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from pytest_simcore.helpers.utils_envs import setenvs_from_dict
 
 
 @pytest.fixture

packages/postgres-database/tests/conftest.py

@@ -16,7 +16,7 @@
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import (
+from pytest_simcore.helpers.faker_factories import (
     random_group,
     random_project,
     random_user,

packages/postgres-database/tests/products/conftest.py

@@ -9,7 +9,7 @@
 import pytest
 from aiopg.sa.exc import ResourceClosedError
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_product
+from pytest_simcore.helpers.faker_factories import random_product
 from simcore_postgres_database.webserver_models import products
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 

packages/postgres-database/tests/projects/conftest.py

@@ -10,7 +10,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
-from pytest_simcore.helpers.rawdata_fakers import random_project, random_user
+from pytest_simcore.helpers.faker_factories import random_project, random_user
 from simcore_postgres_database.models.projects import projects
 from simcore_postgres_database.models.users import users
 

packages/postgres-database/tests/test_classifiers.py

@@ -10,7 +10,7 @@
 import pytest
 import sqlalchemy as sa
 from aiopg.sa.engine import Engine
-from pytest_simcore.helpers.rawdata_fakers import random_group
+from pytest_simcore.helpers.faker_factories import random_group
 from simcore_postgres_database.models.classifiers import group_classifiers
 from simcore_postgres_database.models.groups import groups
 from sqlalchemy import func, literal_column