chore: pass ruff linting tests

Author: jacobdadams

pyproject.toml

@@ -1,6 +1,8 @@
 [tool.ruff]
 line-length = 120
 ignore = ["E501"]
+[tool.ruff.lint.per-file-ignores]
+"tests/*.py" = ["F841"]
 [tool.black]
 line-length = 120
 [tool.pytest.ini_options]

src/palletjack/__init__.py

@@ -5,8 +5,8 @@
 
 import locale
 
-from . import extract, load, transform, utils
-from .errors import IntFieldAsFloatError, TimezoneAwareDatetimeError
+from . import extract, load, transform, utils  # noqa: F401
+from .errors import IntFieldAsFloatError, TimezoneAwareDatetimeError  # noqa: F401
 
 #: If the locale is not set explicitly, set it to the system default for text to number conversions
 if not locale.getlocale(locale.LC_NUMERIC)[0]:

src/palletjack/load.py

@@ -5,18 +5,15 @@
 import json
 import logging
 import shutil
-import sys
 import warnings
 from datetime import datetime
 from pathlib import Path
-from tempfile import TemporaryDirectory
 
 import arcgis
-import geopandas as gpd
 import numpy as np
 import pandas as pd
 import pyogrio
-from arcgis.features import GeoAccessor, GeoSeriesAccessor
+from arcgis.features import GeoAccessor, GeoSeriesAccessor  # noqa: F401
 
 from palletjack import utils
 

src/palletjack/transform.py

@@ -8,7 +8,7 @@
 
 import arcgis
 import pandas as pd
-from arcgis import GeoAccessor, GeoSeriesAccessor
+from arcgis import GeoAccessor, GeoSeriesAccessor  # noqa: F401
 
 from palletjack import utils
 

tests/test_extract.py

@@ -976,7 +976,7 @@ def test_get_object_ids_raises_on_key_error(self, mocker):
         class_mock.envelope_params = None
         class_mock.where_clause = "1=1"
 
-        with pytest.raises(RuntimeError, match=re.escape(f"Could not get object IDs from foo.bar")):
+        with pytest.raises(RuntimeError, match=re.escape("Could not get object IDs from foo.bar")):
             record_count = extract.ServiceLayer.get_object_ids(class_mock)
 
     def test_get_object_ids_returns_empty_list_on_no_oids(self, mocker):
@@ -1239,8 +1239,8 @@ def test_credential_values(self):
 
         assert loader.client_secret == "1"
         assert loader.client_id == "2"
-        assert loader.username == None
-        assert loader.password == None
+        assert loader.username is None
+        assert loader.password is None
 
     @pytest.mark.parametrize("is_sandbox,access_token_url,query_url", url_template_test_data)
     def test_url_template_substitutions(self, is_sandbox, access_token_url, query_url):

tests/test_load.py

@@ -1,8 +1,6 @@
-import datetime
 import json
 import logging
 import re
-import sys
 import urllib
 from pathlib import Path
 
@@ -11,7 +9,7 @@
 import pandas.testing as tm
 import pyogrio
 import pytest
-from arcgis import GeoAccessor, GeoSeriesAccessor
+from arcgis import GeoAccessor, GeoSeriesAccessor  # noqa: F401
 from palletjack import load
 
 
@@ -384,7 +382,7 @@ def test_truncate_and_load_append_fails_save_old_true(self, mocker, caplog):
             )
 
         updater_mock._upload_data.assert_called_once_with(new_dataframe, upsert=False)
-        assert f"Append failed. Data saved to bar_path" in caplog.text
+        assert "Append failed. Data saved to bar_path" in caplog.text
 
     def test_truncate_and_load_append_fails_save_old_false(self, mocker, caplog):
         caplog.set_level(logging.DEBUG)
@@ -407,7 +405,7 @@ def test_truncate_and_load_append_fails_save_old_false(self, mocker, caplog):
 
         updater_mock._upload_data.assert_called_once_with(new_dataframe, upsert=False)
 
-        assert f"Append failed. Old data not saved (save_old set to False)" in caplog.text
+        assert "Append failed. Old data not saved (save_old set to False)" in caplog.text
 
     def test_truncate_and_load_calls_field_checkers(self, mocker, caplog):
 

tests/test_utils.py

@@ -5,14 +5,13 @@
 from pathlib import Path
 
 import numpy as np
+import palletjack
 import pandas as pd
 import pyogrio
 import pytest
 from arcgis import geometry
 from pandas import testing as tm
 
-import palletjack
-
 
 @pytest.fixture(scope="module")  #: only call this once per module
 def iris():
