Ruff std replacements

8 files changed, 9 insertions, 80 deletions

diff --git a/tests/incite/mergers/foundations/test_enriched_session.py b/tests/incite/mergers/foundations/test_enriched_session.py
index a0ae01e..ba11725 100644
--- a/tests/incite/mergers/foundations/test_enriched_session.py
+++ b/tests/incite/mergers/foundations/test_enriched_session.py
@@ -1,7 +1,6 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from itertools import product
-from typing import Optional
 
 import dask.dataframe as dd
 import pandas as pd
@@ -11,10 +10,6 @@ from generalresearch.incite.schemas.admin_responses import (
     AdminPOPSessionSchema,
 )
 from generalresearch.pg_helper import PostgresConfig
-from test_utils.incite.collections.conftest import (
-    session_collection,
-    wall_collection,
-)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/foundations/test_enriched_task_adjust.py b/tests/incite/mergers/foundations/test_enriched_task_adjust.py
index 96c214f..8c3a647 100644
--- a/tests/incite/mergers/foundations/test_enriched_task_adjust.py
+++ b/tests/incite/mergers/foundations/test_enriched_task_adjust.py
@@ -5,13 +5,6 @@ import dask.dataframe as dd
 import pandas as pd
 import pytest
 
-from test_utils.incite.collections.conftest import (
-    wall_collection,
-    task_adj_collection,
-    session_collection,
-)
-from test_utils.incite.mergers.conftest import enriched_wall_merge
-
 
 @pytest.mark.parametrize(
     argnames="offset, duration,",
diff --git a/tests/incite/mergers/foundations/test_enriched_wall.py b/tests/incite/mergers/foundations/test_enriched_wall.py
index b421df8..0e28bce 100644
--- a/tests/incite/mergers/foundations/test_enriched_wall.py
+++ b/tests/incite/mergers/foundations/test_enriched_wall.py
@@ -1,34 +1,15 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from decimal import Decimal
 from itertools import product as iter_product
-from typing import Optional
 
 import dask.dataframe as dd
 import pandas as pd
 import pytest
 
 # noinspection PyUnresolvedReferences
-from distributed.utils_test import (
-    cleanup,
-    client,
-    client_no_amm,
-    cluster_fixture,
-    gen_cluster,
-    loop,
-    loop_in_thread,
-)
-
 from generalresearch.incite.mergers.foundations.enriched_wall import (
     EnrichedWallMergeItem,
 )
-from test_utils.incite.collections.conftest import (
-    session_collection,
-    wall_collection,
-)
-from test_utils.incite.conftest import incite_item_factory
-from test_utils.incite.mergers.conftest import (
-    enriched_wall_merge,
-)
 
 
 @pytest.mark.parametrize(
@@ -118,7 +99,7 @@ class TestEnrichedWall:
 
             try:
                 modified_time1 = path.stat().st_mtime
-            except (Exception,):
+            except Exception:
                 modified_time1 = 0
 
             item.build(
diff --git a/tests/incite/mergers/foundations/test_user_id_product.py b/tests/incite/mergers/foundations/test_user_id_product.py
index a696b45..10802e5 100644
--- a/tests/incite/mergers/foundations/test_user_id_product.py
+++ b/tests/incite/mergers/foundations/test_user_id_product.py
@@ -1,24 +1,13 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product
 
 import pandas as pd
 import pytest
 
 # noinspection PyUnresolvedReferences
-from distributed.utils_test import (
-    cleanup,
-    client,
-    client_no_amm,
-    cluster_fixture,
-    gen_cluster,
-    loop,
-    loop_in_thread,
-)
-
 from generalresearch.incite.mergers.foundations.user_id_product import (
     UserIdProductMergeItem,
 )
-from test_utils.incite.mergers.conftest import user_id_product_merge
 
 
 @pytest.mark.parametrize(
@@ -51,7 +40,7 @@ class TestUserIDProduct:
 
             try:
                 modified_time1 = path.stat().st_mtime
-            except (Exception,):
+            except Exception:
                 modified_time1 = 0
 
             user_id_product_merge.build(client=client_no_amm, user_coll=user_collection)
diff --git a/tests/incite/mergers/test_merge_collection.py b/tests/incite/mergers/test_merge_collection.py
index 77fa8c7..15fa4db 100644
--- a/tests/incite/mergers/test_merge_collection.py
+++ b/tests/incite/mergers/test_merge_collection.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product
 
 import pandas as pd
@@ -9,7 +9,6 @@ from generalresearch.incite.mergers import (
     MergeCollection,
     MergeType,
 )
-from test_utils.incite.conftest import mnt_filepath
 
 merge_types = list(e for e in MergeType if e != MergeType.TEST)
 
diff --git a/tests/incite/mergers/test_merge_collection_item.py b/tests/incite/mergers/test_merge_collection_item.py
index 96f8789..3d0b644 100644
--- a/tests/incite/mergers/test_merge_collection_item.py
+++ b/tests/incite/mergers/test_merge_collection_item.py
@@ -1,17 +1,10 @@
-from datetime import datetime, timezone, timedelta
+from datetime import timedelta
 from itertools import product
 from pathlib import PurePath
 
 import pytest
 
 from generalresearch.incite.mergers import MergeCollectionItem, MergeType
-from generalresearch.incite.mergers.foundations.enriched_session import (
-    EnrichedSessionMerge,
-)
-from generalresearch.incite.mergers.foundations.enriched_wall import (
-    EnrichedWallMerge,
-)
-from test_utils.incite.mergers.conftest import merge_collection
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/test_pop_ledger.py b/tests/incite/mergers/test_pop_ledger.py
index 7583faf..dc01179 100644
--- a/tests/incite/mergers/test_pop_ledger.py
+++ b/tests/incite/mergers/test_pop_ledger.py
@@ -1,18 +1,12 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
-from typing import Optional
 
 import pandas as pd
 import pytest
-from distributed.utils_test import client_no_amm
 
 from generalresearch.incite.schemas.mergers.pop_ledger import (
     numerical_col_names,
 )
-from test_utils.incite.collections.conftest import ledger_collection
-from test_utils.incite.conftest import incite_item_factory, mnt_filepath
-from test_utils.incite.mergers.conftest import pop_ledger_merge
-from test_utils.managers.ledger.conftest import create_main_accounts
 
 
 @pytest.mark.parametrize(
diff --git a/tests/incite/mergers/test_ym_survey_merge.py b/tests/incite/mergers/test_ym_survey_merge.py
index 9107f21..850df8a 100644
--- a/tests/incite/mergers/test_ym_survey_merge.py
+++ b/tests/incite/mergers/test_ym_survey_merge.py
@@ -1,25 +1,10 @@
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product
 
 import pandas as pd
 import pytest
 
 # noinspection PyUnresolvedReferences
-from distributed.utils_test import (
-    cleanup,
-    client,
-    client_no_amm,
-    cluster_fixture,
-    gen_cluster,
-    loop,
-    loop_in_thread,
-)
-
-from test_utils.incite.collections.conftest import session_collection, wall_collection
-from test_utils.incite.mergers.conftest import (
-    enriched_session_merge,
-    ym_survey_wall_merge,
-)
 
 
 @pytest.mark.parametrize(