Building up ruff linting, still need to add pylint or pyflakes

le717 · Jun 8, 2024 · 6b190bb · 6b190bb
1 parent b59174e
commit 6b190bb
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 26 deletions.
diff --git a/db/env.py b/db/env.py
@@ -1,12 +1,10 @@
 from logging.config import fileConfig
 
 from alembic import context
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
+from sqlalchemy import engine_from_config, pool
 
 from src.app_factory import create_app
 
-
 # There's no access to current_app here so we must create our own app.
 app = create_app()
 db_uri = app.config["SQLALCHEMY_DATABASE_URI"]

diff --git a/db/versions/7e3df200a38d_remove_rotted_column.py b/db/versions/7e3df200a38d_remove_rotted_column.py
@@ -6,9 +6,8 @@
 
 """
 
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "7e3df200a38d"

diff --git a/db/versions/c41abb284c8f_add_is_dead_is_web_archive.py b/db/versions/c41abb284c8f_add_is_dead_is_web_archive.py
@@ -6,9 +6,8 @@
 
 """
 
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "c41abb284c8f"

diff --git a/get-requirements.py b/get-requirements.py
@@ -41,7 +41,7 @@ def filter_packages(packages: list, key: str) -> list:
     all_packages += filter_packages(poetry_lock["package"], "dev")
 
 # Open the requirements file for writing
-with open("requirements.txt", "wt") as f:
+with open("requirements.txt", "w") as f:
     # Write all the requested packages
     for package in all_packages:
         f.write(f"{get_package(package)}\n")
diff --git a/pyproject.toml b/pyproject.toml
@@ -39,7 +39,37 @@ target-version = "py311"
 line-length = 100
 indent-width = 4
 
+[tool.ruff.lint]
+preview = true
+
+select = [
+  "A",    # flake8-builtins
+  "ARG",  # flake8-unused-arguments
+  "BLE",  # flake8-blind-except
+  "C4",   # flake8-comprehensions
+  "C90",  # mccabe
+  "DTZ",  # flake8-datetimez
+  "ERA",  # eradicate
+  "FIX",  # flake8-fixme
+  "FLY",  # flynt
+  "FURB", # refurb
+  "I",    # isort
+  "LOG",  # flake8-logging
+  "G",    # flake8-logging-format
+  "PERF", # Perflint
+  "PIE",  # flake8-pie
+  "PTH",  # flake8-use-pathlib
+  "RET",  # flake8-return
+  "SIM",  # flake8-simplify
+  "T20",  # flake8-print
+  "TD",   # flake8-todos
+  "UP",   # pyupgrade
+]
+
 [tool.ruff.format]
 preview = true
 indent-style = "space"
 quote-style = "double"
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10
diff --git a/src/core/database/linkrot.py b/src/core/database/linkrot.py
@@ -65,6 +65,7 @@ def __update(data: RottedLinks) -> Literal[True]:
 
 
 def delete(uuid: str) -> bool:
+    """Delete an item from the linkrot log."""
     if exists := __get(uuid):
         db.session.delete(exists)
         db.session.commit()
@@ -74,7 +75,7 @@ def delete(uuid: str) -> bool:
 
 def check_all() -> list[RotResult]:
     """Check all links for rotting."""
-    return [check_one(link.id) for link in weblink.get_all()]
+    return [check_one(link.id) for link in weblink.get_all(include_rotted=False)]
 
 
 def check_one(uuid: str) -> RotResult | None:

diff --git a/src/core/database/schema.py b/src/core/database/schema.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy import Column, DateTime, Integer, String, inspect
 

diff --git a/src/core/database/weblink.py b/src/core/database/weblink.py
@@ -1,6 +1,7 @@
 import uuid
-from datetime import datetime, timezone
-from typing import Any, Optional, OrderedDict
+from collections import OrderedDict
+from datetime import UTC, datetime, timezone
+from typing import Any, Optional
 
 from markupsafe import Markup
 from sqlalchemy import func
@@ -19,7 +20,7 @@ def create(data: OrderedDict) -> dict[str, uuid.UUID]:
         title=Markup(data["title"]).striptags(),
         description=Markup(data["description"]).striptags(),
         url=Markup(data["url"]).striptags(),
-        date_added=datetime.now(timezone.utc),
+        date_added=datetime.now(UTC),
     )
     db.session.add(weblink)
     db.session.commit()
@@ -52,7 +53,7 @@ def exists(uuid: str) -> bool:
     return get(uuid) is not None
 
 
-def get(uuid: str) -> Optional[WebLink]:
+def get(uuid: str) -> WebLink | None:
     """Get a single weblink."""
     return db.session.execute(db.select(WebLink).filter_by(id=uuid)).scalars().first()
 

diff --git a/src/core/models/AuthKey.py b/src/core/models/AuthKey.py
@@ -1,6 +1,5 @@
-from marshmallow import fields, Schema
 import sys_vars
-
+from marshmallow import Schema, fields
 
 AUTH_KEYS = sys_vars.get_json("AUTH_KEYS")
 

diff --git a/src/core/models/Empty.py b/src/core/models/Empty.py
@@ -1,6 +1,5 @@
 from marshmallow import Schema
 
-
 __all__ = ["Empty"]
 
 

diff --git a/src/core/models/HttpError.py b/src/core/models/HttpError.py
@@ -1,5 +1,4 @@
-from marshmallow import fields, Schema
-
+from marshmallow import Schema, fields
 
 __all__ = ["HttpError"]
 

diff --git a/src/core/models/RotResult.py b/src/core/models/RotResult.py
@@ -1,5 +1,4 @@
-from marshmallow import fields, Schema
-
+from marshmallow import Schema, fields
 
 __all__ = ["RotResult"]
 

diff --git a/src/core/models/WebLink.py b/src/core/models/WebLink.py
@@ -1,4 +1,4 @@
-from datetime import timezone
+from datetime import UTC, timezone
 
 from marshmallow import Schema, fields
 
@@ -10,7 +10,7 @@ class WebLink(Schema):
     title = fields.String()
     description = fields.String()
     url = fields.Url()
-    date_added = fields.AwareDateTime(format="iso", default_timezone=timezone.utc)
+    date_added = fields.AwareDateTime(format="iso", default_timezone=UTC)
     is_dead = fields.Boolean()
     is_web_archive = fields.Boolean()
 

diff --git a/src/views/root.py b/src/views/root.py
@@ -1,4 +1,5 @@
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 from uuid import UUID
 
 from flask import abort, request

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 import os
+
 import pytest
 
 os.environ["SYS_VARS_PATH"] = f"{os.getcwd()}/tests/secrets"

diff --git a/tests/helpers.py b/tests/helpers.py
@@ -1,7 +1,6 @@
 import json
-from urllib.parse import urlencode
 from typing import Any
-
+from urllib.parse import urlencode
 
 __all__ = [
     "INVALID_AUTH",
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,5 @@
		from marshmallow import Schema


		__all__ = ["Empty"]


Expand Down