Simple typing changes, Ruff import formatter. p3

3 files changed, 44 insertions, 43 deletions

diff --git a/test_utils/incite/collections/conftest.py b/test_utils/incite/collections/conftest.py
index cf4f0ed..74e4081 100644
--- a/test_utils/incite/collections/conftest.py
+++ b/test_utils/incite/collections/conftest.py
@@ -1,26 +1,25 @@
-from datetime import timedelta, datetime
-from typing import TYPE_CHECKING, Optional, Callable
-from generalresearch.pg_helper import PostgresConfig
+from datetime import datetime, timedelta
+from typing import TYPE_CHECKING, Callable, Optional
 
 import pytest
 
-from test_utils.incite.conftest import mnt_filepath
+from generalresearch.pg_helper import PostgresConfig
 from test_utils.conftest import clear_directory
 
 if TYPE_CHECKING:
+    from generalresearch.incite.base import DFCollectionType, GRLDatasets
     from generalresearch.incite.collections import DFCollection
-    from generalresearch.incite.base import GRLDatasets, DFCollectionType
-    from generalresearch.incite.collections.thl_web import LedgerDFCollection
     from generalresearch.incite.collections.thl_web import (
-        WallDFCollection,
+        AuditLogDFCollection,
+        LedgerDFCollection,
         SessionDFCollection,
         TaskAdjustmentDFCollection,
         UserDFCollection,
-        AuditLogDFCollection,
+        WallDFCollection,
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def user_collection(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -29,8 +28,8 @@ def user_collection(
     thl_web_rr: PostgresConfig,
 ) -> "UserDFCollection":
     from generalresearch.incite.collections.thl_web import (
-        UserDFCollection,
         DFCollectionType,
+        UserDFCollection,
     )
 
     return UserDFCollection(
@@ -42,7 +41,7 @@ def user_collection(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def wall_collection(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -51,8 +50,8 @@ def wall_collection(
     thl_web_rr: PostgresConfig,
 ) -> "WallDFCollection":
     from generalresearch.incite.collections.thl_web import (
-        WallDFCollection,
         DFCollectionType,
+        WallDFCollection,
     )
 
     return WallDFCollection(
@@ -64,7 +63,7 @@ def wall_collection(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def session_collection(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -73,8 +72,8 @@ def session_collection(
     thl_web_rr: PostgresConfig,
 ) -> "SessionDFCollection":
     from generalresearch.incite.collections.thl_web import (
-        SessionDFCollection,
         DFCollectionType,
+        SessionDFCollection,
     )
 
     return SessionDFCollection(
@@ -102,17 +101,17 @@ def session_collection(
 #     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def task_adj_collection(
     mnt_filepath: "GRLDatasets",
     offset: str,
     duration: Optional[timedelta],
     start: datetime,
-    thl_web_rr,
+    thl_web_rr: PostgresConfig,
 ) -> "TaskAdjustmentDFCollection":
     from generalresearch.incite.collections.thl_web import (
-        TaskAdjustmentDFCollection,
         DFCollectionType,
+        TaskAdjustmentDFCollection,
     )
 
     return TaskAdjustmentDFCollection(
@@ -126,13 +125,13 @@ def task_adj_collection(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def auditlog_collection(
     mnt_filepath: "GRLDatasets",
     offset: str,
     duration: timedelta,
     start: datetime,
-    thl_web_rr,
+    thl_web_rr: PostgresConfig,
 ) -> "AuditLogDFCollection":
     from generalresearch.incite.collections.thl_web import (
         AuditLogDFCollection,
@@ -148,7 +147,7 @@ def auditlog_collection(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def ledger_collection(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -157,8 +156,8 @@ def ledger_collection(
     thl_web_rr: PostgresConfig,
 ) -> "LedgerDFCollection":
     from generalresearch.incite.collections.thl_web import (
-        LedgerDFCollection,
         DFCollectionType,
+        LedgerDFCollection,
     )
 
     return LedgerDFCollection(
@@ -170,8 +169,10 @@ def ledger_collection(
     )
 
 
-@pytest.fixture(scope="function")
-def rm_ledger_collection(ledger_collection: "LedgerDFCollection") -> Callable:
+@pytest.fixture
+def rm_ledger_collection(
+    ledger_collection: "LedgerDFCollection",
+) -> Callable[..., None]:
 
     def _inner():
         clear_directory(ledger_collection.archive_path)
@@ -184,7 +185,7 @@ def rm_ledger_collection(ledger_collection: "LedgerDFCollection") -> Callable:
 # --------------------------
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def df_collection(
     mnt_filepath: "GRLDatasets",
     df_collection_data_type: "DFCollectionType",
diff --git a/test_utils/incite/conftest.py b/test_utils/incite/conftest.py
index 9632ee5..058093e 100644
--- a/test_utils/incite/conftest.py
+++ b/test_utils/incite/conftest.py
@@ -14,17 +14,15 @@ from faker import Faker
 # from test_utils.models.conftest import session_factory
 
 if TYPE_CHECKING:
-    from generalresearch.config import GRLSettings
+    from generalresearch.config import GRLBaseSettings
     from generalresearch.incite.base import GRLDatasets
     from generalresearch.incite.collections import (
-        DFCollection,
         DFCollectionItem,
         DFCollectionType,
     )
     from generalresearch.incite.mergers import MergeType
     from generalresearch.models.admin.request import (
         ReportRequest,
-        ReportType,
     )
     from generalresearch.models.thl.product import Product
     from generalresearch.models.thl.session import Session
@@ -35,7 +33,7 @@ fake = Faker()
 
 
 @pytest.fixture
-def mnt_gr_api_dir(request: SubRequest, settings: "GRLSettings") -> Path:
+def mnt_gr_api_dir(request: SubRequest, settings: "GRLBaseSettings") -> Path:
     p = Path(settings.mnt_gr_api_dir)
     p.mkdir(parents=True, exist_ok=True)
 
diff --git a/test_utils/incite/mergers/conftest.py b/test_utils/incite/mergers/conftest.py
index 010c44f..d094b84 100644
--- a/test_utils/incite/mergers/conftest.py
+++ b/test_utils/incite/mergers/conftest.py
@@ -1,10 +1,9 @@
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Callable, Optional
+from typing import TYPE_CHECKING, Callable
 
 import pytest
 
 from test_utils.conftest import clear_directory
-from test_utils.incite.conftest import mnt_filepath
 
 if TYPE_CHECKING:
     from generalresearch.incite.base import GRLDatasets
@@ -21,7 +20,10 @@ if TYPE_CHECKING:
     from generalresearch.incite.mergers.foundations.user_id_product import (
         UserIdProductMerge,
     )
-    from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
+    from generalresearch.incite.mergers.pop_ledger import (
+        PopLedgerMerge,
+        PopLedgerMergeItem,
+    )
     from generalresearch.incite.mergers.ym_survey_wall import (
         YMSurveyWallMerge,
         YMSurveyWallMergeCollectionItem,
@@ -37,8 +39,8 @@ if TYPE_CHECKING:
 # --------------------------
 
 
-@pytest.fixture(scope="function")
-def rm_pop_ledger_merge(pop_ledger_merge) -> Callable[..., None]:
+@pytest.fixture
+def rm_pop_ledger_merge(pop_ledger_merge: "PopLedgerMerge") -> Callable[..., None]:
 
     def _inner():
         clear_directory(pop_ledger_merge.archive_path)
@@ -46,7 +48,7 @@ def rm_pop_ledger_merge(pop_ledger_merge) -> Callable[..., None]:
     return _inner
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def pop_ledger_merge(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -65,7 +67,7 @@ def pop_ledger_merge(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def pop_ledger_merge_item(
     start: datetime,
     pop_ledger_merge: "PopLedgerMerge",
@@ -79,7 +81,7 @@ def pop_ledger_merge_item(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def ym_survey_wall_merge(
     mnt_filepath: "GRLDatasets",
     start: datetime,
@@ -94,7 +96,7 @@ def ym_survey_wall_merge(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def ym_survey_wall_merge_item(
     start: datetime, ym_survey_wall_merge: "YMSurveyWallMerge"
 ) -> "YMSurveyWallMergeCollectionItem":
@@ -108,7 +110,7 @@ def ym_survey_wall_merge_item(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def ym_wall_summary_merge(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -144,7 +146,7 @@ def ym_wall_summary_merge_item(
 # --------------------------
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def enriched_session_merge(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -164,7 +166,7 @@ def enriched_session_merge(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def enriched_task_adjust_merge(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -186,7 +188,7 @@ def enriched_task_adjust_merge(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def enriched_wall_merge(
     mnt_filepath: "GRLDatasets",
     offset: str,
@@ -206,7 +208,7 @@ def enriched_wall_merge(
     )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def user_id_product_merge(
     mnt_filepath: "GRLDatasets",
     duration: timedelta,
@@ -231,7 +233,7 @@ def user_id_product_merge(
 # --------------------------
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def merge_collection(
     mnt_filepath: "GRLDatasets",
     merge_type: "MergeType",