Update CI and support for currently supported Python versions (#63)

* Update CI and support for currently supported Python versions

Fixes #57

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* chore: remove unused imports

Signed-off-by: Mike Fiedler <[email protected]>

---------

Signed-off-by: Mike Fiedler <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: miketheman

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
     - uses: actions/checkout@v4
       with:

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
     rev: v3.19.1
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
 -   repo: https://github.com/jendrikseipp/vulture
     rev: 'v2.14'
     hooks:

flake8_sqlalchemy/checkers/_base.py

@@ -1,5 +1,5 @@
 import ast
-from typing import Any, List, Optional
+from typing import Any, Optional
 
 from ..issue import Issue
 
@@ -13,5 +13,5 @@ def get_call_name(node: ast.Call) -> Optional[str]:
             return node.func.id
         return None
 
-    def run(self, node: Any) -> List[Issue]:  # TODO correct type hint
+    def run(self, node: Any) -> list[Issue]:  # TODO correct type hint
         raise NotImplementedError

flake8_sqlalchemy/checkers/column_comment.py

@@ -1,7 +1,6 @@
 """Checks that Columns have comments."""
 
 import ast
-from typing import List
 
 from ..issue import Issue
 from ._base import Checker
@@ -13,13 +12,13 @@ class SQA200(Issue):
 
 
 class ColumnCommentChecker(Checker):
-    def run(self, node: ast.Call) -> List[Issue]:
+    def run(self, node: ast.Call) -> list[Issue]:
         """
         Checks if a column is missing a `comment` keyword argument on:
         - `sqlalchemy.Column`
         - `sqlalchemy.orm.mapped_column`
         """
-        issues: List[Issue] = []
+        issues: list[Issue] = []
 
         if self.is_column(node) and not self.has_comment(node):
             issues.append(SQA200(node.lineno, node.col_offset))

flake8_sqlalchemy/checkers/import_alias.py

@@ -1,7 +1,6 @@
 """Checks that the sqlalchemy import is aliased as `sa` or `db`."""
 
 import ast
-from typing import List
 
 from ..issue import Issue
 from ._base import Checker
@@ -13,12 +12,12 @@ class SQA100(Issue):
 
 
 class ImportAliasChecker(Checker):
-    def run(self, node: ast.Import) -> List[Issue]:
+    def run(self, node: ast.Import) -> list[Issue]:
         """
         Checks if the `sqlalchemy` module is imported with an alias
         other than `sa` or `db`.
         """
-        issues: List[Issue] = []
+        issues: list[Issue] = []
 
         for alias in node.names:
             if alias.name == "sqlalchemy" and alias.asname not in (None, "sa", "db"):

flake8_sqlalchemy/checkers/relationship_backref_checker.py

@@ -1,7 +1,6 @@
 """Checker for detecting `backref` usage in SQLAlchemy relationships."""
 
 import ast
-from typing import List
 
 from ..issue import Issue
 from ._base import Checker
@@ -13,12 +12,12 @@ class SQA300(Issue):
 
 
 class RelationshipBackrefChecker(Checker):
-    def run(self, node: ast.Call) -> List[Issue]:
+    def run(self, node: ast.Call) -> list[Issue]:
         """
         Checks if a relationship() call uses `backref` and suggests
         `back_populates` instead.
         """
-        issues: List[Issue] = []
+        issues: list[Issue] = []
 
         if self.is_relationship_with_backref(node):
             issues.append(SQA300(node.lineno, node.col_offset))

flake8_sqlalchemy/plugin.py

@@ -1,6 +1,7 @@
 import ast
 import importlib.metadata
-from typing import Any, Dict, Generator, List, Tuple, Type
+from collections.abc import Generator
+from typing import Any
 
 from .checkers import (
     ColumnCommentChecker,
@@ -11,7 +12,7 @@
 
 
 class Visitor(ast.NodeVisitor):
-    checkers: Dict[str, List[Any]] = {
+    checkers: dict[str, list[Any]] = {
         "Call": [
             ColumnCommentChecker(),
             RelationshipBackrefChecker(),
@@ -22,7 +23,7 @@ class Visitor(ast.NodeVisitor):
     }
 
     def __init__(self) -> None:
-        self.issues: List[Issue] = []
+        self.issues: list[Issue] = []
 
     def capture_issues_from(self, visitor: str, node: ast.AST) -> None:
         for checker in self.checkers[visitor]:
@@ -45,7 +46,7 @@ class Plugin:
     def __init__(self, tree: ast.AST) -> None:
         self._tree = tree
 
-    def run(self) -> Generator[Tuple[int, int, str, Type[Any]], None, None]:
+    def run(self) -> Generator[tuple[int, int, str, type[Any]], None, None]:
         visitor = Visitor()
         visitor.visit(self._tree)
 

pyproject.toml

@@ -21,10 +21,11 @@ classifiers = [
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
     "Topic :: Software Development :: Testing",
@@ -37,7 +38,7 @@ classifiers = [
 "SQA" = "flake8_sqlalchemy:Plugin"
 
 [tool.poetry.dependencies]
-python = "^3.8.1"
+python = "^3.9.0"
 flake8 = ">=6,<8"
 
 [tool.poetry.group.dev.dependencies]
@@ -47,13 +48,6 @@ pytest = ">=7.3,<9.0"
 pytest-cov = ">=4,<6"
 sqlalchemy = "^2.0"
 
-# greenlet is a dependency of SQLAlchemy, unrelease Python 3.12-compatible
-# remove this once greenlet 3.0.0 is released.
-greenlet  = [
-  { version = "^3.0.0rc1", python = "^3.12.0rc1" },
-  { version = "<3.0.0a0", python = "<3.12" },
-]
-
 [tool.coverage.run]
 branch = true
 source = ["flake8_sqlalchemy"]

tests/conftest.py

@@ -1,7 +1,6 @@
 """Testing configs, utilities, and fixtures for the tests package."""
 
 import ast
-from typing import Set
 
 import pytest
 
@@ -10,7 +9,7 @@
 
 class Helpers:
     @staticmethod
-    def results(s: str) -> Set[str]:
+    def results(s: str) -> set[str]:
         tree = ast.parse(s)
         plugin = Plugin(tree)
         return {f"{line}:{col + 1} {msg}" for line, col, msg, _ in plugin.run()}