Drop support for EOL Python 3.9, update dependencies, switch to ruff formatting

Author: CoolCat467

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
 ##    strategy:
 ##      fail-fast: false
 ##      matrix:
-##        python: ['3.9', '3.10', '3.11', '3.12']
+##        python: ['3.10', '3.11', '3.12', '3.13', '3.14']
 ##        arch: ['x86', 'x64']
 ##    continue-on-error: >-
 ##      ${{
@@ -64,11 +64,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ['3.10', '3.11', '3.12', '3.13', '3.14']
         check_formatting: ['0']
         extra_name: ['']
         include:
-          - python: '3.12'
+          - python: '3.14'
             check_formatting: '1'
             extra_name: ', check formatting'
     continue-on-error: >-
@@ -109,7 +109,7 @@ jobs:
 ##    strategy:
 ##      fail-fast: false
 ##      matrix:
-##        python: ['3.9', '3.10', '3.11', '3.12']
+##        python: ['3.10', '3.11', '3.12', '3.13', '3.14']
 ##    continue-on-error: >-
 ##      ${{
 ##        (

.pre-commit-config.yaml

@@ -16,15 +16,13 @@ repos:
       - id: check-merge-conflict
       - id: mixed-line-ending
       - id: check-case-conflict
+      - id: check-added-large-files
       - id: sort-simple-yaml
         files: .pre-commit-config.yaml
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.1.0
-    hooks:
-      - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.14
+    rev: v0.15.0
     hooks:
+      - id: ruff-format
       - id: ruff-check
         types: [file]
         types_or: [python, pyi, toml]
@@ -40,13 +38,14 @@ repos:
         additional_dependencies:
           - tomli
   - repo: https://github.com/adhtruong/mirrors-typos
-    rev: v1.42.3
+    rev: v1.43.4
     hooks:
       - id: typos
   - repo: https://github.com/woodruffw/zizmor-pre-commit
     rev: v1.22.0
     hooks:
       - id: zizmor
+        args: ["--fix", "--no-progress"]
   - repo: local
     hooks:
       - id: regenerate-files

README.md

