Ruff afternoon

1 files changed, 32 insertions, 30 deletions

diff --git a/tests/incite/test_collection_base.py b/tests/incite/test_collection_base.py
index 7e1577a..d6ce2b1 100644
--- a/tests/incite/test_collection_base.py
+++ b/tests/incite/test_collection_base.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import UTC, datetime, timedelta, timezone
 from os.path import exists as pexists
 from os.path import join as pjoin
@@ -9,7 +11,7 @@ import pandas as pd
 import pytest
 from _pytest._code.code import ExceptionInfo
 
-from generalresearch.incite.base import CollectionBase
+from generalresearch.incite.base import CollectionBase, GRLDatasets
 
 AGO_15min = (datetime.now(tz=UTC) - timedelta(minutes=15)).replace(microsecond=0)
 AGO_1HR = (datetime.now(tz=UTC) - timedelta(hours=1)).replace(microsecond=0)
@@ -17,11 +19,11 @@ AGO_2HR = (datetime.now(tz=UTC) - timedelta(hours=2)).replace(microsecond=0)
 
 
 class TestCollectionBase:
-    def test_init(self, mnt_filepath):
+    def test_init(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
         assert instance.df.empty is True
 
-    def test_init_df(self, mnt_filepath):
+    def test_init_df(self, mnt_filepath: GRLDatasets):
         # Only an empty pd.DataFrame can ever be provided
         instance = CollectionBase(
             df=pd.DataFrame({}), archive_path=mnt_filepath.data_src
@@ -43,7 +45,7 @@ class TestCollectionBase:
             )
         assert "Do not provide a pd.DataFrame" in str(cm.value)
 
-    def test_init_start(self, mnt_filepath):
+    def test_init_start(self, mnt_filepath: GRLDatasets):
         with pytest.raises(expected_exception=ValueError) as cm:
             cm: ExceptionInfo
             CollectionBase(
@@ -74,7 +76,7 @@ class TestCollectionBase:
             cm.value
         )
 
-    def test_init_archive_path(self, mnt_filepath):
+    def test_init_archive_path(self, mnt_filepath: GRLDatasets):
         """DirectoryPath is apparently smart enough to confirm that the
         directory path exists.
         """
@@ -99,7 +101,7 @@ class TestCollectionBase:
             CollectionBase(archive_path=new_path)
         assert "Path does not point to a directory" in str(cm.value)
 
-    def test_init_offset(self, mnt_filepath):
+    def test_init_offset(self, mnt_filepath: GRLDatasets):
         with pytest.raises(expected_exception=ValueError) as cm:
             cm: ExceptionInfo
             CollectionBase(offset="1:X", archive_path=mnt_filepath.data_src)
@@ -118,14 +120,14 @@ class TestCollectionBase:
 
 class TestCollectionBaseProperties:
 
-    def test_items(self, mnt_filepath):
+    def test_items(self, mnt_filepath: GRLDatasets):
         with pytest.raises(expected_exception=NotImplementedError) as cm:
             cm: ExceptionInfo
             instance = CollectionBase(archive_path=mnt_filepath.data_src)
-            x = instance.items
+            _ = instance.items
         assert "Must override" in str(cm.value)
 
-    def test_interval_range(self, mnt_filepath):
+    def test_interval_range(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
         # Private method requires the end parameter
         with pytest.raises(expected_exception=AssertionError) as cm:
@@ -147,7 +149,7 @@ class TestCollectionBaseProperties:
         assert res.is_monotonic_increasing
         assert res.is_unique
 
-    def test_interval_range2(self, mnt_filepath):
+    def test_interval_range2(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
         assert isinstance(instance.interval_range, list)
 
@@ -166,16 +168,16 @@ class TestCollectionBaseProperties:
         )
         assert len(instance.interval_range) == 2
 
-    def test_progress(self, mnt_filepath):
+    def test_progress(self, mnt_filepath: GRLDatasets):
         with pytest.raises(expected_exception=NotImplementedError) as cm:
             cm: ExceptionInfo
             instance = CollectionBase(
                 start=AGO_15min, offset="3min", archive_path=mnt_filepath.data_src
             )
-            x = instance.progress
+            _ = instance.progress
         assert "Must override" in str(cm.value)
 
-    def test_progress2(self, mnt_filepath):
+    def test_progress2(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(
             start=AGO_2HR,
             offset="15min",
@@ -184,10 +186,10 @@ class TestCollectionBaseProperties:
         assert instance.df.empty
 
         with pytest.raises(expected_exception=NotImplementedError) as cm:
-            df = instance.progress
+            _ = instance.progress
         assert "Must override" in str(cm.value)
 
-    def test_items2(self, mnt_filepath):
+    def test_items2(self, mnt_filepath: GRLDatasets):
         """There can't be a test for this because the Items need a path whic
         isn't possible in the generic form
         """
@@ -197,7 +199,7 @@ class TestCollectionBaseProperties:
 
         with pytest.raises(expected_exception=NotImplementedError) as cm:
             cm: ExceptionInfo
-            items = instance.items
+            _ = instance.items
         assert "Must override" in str(cm.value)
 
         # item = items[-3]
@@ -208,19 +210,19 @@ class TestCollectionBaseProperties:
         # assert str(df.product_id.dtype) == "object"
         # assert str(ddf.product_id.dtype) == "string"
 
-    def test_items3(self, mnt_filepath):
+    def test_items3(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(
             start=AGO_2HR,
             offset="15min",
             archive_path=mnt_filepath.data_src,
         )
         with pytest.raises(expected_exception=NotImplementedError) as cm:
-            item = instance.items[0]
+            _ = instance.items[0]
         assert "Must override" in str(cm.value)
 
 
 class TestCollectionBaseMethodsCleanup:
-    def test_fetch_force_rr_latest(self, mnt_filepath):
+    def test_fetch_force_rr_latest(self, mnt_filepath: GRLDatasets):
         coll = CollectionBase(archive_path=mnt_filepath.data_src)
 
         with pytest.raises(expected_exception=Exception) as cm:
@@ -228,7 +230,7 @@ class TestCollectionBaseMethodsCleanup:
             coll.fetch_force_rr_latest(sources=[])
         assert "Must override" in str(cm.value)
 
-    def test_fetch_all_paths(self, mnt_filepath):
+    def test_fetch_all_paths(self, mnt_filepath: GRLDatasets):
         coll = CollectionBase(archive_path=mnt_filepath.data_src)
 
         with pytest.raises(expected_exception=NotImplementedError) as cm:
@@ -242,16 +244,16 @@ class TestCollectionBaseMethodsCleanup:
 class TestCollectionBaseMethodsCleanup:
 
     @pytest.mark.skip
-    def test_cleanup_partials(self, mnt_filepath):
+    def test_cleanup_partials(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
         assert instance.cleanup_partials() is None  # it doesn't return anything
 
-    def test_clear_tmp_archives(self, mnt_filepath):
+    def test_clear_tmp_archives(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
         assert instance.clear_tmp_archives() is None  # it doesn't return anything
 
     @pytest.mark.skip
-    def test_clear_corrupt_archives(self, mnt_filepath):
+    def test_clear_corrupt_archives(self, mnt_filepath: GRLDatasets):
         """TODO: expand this so it actually has corrupt archives that we
         check to see if they're removed
         """
@@ -259,14 +261,14 @@ class TestCollectionBaseMethodsCleanup:
         assert instance.clear_corrupt_archives() is None  # it doesn't return anything
 
     @pytest.mark.skip
-    def test_rebuild_symlinks(self, mnt_filepath):
+    def test_rebuild_symlinks(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
         assert instance.rebuild_symlinks() is None
 
 
 class TestCollectionBaseMethodsSourceTiming:
 
-    def test_get_item(self, mnt_filepath):
+    def test_get_item(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
         i = pd.Interval(left=1, right=2, closed="left")
 
@@ -274,7 +276,7 @@ class TestCollectionBaseMethodsSourceTiming:
             instance.get_item(interval=i)
         assert "Must override" in str(cm.value)
 
-    def test_get_item_start(self, mnt_filepath):
+    def test_get_item_start(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
 
         dt = datetime.now(tz=UTC)
@@ -284,7 +286,7 @@ class TestCollectionBaseMethodsSourceTiming:
             instance.get_item_start(start=start)
         assert "Must override" in str(cm.value)
 
-    def test_get_items(self, mnt_filepath):
+    def test_get_items(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
 
         dt = datetime.now(tz=UTC)
@@ -293,21 +295,21 @@ class TestCollectionBaseMethodsSourceTiming:
             instance.get_items(since=dt)
         assert "Must override" in str(cm.value)
 
-    def test_get_items_from_year(self, mnt_filepath):
+    def test_get_items_from_year(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
 
         with pytest.raises(expected_exception=NotImplementedError) as cm:
             instance.get_items_from_year(year=2020)
         assert "Must override" in str(cm.value)
 
-    def test_get_items_last90(self, mnt_filepath):
+    def test_get_items_last90(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
 
         with pytest.raises(expected_exception=NotImplementedError) as cm:
             instance.get_items_last90()
         assert "Must override" in str(cm.value)
 
-    def test_get_items_last365(self, mnt_filepath):
+    def test_get_items_last365(self, mnt_filepath: GRLDatasets):
         instance = CollectionBase(archive_path=mnt_filepath.data_src)
 
         with pytest.raises(expected_exception=NotImplementedError) as cm: