Merge branch 'master' into master

Author: agronholm

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Create packages
       run: python -m build
     - name: Archive packages
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: dist
         path: dist
@@ -38,7 +38,7 @@ jobs:
       id-token: write
     steps:
     - name: Retrieve packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
     - name: Upload packages
       uses: pypa/gh-action-pypi-publish@release/v1
 

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       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"]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

CHANGES.rst

@@ -1,6 +1,10 @@
 Version history
 ===============
 
+**UNRELEASED**
+
+- Dropped support for Python 3.8
+
 **3.0.0rc5**
 
 - Fixed pgvector support not working

pyproject.toml

@@ -21,13 +21,13 @@ classifiers = [
     "Topic :: Software Development :: Code Generators",
     "Programming Language :: Python",
     "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",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
     "SQLAlchemy >= 2.0.23",
     "inflect >= 4.0.0",
@@ -44,7 +44,7 @@ test = [
     "sqlacodegen[sqlmodel]",
     "pytest >= 7.4",
     "coverage >= 7",
-    "psycopg2-binary",
+    "psycopg[binary]",
     "mysql-connector-python",
 ]
 sqlmodel = ["sqlmodel >= 0.0.22"]
@@ -66,21 +66,23 @@ version_scheme = "post-release"
 local_scheme = "dirty-tag"
 
 [tool.ruff]
-select = [
-    "E", "F", "W",  # default Flake8
+src = ["src"]
+
+[tool.ruff.lint]
+extend-select = [
     "I",            # isort
     "ISC",          # flake8-implicit-str-concat
     "PGH",          # pygrep-hooks
     "RUF100",       # unused noqa (yesqa)
     "UP",           # pyupgrade
+    "W",            # pycodestyle warnings
 ]
-src = ["src"]
 
 [tool.mypy]
 strict = true
 
 [tool.pytest.ini_options]
-addopts = "-rsx --tb=short"
+addopts = "-rsfE --tb=short"
 testpaths = ["tests"]
 
 [coverage.run]
@@ -91,13 +93,10 @@ relative_files = true
 show_missing = true
 
 [tool.tox]
-legacy_tox_ini = """
-[tox]
-envlist = py38, py39, py310, py311, py312
+env_list = ["py39", "py310", "py311", "py312", "py313"]
 skip_missing_interpreters = true
-minversion = 4.0.0
 
-[testenv]
-extras = test
-commands = python -m pytest {posargs}
-"""
+[tool.tox.env_run_base]
+package = "editable"
+commands = [["python", "-m", "pytest", { replace = "posargs", extend = true }]]
+extras = ["test"]

src/sqlacodegen/models.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass, field
 from enum import Enum, auto
-from typing import Any, Tuple, Union
+from typing import Any, Union
 
 from sqlalchemy.sql.schema import Column, ForeignKeyConstraint, Table
 
@@ -52,7 +52,7 @@ def __str__(self) -> str:
         return self.name
 
 
-JoinType = Tuple[Model, Union[ColumnAttribute, str], Model, Union[ColumnAttribute, str]]
+JoinType = tuple[Model, Union[ColumnAttribute, str], Model, Union[ColumnAttribute, str]]
 
 
 @dataclass

tests/conftest.py

@@ -11,7 +11,7 @@
 def engine(request: FixtureRequest) -> Engine:
     dialect = getattr(request, "param", None)
     if dialect == "postgresql":
-        return create_engine("postgresql:///testdb")
+        return create_engine("postgresql+psycopg:///testdb")
     elif dialect == "mysql":
         return create_engine("mysql+mysqlconnector://testdb")
     else: