Apply automated lint fixes

Apply automated fixes with `ruff check h bin tests --fix`.

Author: robertknight

h/_version.py

@@ -13,7 +13,7 @@
 
 
 def fetch_git_ref():
-    return subprocess.check_output(  # noqa: S603
+    return subprocess.check_output(
         ["git", "rev-parse", "--short", "HEAD"],  # noqa: S607
         stderr=DEVNULL,
     ).strip()
@@ -27,10 +27,10 @@ def fetch_git_date(ref):
 def fetch_git_dirty():
     # Ensure git index is up-to-date first. This usually isn't necessary, but
     # can be needed inside a docker container where the index is out of date.
-    subprocess.call(["git", "update-index", "-q", "--refresh"])  # noqa: S603, S607
-    dirty_tree = bool(subprocess.call(["git", "diff-files", "--quiet"]))  # noqa: S603, S607
+    subprocess.call(["git", "update-index", "-q", "--refresh"])  # noqa: S607
+    dirty_tree = bool(subprocess.call(["git", "diff-files", "--quiet"]))  # noqa: S607
     dirty_index = bool(
-        subprocess.call(["git", "diff-index", "--quiet", "--cached", "HEAD"])  # noqa: S603, S607
+        subprocess.call(["git", "diff-index", "--quiet", "--cached", "HEAD"])  # noqa: S607
     )
     return dirty_tree or dirty_index
 

h/db/types.py

@@ -1,4 +1,4 @@
-"""Custom SQLAlchemy types for use with the Annotations API database."""  # noqa: A005
+"""Custom SQLAlchemy types for use with the Annotations API database."""
 
 import base64
 import binascii

h/migrations/versions/58bb601c390f_fill_in_missing_denormalized_document_title.py

@@ -71,7 +71,7 @@ def downgrade():
 
 
 def _document_title(document):
-    for meta in document.meta_titles:  # noqa: RET503
+    for meta in document.meta_titles:
         if meta.value:
             return meta.value[0]
 

h/migrations/versions/9f5e274b202c_update_all_document_web_uris.py

@@ -39,7 +39,7 @@ class Document(Base):
 
     def updated_web_uri(self):
         def first_http_url(type_=None):
-            for document_uri in self.document_uris:  # noqa: RET503
+            for document_uri in self.document_uris:
                 uri = document_uri.uri
                 if type_ is not None and document_uri.type != type_:
                     continue

h/migrations/versions/a44ef07b085a_fill_in_missing_denormalized_document_web_uri.py

@@ -68,7 +68,7 @@ def downgrade():
 
 
 def _document_web_uri(document):
-    for docuri in document.document_uris:  # noqa: RET503
+    for docuri in document.document_uris:
         uri = urlparse(docuri.uri)
         if uri.scheme in ["http", "https"]:
             return docuri.uri

h/models/document/_document.py

@@ -56,7 +56,7 @@ def first_http_url(type_=None):
             If no type is given just return this document's first http(s)
             URL, or None.
             """
-            for document_uri in self.document_uris:  # noqa: RET503
+            for document_uri in self.document_uris:
                 uri = document_uri.uri
                 if type_ is not None and document_uri.type != type_:
                     continue

h/models/token.py

@@ -1,4 +1,4 @@
-import datetime  # noqa: A005
+import datetime
 from typing import TYPE_CHECKING
 
 import sqlalchemy

h/security/encryption.py

@@ -40,7 +40,7 @@ def derive_key(key_material: str | bytes, salt: bytes, info: bytes) -> bytes:
         key_material = key_material.encode()
 
     return cast(
-        bytes,
+        "bytes",
         HKDF(
             master=key_material,
             key_len=64,

h/services/email.py

@@ -1,5 +1,3 @@
-# noqa: A005
-
 import smtplib
 from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta

h/services/flag.py

@@ -128,7 +128,7 @@ def flag_counts(self, annotation_ids):
 
         flag_counts = {f.annotation_id: f.flag_count for f in query}
         missing_ids = set(annotation_ids) - set(flag_counts.keys())
-        flag_counts.update({id_: 0 for id_ in missing_ids})
+        flag_counts.update(dict.fromkeys(missing_ids, 0))
 
         # Prime the cache for `flag_count()`
         self._flag_count_cache.update(flag_counts)