Merge pull request #1825 from VWS-Python/more-ruff

Enable more ruff checks

Author: adamtheturtle

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "ms-python.black-formatter",
+        "charliermarsh.ruff",
+        "ms-python.python"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "[python]": {
+        "editor.codeActionsOnSave": {
+            "source.fixAll": true
+        },
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnSave": true
+    }
+}

pyproject.toml

@@ -92,6 +92,9 @@ line-length = 79
 
 branch = true
 
+[tool.coverage.report]
+exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:"]
+
 [tool.pytest.ini_options]
 
 xfail_strict = true
@@ -174,9 +177,6 @@ ignore = [
     "D205",
     "D212",
     "D213",
-    # Allow backslashes in a docstring.
-    # See https://click.palletsprojects.com/en/8.0.x/documentation/#preventing-rewrapping.
-    "D301",
     # It is too much work to make every docstring imperative.
     "D401",
     # We ignore some docstyle errors which do not apply to Google style
@@ -188,14 +188,9 @@ ignore = [
     "N818",
     # Ignore "too-many-*" errors as they seem to get in the way more than
     # helping.
-    "PLR0912",
     "PLR0913",
     # Allow 'assert' as we use it for tests.
     "S101",
-    # Allow imports which are only used for type checking to be outside type
-    # checking blocks.
-    "TCH002",
-    "TCH003",
 ]
 
 [tool.ruff.per-file-ignores]

src/vws/query.py

@@ -5,8 +5,8 @@
 from __future__ import annotations
 
 import datetime
-import io
 from http import HTTPStatus
+from typing import TYPE_CHECKING
 from urllib.parse import urljoin
 
 import requests
@@ -27,6 +27,9 @@
 from vws.include_target_data import CloudRecoIncludeTargetData
 from vws.reports import QueryResult, TargetData
 
+if TYPE_CHECKING:
+    import io
+
 
 class CloudRecoService:
     """

src/vws/vws.py

@@ -5,10 +5,10 @@
 from __future__ import annotations
 
 import base64
-import io
 import json
 from datetime import date
 from time import sleep
+from typing import TYPE_CHECKING
 from urllib.parse import urljoin
 
 import requests
@@ -47,6 +47,9 @@
     TargetSummaryReport,
 )
 
+if TYPE_CHECKING:
+    import io
+
 
 def _target_api_request(
     server_access_key: str,

tests/test_vws.py

@@ -6,9 +6,9 @@
 
 import base64
 import datetime
-import io
 import random
 import uuid
+from typing import TYPE_CHECKING
 
 import pytest
 from freezegun import freeze_time
@@ -23,6 +23,9 @@
     TargetSummaryReport,
 )
 
+if TYPE_CHECKING:
+    import io
+
 
 class TestAddTarget:
     """