@@ -85,61 +84,6 @@ def test_rename_columns_for_agol_moves_underscore_before_leading_digits_to_end(s
         assert renamed == {"_1TestName:": "TestName__1"}
 
 
-class TestCheckFieldsMatch:
-
-    def test_check_fields_match_normal(self, mocker):
-        mock_fl = mocker.Mock()
-        mock_fl.properties.fields = [
-            {"name": "Foo"},
-            {"name": "Bar"},
-        ]
-        df = pd.DataFrame(columns=["Foo", "Bar"])
-
-        palletjack.utils.check_fields_match(mock_fl, df)
-
-    def test_check_fields_match_raises_error_on_extra_new_field(self, mocker):
-        mock_fl = mocker.Mock()
-        mock_fl.properties.fields = [
-            {"name": "Foo"},
-            {"name": "Bar"},
-        ]
-        df = pd.DataFrame(columns=["Foo", "Bar", "Baz"])
-
-        with pytest.raises(RuntimeError) as exc_info:
-            palletjack.utils.check_fields_match(mock_fl, df)
-
-        assert (
-            exc_info.value.args[0]
-            == "New dataset contains the following fields that are not present in the live dataset: {'Baz'}"
-        )
-
-    def test_check_fields_match_ignores_new_shape_field(self, mocker):
-        mock_fl = mocker.Mock()
-        mock_fl.properties.fields = [
-            {"name": "Foo"},
-            {"name": "Bar"},
-        ]
-        df = pd.DataFrame(columns=["Foo", "Bar", "SHAPE"])
-
-        palletjack.utils.check_fields_match(mock_fl, df)
-
-    def test_check_fields_match_warns_on_missing_new_field(self, mocker, caplog):
-        mock_fl = mocker.Mock()
-        mock_fl.properties.fields = [
-            {"name": "Foo"},
-            {"name": "Bar"},
-            {"name": "Baz"},
-        ]
-        df = pd.DataFrame(columns=["Foo", "Bar"])
-
-        palletjack.utils.check_fields_match(mock_fl, df)
-
-        assert (
-            "New dataset does not contain the following fields that are present in the live dataset: {'Baz'}"
-            in caplog.text
-        )
-
-
 class TestRetry:
 
     def test_retry_returns_on_first_success(self, mocker):
@@ -795,6 +739,58 @@ def test_fix_numeric_empty_strings_handles_single_missing_shape_info_field(self)
 
 class TestCheckFieldsMatch:
 
+    def test_check_fields_match_normal(self, mocker):
+        mock_fl = mocker.Mock()
+        mock_fl.properties.fields = [
+            {"name": "Foo"},
+            {"name": "Bar"},
+        ]
+        df = pd.DataFrame(columns=["Foo", "Bar"])
+
+        palletjack.utils.check_fields_match(mock_fl, df)
+
+    def test_check_fields_match_raises_error_on_extra_new_field(self, mocker):
+        mock_fl = mocker.Mock()
+        mock_fl.properties.fields = [
+            {"name": "Foo"},
+            {"name": "Bar"},
+        ]
+        df = pd.DataFrame(columns=["Foo", "Bar", "Baz"])
+
+        with pytest.raises(RuntimeError) as exc_info:
+            palletjack.utils.check_fields_match(mock_fl, df)
+
+        assert (
+            exc_info.value.args[0]
+            == "New dataset contains the following fields that are not present in the live dataset: {'Baz'}"
+        )
+
+    def test_check_fields_match_ignores_new_shape_field(self, mocker):
+        mock_fl = mocker.Mock()
+        mock_fl.properties.fields = [
+            {"name": "Foo"},
+            {"name": "Bar"},
+        ]
+        df = pd.DataFrame(columns=["Foo", "Bar", "SHAPE"])
+
+        palletjack.utils.check_fields_match(mock_fl, df)
+
+    def test_check_fields_match_warns_on_missing_new_field(self, mocker, caplog):
+        mock_fl = mocker.Mock()
+        mock_fl.properties.fields = [
+            {"name": "Foo"},
+            {"name": "Bar"},
+            {"name": "Baz"},
+        ]
+        df = pd.DataFrame(columns=["Foo", "Bar"])
+
+        palletjack.utils.check_fields_match(mock_fl, df)
+
+        assert (
+            "New dataset does not contain the following fields that are present in the live dataset: {'Baz'}"
+            in caplog.text
+        )
+
     def test_check_live_and_new_field_types_match_normal(self, mocker):
         new_df = pd.DataFrame(
             {