Ruff std replacements

17 files changed, 23 insertions, 110 deletions

diff --git a/tests/incite/collections/test_df_collection_base.py b/tests/incite/collections/test_df_collection_base.py
index c3c64e4..176bf4b 100644
--- a/tests/incite/collections/test_df_collection_base.py
+++ b/tests/incite/collections/test_df_collection_base.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
 import pandas as pd
@@ -9,7 +9,6 @@ from generalresearch.incite.collections import (
     DFCollection,
     DFCollectionType,
 )
-from test_utils.incite.conftest import mnt_filepath
 
 if TYPE_CHECKING:
     from generalresearch.incite.base import GRLDatasets
diff --git a/tests/incite/collections/test_df_collection_item_base.py b/tests/incite/collections/test_df_collection_item_base.py
index 8cf719d..0218f30 100644
--- a/tests/incite/collections/test_df_collection_item_base.py
+++ b/tests/incite/collections/test_df_collection_item_base.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
 import pytest
diff --git a/tests/incite/collections/test_df_collection_item_thl_web.py b/tests/incite/collections/test_df_collection_item_thl_web.py
index 062171d..3d70e56 100644
--- a/tests/incite/collections/test_df_collection_item_thl_web.py
+++ b/tests/incite/collections/test_df_collection_item_thl_web.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Generator
-from datetime import UTC, datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from itertools import product as iter_product
 from os.path import join as pjoin
 from pathlib import Path, PurePath
@@ -236,7 +236,6 @@ class TestDFCollectionItemMethod:
         incite_item_factory,
         delete_df_collection,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -280,7 +279,6 @@ class TestDFCollectionItemMethod:
         incite_item_factory,
         delete_df_collection,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -333,7 +331,6 @@ class TestDFCollectionItemMethod:
         delete_df_collection,
         mnt_filepath,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type != DFCollectionType.LEDGER:
             return
@@ -385,7 +382,6 @@ class TestDFCollectionItemMethod:
         delete_df_collection,
         mnt_filepath,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -766,7 +762,6 @@ class TestDFCollectionItemFunctionalTest:
         delete_df_collection,
         mnt_filepath: GRLDatasets,
     ):
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -828,7 +823,6 @@ class TestDFCollectionItemFunctionalTest:
 
         import pyarrow.parquet as pq
 
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -864,7 +858,6 @@ class TestDFCollectionItemFunctionalTest:
         delete_df_collection,
         mnt_filepath: GRLDatasets,
     ):
-        from generalresearch.models.thl.user import User
 
         delete_df_collection(coll=df_collection)
         df_collection._client = client_no_amm
@@ -920,7 +913,6 @@ class TestDFCollectionItemFunctionalTest:
         """Don't allow creating an archive for data that will likely be
         overwritten or updated
         """
-        from generalresearch.models.thl.user import User
 
         if df_collection.data_type in unsupported_mock_types:
             return
@@ -987,7 +979,6 @@ class TestDFCollectionItemFunctionalTest:
         duration: timedelta,
         mnt_filepath,
     ):
-        from generalresearch.models.thl.user import User
 
         delete_df_collection(coll=df_collection)
         df_collection._client = client_no_amm
diff --git a/tests/incite/collections/test_df_collection_thl_marketplaces.py b/tests/incite/collections/test_df_collection_thl_marketplaces.py
index 2597d38..d2d3ce4 100644
--- a/tests/incite/collections/test_df_collection_thl_marketplaces.py
+++ b/tests/incite/collections/test_df_collection_thl_marketplaces.py
@@ -1,6 +1,5 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from itertools import product
-from typing import TYPE_CHECKING
 
 import pytest
 from pandera.pandas import Column, DataFrameSchema, Index
@@ -12,10 +11,6 @@ from generalresearch.incite.collections.thl_marketplaces import (
     SagoSurveyHistoryCollection,
     SpectrumSurveyTimeseriesCollection,
 )
-from test_utils.incite.conftest import mnt_filepath
-
-if TYPE_CHECKING:
-    from generalresearch.incite.base import GRLDatasets
 
 
 def combo_object():
diff --git a/tests/incite/collections/test_df_collection_thl_web.py b/tests/incite/collections/test_df_collection_thl_web.py
index 2cb0ba0..bcdeb83 100644
--- a/tests/incite/collections/test_df_collection_thl_web.py
+++ b/tests/incite/collections/test_df_collection_thl_web.py
@@ -13,9 +13,7 @@ from pandera.pandas import DataFrameSchema
 from generalresearch.incite.collections import DFCollection, DFCollectionType
 
 if TYPE_CHECKING:
-    from generalresearch.incite.base import GRLDatasets
     from generalresearch.incite.collections import (
-        DFCollectionItem,
         DFCollectionType,
     )
 
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(
diff --git a/tests/incite/test_collection_base.py b/tests/incite/test_collection_base.py
index 5a63019..7e1577a 100644
--- a/tests/incite/test_collection_base.py
+++ b/tests/incite/test_collection_base.py
@@ -10,7 +10,6 @@ import pytest
 from _pytest._code.code import ExceptionInfo
 
 from generalresearch.incite.base import CollectionBase
-from test_utils.incite.conftest import mnt_filepath
 
 AGO_15min = (datetime.now(tz=UTC) - timedelta(minutes=15)).replace(microsecond=0)
 AGO_1HR = (datetime.now(tz=UTC) - timedelta(hours=1)).replace(microsecond=0)
@@ -108,7 +107,7 @@ class TestCollectionBase:
 
         with pytest.raises(expected_exception=ValueError) as cm:
             cm: ExceptionInfo
-            CollectionBase(offset=f"59sec", archive_path=mnt_filepath.data_src)
+            CollectionBase(offset="59sec", archive_path=mnt_filepath.data_src)
         assert "Must be equal to, or longer than 1 min" in str(cm.value)
 
         with pytest.raises(expected_exception=ValueError) as cm:
diff --git a/tests/incite/test_collection_base_item.py b/tests/incite/test_collection_base_item.py
index 3f4d023..7a0a581 100644
--- a/tests/incite/test_collection_base_item.py
+++ b/tests/incite/test_collection_base_item.py
@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timezone
+from datetime import UTC, datetime
 from os.path import join as pjoin
 from pathlib import Path
 from uuid import uuid4
diff --git a/tests/incite/test_grl_flow.py b/tests/incite/test_grl_flow.py
index c632f9a..6aea182 100644
--- a/tests/incite/test_grl_flow.py
+++ b/tests/incite/test_grl_flow.py
@@ -1,15 +1,16 @@
 class TestGRLFlow:
 
     def test_init(self, mnt_filepath, thl_web_rr):
+        from generalresearch.incite.collections.thl_web import (
+            LedgerDFCollection,
+            TaskAdjustmentDFCollection,
+        )
         from generalresearch.incite.defaults import (
             ledger_df_collection,
             task_df_collection,
-            pop_ledger as plm,
         )
-
-        from generalresearch.incite.collections.thl_web import (
-            LedgerDFCollection,
-            TaskAdjustmentDFCollection,
+        from generalresearch.incite.defaults import (
+            pop_ledger as plm,
         )
         from generalresearch.incite.mergers.pop_ledger import PopLedgerMerge
 
diff --git a/tests/incite/test_interval_idx.py b/tests/incite/test_interval_idx.py
index ea2bced..3034c21 100644
--- a/tests/incite/test_interval_idx.py
+++ b/tests/incite/test_interval_idx.py
@@ -1,5 +1,6 @@
+from datetime import datetime
+
 import pandas as pd
-from datetime import datetime, timezone, timedelta
 
 
 class TestIntervalIndex: