Disable some rules and fix minor linting issues

Author: oschwald

minfraud/models.py

@@ -19,7 +19,7 @@ def __eq__(self, other: object) -> bool:
     def __ne__(self, other: object) -> bool:
         return not self.__eq__(other)
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> dict:  # noqa: C901
         """Return a dict of the object suitable for serialization."""
         result = {}
         for key, value in self.__dict__.items():
@@ -96,7 +96,7 @@ class GeoIP2Location(geoip2.records.Location):
     `RFC 3339 <https://tools.ietf.org/html/rfc3339>`_. For instance, the
     local time in Boston might be returned as 2015-04-27T19:17:24-04:00."""
 
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, *args, **kwargs) -> None:  # noqa: ANN002
         """Initialize a GeoIP2Location instance."""
         self.local_time = kwargs.get("local_time")
         super().__init__(*args, **kwargs)

minfraud/request.py

@@ -266,7 +266,10 @@
 }
 
 
-def prepare_report(request: dict[str, Any], validate: bool) -> dict[str, Any]:
+def prepare_report(
+    request: dict[str, Any],
+    validate: bool,  # noqa: FBT001
+) -> dict[str, Any]:
     """Validate and prepare minFraud report."""
     cleaned_request = _copy_and_clean(request)
     if validate:
@@ -280,8 +283,8 @@ def prepare_report(request: dict[str, Any], validate: bool) -> dict[str, Any]:
 
 def prepare_transaction(
     request: dict[str, Any],
-    validate: bool,
-    hash_email: bool,
+    validate: bool,  # noqa: FBT001
+    hash_email: bool,  # noqa: FBT001
 ) -> dict[str, Any]:
     """Validate and prepare minFraud transaction."""
     cleaned_request = _copy_and_clean(request)
@@ -340,7 +343,7 @@ def maybe_hash_email(transaction: dict[str, Any]) -> None:
     if domain != "" and "domain" not in email:
         email["domain"] = domain
 
-    email["address"] = hashlib.md5(address.encode("UTF-8")).hexdigest()
+    email["address"] = hashlib.md5(address.encode("UTF-8")).hexdigest()  # noqa: S324
 
 
 def _clean_domain(domain: str) -> str:

minfraud/validation.py

@@ -14,7 +14,6 @@
 import urllib.parse
 import uuid
 from decimal import Decimal
-from typing import Optional
 
 from email_validator import validate_email
 from voluptuous import (

minfraud/webservice.py

@@ -164,7 +164,7 @@ def _exception_for_4xx_status(
             )
         return HTTPError(
             "Error response contains JSON but it does not "
-            + f"specify code or error keys: {raw_body}",
+            f"specify code or error keys: {raw_body}",
             status,
             uri,
             raw_body,
@@ -232,7 +232,7 @@ class AsyncClient(BaseClient):
     _existing_session: aiohttp.ClientSession
     _proxy: str | None
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         account_id: int,
         license_key: str,
@@ -267,8 +267,8 @@ def __init__(
     async def factors(
         self,
         transaction: dict[str, Any],
-        validate: bool = True,
-        hash_email: bool = False,
+        validate: bool = True,  # noqa: FBT001, FBT002
+        hash_email: bool = False,  # noqa: FBT001, FBT002
     ) -> Factors:
         """Query Factors endpoint with transaction data.
 