@@ -4,8 +4,8 @@ Kind of like CUPS but it's for scanning, not printing.
 [![Tests](https://github.com/CoolCat467/Scanner-Server/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/CoolCat467/Scanner-Server/actions/workflows/ci.yml)
 <!-- BADGIE TIME -->
 
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/CoolCat467/Scanner-Server/main.svg)](https://results.pre-commit.ci/latest/github/CoolCat467/Scanner-Server/main)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
-[![code style: black](https://img.shields.io/badge/code_style-black-000000.svg)](https://github.com/psf/black)
 
 <!-- END BADGIE TIME -->
 

check.sh

@@ -19,17 +19,13 @@ python ./src/$PROJECT/generate_pages.py --test \
 echo "::endgroup::"
 
 # Autoformatter *first*, to avoid double-reporting errors
-# (we'd like to run further autoformatters but *after* merging;
-# see https://forum.bors.tech/t/pre-test-and-pre-merge-hooks/322)
-# autoflake --recursive --in-place .
-# pyupgrade --py3-plus $(find . -name "*.py")
-echo "::group::Black"
-if ! black --check src/$PROJECT; then
-    echo "* Black found issues" >> "$GITHUB_STEP_SUMMARY"
+echo "::group::Ruff format"
+if ! ruff format --check; then
+    echo "* Ruff formatting found issues" >> "$GITHUB_STEP_SUMMARY"
     EXIT_STATUS=1
-    black --diff src/$PROJECT
+    ruff format --diff
     echo "::endgroup::"
-    echo "::error:: Black found issues"
+    echo "::error:: Ruff formatting found issues"
 else
     echo "::endgroup::"
 fi
@@ -104,8 +100,7 @@ Problems were found by static analysis (listed above).
 To fix formatting and see remaining errors, run
 
     uv sync --extra tools
-    black src/$PROJECT
-    ruff check src/$PROJECT
+    ruff check src
     mypy
     ./check.sh
 

ci.sh

@@ -33,7 +33,7 @@ python -m uv --version
 UV_VENV_SEED="pip"
 python -m uv venv --seed --allow-existing
 
-# Determine platform and activate virtual environment accordingly
+# Determine the platform and activate the virtual environment accordingly
 case "$OSTYPE" in
   linux-gnu*|linux-musl*|darwin*)
     source .venv/bin/activate
@@ -80,9 +80,6 @@ else
     INSTALLDIR=$(python -c "import os, $PROJECT; print(os.path.dirname($PROJECT.__file__))")
     cp ../pyproject.toml "$INSTALLDIR"
 
-    # get mypy tests a nice cache
-    MYPYPATH=".." mypy --config-file= --cache-dir=./.mypy_cache -c "import $PROJECT" >/dev/null 2>/dev/null || true
-
     echo "::endgroup::"
     echo "::group:: Run Tests"
     if coverage run --rcfile=../pyproject.toml -m pytest -ra --junitxml=../test-results.xml ../tests --verbose --durations=10 $flags; then

pyproject.toml

@@ -11,18 +11,19 @@ authors = [
 description = "Scanner Web Server - Website to talk to SANE scanners."
 readme = {file = "README.md", content-type = "text/markdown"}
 license = {file = "LICENSE"}
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Web Environment",
     "Intended Audience :: End Users/Desktop",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "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",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Multimedia :: Graphics :: Capture :: Scanners",
     "Topic :: Utilities",
@@ -32,13 +33,13 @@ classifiers = [
 ]
 keywords = ["scanner", "sane", "server", "frontend"]
 dependencies = [
-    "hypercorn[trio]~=0.17.3",
-    "Pillow~=11.1.0",
+    "hypercorn[trio]~=0.18.0",
+    "Pillow~=12.1.1",
     "python-sane~=2.9.1",
     "quart~=0.20.0",
     "quart-trio~=0.12.0",
-    "trio~=0.31.0",
-    "Werkzeug~=3.1.3",
+    "trio>=0.32.0",
+    "Werkzeug~=3.1.5",
     'exceptiongroup >= 1.2.0; python_version < "3.11"',
     'tomli >= 2.0.1; python_version < "3.11"',
 ]
@@ -55,17 +56,17 @@ sanescansrv = "sanescansrv:run"
 
 [project.optional-dependencies]
 tests = [
-    "pytest>=5.0",
-    "pytest-cov",
-    "pytest-trio",
+    "pytest>=9.0.2",
+    "pytest-cov>=7.0.0",
+    "pytest-trio>=0.8.0",
     "coverage>=7.2.5",
-    "uv>=0.5.21",
-    "mypy>=1.14.1",
 ]
 tools = [
-    'black>=24.10.0; implementation_name == "cpython"',
-    "ruff>=0.9.2",
+    "uv>=0.10.2",
+    "mypy>=1.19.1",
+    "ruff>=0.15.0",
     "codespell>=2.3.0",
+    "pre-commit>=4.2.0",
 ]
 
 [tool.setuptools.package-data]
@@ -75,7 +76,10 @@ sanescansrv = ["py.typed", "templates/*", "static/*"]
 package = true
 
 [tool.mypy]
-files = ["src/sanescansrv/", "tests"]
+files = [
+    "src/sanescansrv/",
+    "tests",
+]
 check_untyped_defs = true
 show_column_numbers = true
 show_error_codes = true

src/sanescansrv/htmlgen.py

@@ -22,12 +22,11 @@
 __author__ = "CoolCat467"
 __license__ = "GNU General Public License Version 3"
 
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:  # pragma: nocover
     from collections.abc import Generator, Iterable, Mapping
-
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 
 def indent(level: int, text: str) -> str:
@@ -42,7 +41,7 @@ def deindent(level: int, text: str) -> str:
     return "\n".join(line.removeprefix(prefix) for line in text.splitlines())
 
 
-TagArg: TypeAlias = Union[str, int, float, bool]
+TagArg: TypeAlias = str | int | float | bool
 
 
 def _quote_strings(values: Iterable[TagArg]) -> Generator[str, None, None]:

src/sanescansrv/server.py

@@ -191,11 +191,7 @@ async def wrapper(  # type: ignore[misc]
             return await function(*args, **kwargs)
         except Exception as exception:
             # traceback.print_exception changed in 3.10
-            if sys.version_info < (3, 10):
-                tb = sys.exc_info()[2]
-                traceback.print_exception(etype=None, value=exception, tb=tb)
-            else:
-                traceback.print_exception(exception)
+            traceback.print_exception(exception)
 
             if isinstance(exception, HTTPException):
                 code = exception.code or code
@@ -576,11 +572,7 @@ def progress(current: int, total: int) -> None:
             )
         except (SaneError, RuntimeError) as exc:
             # traceback.print_exception changed in 3.10
-            if sys.version_info < (3, 10):
-                tb = sys.exc_info()[2]
-                traceback.print_exception(etype=None, value=exc, tb=tb)
-            else:
-                traceback.print_exception(exc)
+            traceback.print_exception(exc)
 
             APP_STORAGE["scan_status"] = (
                 ScanStatus.ERROR,

tests/test_htmlgen.py

@@ -124,9 +124,12 @@ def test_wrap_tag(
 
 
 def test_wrap_comment() -> None:
-    assert htmlgen.wrap_comment("this is comment") == """<!--
+    assert (
+        htmlgen.wrap_comment("this is comment")
+        == """<!--
 this is comment
 -->"""
+    )
 
 
 def test_wrap_comment_inline() -> None:
@@ -188,9 +191,12 @@ def test_template_no_tag() -> None:
 
 
 def test_contain_in_box_none() -> None:
-    assert htmlgen.contain_in_box("inside woo") == """<div class="box">
+    assert (
+        htmlgen.contain_in_box("inside woo")
+        == """<div class="box">
   inside woo
 </div>"""
+    )
 
 
 def test_contain_in_box_named() -> None:
@@ -334,7 +340,8 @@ def test_input_field_exception() -> None:
 
 def test_bullet_list() -> None:
     assert (
-        htmlgen.bullet_list(["one", "two"], flag="bean") == """<ul flag="bean">
+        htmlgen.bullet_list(["one", "two"], flag="bean")
+        == """<ul flag="bean">
   <li>one</li>
   <li>two</li>
 </ul>"""