@@ -306,8 +306,8 @@ async def factors(
     async def insights(
         self,
         transaction: dict[str, Any],
-        validate: bool = True,
-        hash_email: bool = False,
+        validate: bool = True,  # noqa: FBT001, FBT002
+        hash_email: bool = False,  # noqa: FBT001, FBT002
     ) -> Insights:
         """Query Insights endpoint with transaction data.
 
@@ -345,8 +345,8 @@ async def insights(
     async def score(
         self,
         transaction: dict[str, Any],
-        validate: bool = True,
-        hash_email: bool = False,
+        validate: bool = True,  # noqa: FBT001, FBT002
+        hash_email: bool = False,  # noqa: FBT001, FBT002
     ) -> Score:
         """Query Score endpoint with transaction data.
 
@@ -384,7 +384,7 @@ async def score(
     async def report(
         self,
         report: dict[str, str | None],
-        validate: bool = True,
+        validate: bool = True,  # noqa: FBT001, FBT002
     ) -> None:
         """Send a transaction report to the Report Transaction endpoint.
 
@@ -418,8 +418,8 @@ async def _response_for(
         uri: str,
         model_class: Callable,
         request: dict[str, Any],
-        validate: bool,
-        hash_email: bool,
+        validate: bool,  # noqa: FBT001
+        hash_email: bool,  # noqa: FBT001
     ) -> Score | Factors | Insights:
         """Send request and create response object."""
         prepared_request = prepare_transaction(request, validate, hash_email)
@@ -476,7 +476,7 @@ class Client(BaseClient):
     _proxies: dict[str, str] | None
     _session: requests.Session
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         account_id: int,
         license_key: str,
@@ -525,8 +525,8 @@ def __init__(
     def factors(
         self,
         transaction: dict[str, Any],
-        validate: bool = True,
-        hash_email: bool = False,
+        validate: bool = True,  # noqa: FBT001, FBT002
+        hash_email: bool = False,  # noqa: FBT001, FBT002
     ) -> Factors:
         """Query Factors endpoint with transaction data.
 
@@ -564,8 +564,8 @@ def factors(
     def insights(
         self,
         transaction: dict[str, Any],
-        validate: bool = True,
-        hash_email: bool = False,
+        validate: bool = True,  # noqa: FBT001, FBT002
+        hash_email: bool = False,  # noqa: FBT001, FBT002
     ) -> Insights:
         """Query Insights endpoint with transaction data.
 
@@ -603,8 +603,8 @@ def insights(
     def score(
         self,
         transaction: dict[str, Any],
-        validate: bool = True,
-        hash_email: bool = False,
+        validate: bool = True,  # noqa: FBT001, FBT002
+        hash_email: bool = False,  # noqa: FBT001, FBT002
     ) -> Score:
         """Query Score endpoint with transaction data.
 
@@ -639,7 +639,11 @@ def score(
             ),
         )
 
-    def report(self, report: dict[str, str | None], validate: bool = True) -> None:
+    def report(
+        self,
+        report: dict[str, str | None],
+        validate: bool = True,  # noqa: FBT001, FBT002
+    ) -> None:
         """Send a transaction report to the Report Transaction endpoint.
 
         :param report: A dictionary containing the transaction report to be sent
@@ -672,8 +676,8 @@ def _response_for(
         uri: str,
         model_class: Callable,
         request: dict[str, Any],
-        validate: bool,
-        hash_email: bool,
+        validate: bool,  # noqa: FBT001
+        hash_email: bool,  # noqa: FBT001
     ) -> Score | Factors | Insights:
         """Send request and create response object."""
         prepared_request = prepare_transaction(request, validate, hash_email)

pyproject.toml

@@ -64,9 +64,18 @@ ignore = [
     # Skip type annotation on **_
     "ANN003",
 
+    # Redundant as the formatter handles missing trailing commas.
+    "COM812",
+
     # documenting magic methods
     "D105",
 
+    # Conflicts with D211
+    "D203",
+
+    # Conflicts with D212
+    "D213",
+
     # Magic numbers for HTTP status codes seem ok most of the time.
     "PLR2004",
 
@@ -80,7 +89,7 @@ ignorelist = ["id"]
 
 [tool.ruff.lint.per-file-ignores]
 "docs/*" = ["ALL"]
-"minfraud/models,.py" = [ "D107", "PLR0913" ]
+"minfraud/models.py" = [ "PLR0913" ]
 "tests/*" = ["ANN201", "D"]
 
 [tool.setuptools.package-data]

tests/test_models.py

@@ -150,11 +150,13 @@ def test_ip_address(self) -> None:
             risk_reasons=[
                 {
                     "code": "ANONYMOUS_IP",
-                    "reason": "The IP address belongs to an anonymous network. See /ip_address/traits for more details.",
+                    "reason": "The IP address belongs to an anonymous network. "
+                    "See /ip_address/traits for more details.",
                 },
                 {
                     "code": "MINFRAUD_NETWORK_ACTIVITY",
-                    "reason": "Suspicious activity has been seen on this IP address across minFraud customers.",
+                    "reason": "Suspicious activity has been seen on this IP address "
+                    "across minFraud customers.",
                 },
             ],
             traits={
@@ -187,13 +189,15 @@ def test_ip_address(self) -> None:
 
         self.assertEqual("ANONYMOUS_IP", address.risk_reasons[0].code)
         self.assertEqual(
-            "The IP address belongs to an anonymous network. See /ip_address/traits for more details.",
+            "The IP address belongs to an anonymous network. "
+            "See /ip_address/traits for more details.",
             address.risk_reasons[0].reason,
         )
 
         self.assertEqual("MINFRAUD_NETWORK_ACTIVITY", address.risk_reasons[1].code)
         self.assertEqual(
-            "Suspicious activity has been seen on this IP address across minFraud customers.",
+            "Suspicious activity has been seen on this IP address "
+            "across minFraud customers.",
             address.risk_reasons[1].reason,
         )
 

tests/test_validation.py

@@ -29,21 +29,21 @@ def check_transaction(self, transaction: dict[str, Any]) -> None:
         except MultipleInvalid as e:
             self.fail(f"MultipleInvalid {e.msg} thrown for {transaction}")
 
-    def check_transaction_str_type(self, object: str, key: str) -> None:
-        self.check_transaction({object: {key: "string"}})
-        self.check_invalid_transaction({object: {key: 12}})
+    def check_transaction_str_type(self, obj: str, key: str) -> None:
+        self.check_transaction({obj: {key: "string"}})
+        self.check_invalid_transaction({obj: {key: 12}})
 
     def check_positive_number(self, f: Callable) -> None:
         for good in (1, 1.1, Decimal("1.1")):
             self.check_transaction(f(good))
         for bad in ("1.2", "1", -1, -1.1, 0):
             self.check_invalid_transaction(f(bad))
 
-    def check_bool(self, object: str, key: str) -> None:
+    def check_bool(self, obj: str, key: str) -> None:
         for good in (True, False):
-            self.check_transaction({object: {key: good}})
+            self.check_transaction({obj: {key: good}})
         for bad in ("", 0, "True"):
-            self.check_invalid_transaction({object: {key: bad}})
+            self.check_invalid_transaction({obj: {key: bad}})
 
     def setup_report(self, report: dict[str, Any]) -> None:
         if "ip_address" not in report:

tests/test_webservice.py

@@ -45,16 +45,19 @@ def setUp(self) -> None:
             "abcdef123456",
             host=f"{self.httpserver.host}:{self.httpserver.port}",
         )
-        test_dir = os.path.join(os.path.dirname(__file__), "data")
-        with builtins.open(
-            os.path.join(test_dir, self.request_file),
+        test_dir = os.path.join(  # noqa: PTH118
+            os.path.dirname(__file__),  # noqa: PTH120
+            "data",
+        )
+        with builtins.open(  # noqa: PTH123
+            os.path.join(test_dir, self.request_file),  # noqa: PTH118
             encoding="utf-8",
         ) as file:
             content = file.read()
         self.full_request = json.loads(content)
 
-        with builtins.open(
-            os.path.join(test_dir, self.response_file),
+        with builtins.open(  # noqa: PTH123
+            os.path.join(test_dir, self.response_file),  # noqa: PTH118
             encoding="utf-8",
         ) as file:
             self.response = file.read()
@@ -146,7 +149,9 @@ def create_error(
             content_type = (
                 "application/json"
                 if self.type == "report"
-                else "application/vnd.maxmind.com-error+json; charset=UTF-8; version=2.0"
+                else (
+                    "application/vnd.maxmind.com-error+json; charset=UTF-8; version=2.0"
+                )
             )
         self.httpserver.expect_request(uri, method="POST").respond_with_data(
             text,
@@ -175,15 +180,18 @@ def create_success(
         status = 204 if self.type == "report" else 200
         self.httpserver.expect_request(uri, method="POST").respond_with_data(
             response,
-            content_type=f"application/vnd.maxmind.com-minfraud-{self.type}+json; charset=UTF-8; version=2.0",
+            content_type=(
+                f"application/vnd.maxmind.com-minfraud-{self.type}+json; "
+                "charset=UTF-8; version=2.0"
+            ),
             status=status,
         )
         if client is None:
             client = self.client
 
         return self.run_client(getattr(client, self.type)(request))
 
-    def run_client(self, v):
+    def run_client(self, v):  # noqa: ANN001
         return v
 
     def test_named_constructor_args(self) -> None:
@@ -193,8 +201,8 @@ def test_named_constructor_args(self) -> None:
             self.client_class(account_id=id, license_key=key),
             self.client_class(account_id=id, license_key=key),
         ):
-            self.assertEqual(client._account_id, str(id))
-            self.assertEqual(client._license_key, key)
+            self.assertEqual(client._account_id, str(id))  # noqa: SLF001
+            self.assertEqual(client._license_key, key)  # noqa: SLF001
 
     def test_missing_constructor_args(self) -> None:
         with self.assertRaises(TypeError):
@@ -256,7 +264,10 @@ def test_200_with_email_hashing(self) -> None:
             },
         ).respond_with_data(
             self.response,
-            content_type=f"application/vnd.maxmind.com-minfraud-{self.type}+json; charset=UTF-8; version=2.0",
+            content_type=(
+                f"application/vnd.maxmind.com-minfraud-{self.type}+json; "
+                "charset=UTF-8; version=2.0"
+            ),
             status=200,
         )
 
@@ -389,7 +400,7 @@ def tearDown(self) -> None:
         self._loop.close()
         super().tearDown()
 
-    def run_client(self, v):
+    def run_client(self, v):  # noqa: ANN001
         return self._loop.run_until_complete(v)