Merge branch 'master' into singular-plural-search-results

# Conflicts:
#	CHANGES.rst

.github/workflows/lint.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install --upgrade "flake8>=3.5.0"
+        python -m pip install --upgrade "flake8>=6.0"
     - name: Lint with flake8
       run: flake8 .
 

.github/workflows/main.yml

@@ -23,6 +23,7 @@ env:
   FORCE_COLOR: "1"
   PYTHONDEVMODE: "1"  # -X dev
   PYTHONWARNDEFAULTENCODING: "1"  # -X warn_default_encoding
+  UV_SYSTEM_PYTHON: "1"  # make uv do global installs
 
 jobs:
   ubuntu:
@@ -32,7 +33,6 @@ jobs:
       fail-fast: false
       matrix:
         python:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
@@ -125,6 +125,38 @@ jobs:
         DO_EPUBCHECK: "1"
         EPUBCHECK_PATH: "/tmp/epubcheck/epubcheck-5.1.0/epubcheck.jar"
 
+  oldest-supported:
+    runs-on: ubuntu-latest
+    name: Oldest supported
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3"
+    - name: Check Python version
+      run: python --version --version
+    - name: Install graphviz
+      run: sudo apt-get install graphviz
+    - name: Install uv
+      run: > 
+        curl 
+        --location 
+        --fail
+        --proto '=https' --tlsv1.2 
+        --silent --show-error 
+        https://astral.sh/uv/install.sh
+        | sh
+    - name: Install dependencies
+      run: |
+        uv pip install .[test] --resolution lowest-direct
+        uv pip install alabaster==1.0.0
+    - name: Test with pytest
+      run: python -m pytest -vv --durations 25
+      env:
+        PYTHONWARNINGS: "error"  # treat all warnings as errors
+
   latex:
     runs-on: ubuntu-latest
     name: LaTeX

.github/workflows/nodejs.yml

@@ -6,15 +6,13 @@ on:
       - ".github/workflows/nodejs.yml"
       - "sphinx/themes/**.js"
       - "tests/js/**"
-      - "karma.conf.js"
       - "package.json"
       - "package-lock.json"
   pull_request:
     paths:
       - ".github/workflows/nodejs.yml"
       - "sphinx/themes/**.js"
       - "tests/js/**"
-      - "karma.conf.js"
       - "package.json"
       - "package-lock.json"
 

.mailmap

@@ -28,6 +28,7 @@ Christian Clauss <cclauss@me.com> <cclauss@bluewin.ch>
 Daniel Eades <danieleades@hotmail.com>
 Daniel Eades <danieleades@hotmail.com> <daniel.eades@hotmail.com>
 Daniel Eades <danieleades@hotmail.com> <33452915+danieleades@users.noreply.github.com>
+Daniel Eades <danieleades@hotmail.com> <daniel.eades@seebyte.com>
 
 # Daniel Hahler (https://github.com/blueyed)
 Daniel Hahler <git@thequod.de> <github@thequod.de>
@@ -37,6 +38,9 @@ Daniel Neuhäuser <dasdasich@gmail.com> <ich@danielneuhaeuser.de>
 
 David Ham <David.Ham@imperial.ac.uk> <David,Ham@imperial.ac.uk>
 
+# Dimitri Papadopoulos Orfanos (https://github.com/DimitriPapadopoulos)
+Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com>
+
 # Dmitry Shachnev (https://github.com/mitya57)
 Dmitry Shachnev <mitya57@users.noreply.github.com> <mitya57@gmail.com>
 
@@ -55,10 +59,15 @@ Eric Knibbe <eric3knibbe@gmail.com> <eric@lassosoft.com>
 
 # Hugo van Kemenade (https://github.com/hugovk)
 Hugo van Kemenade <hugovk@users.noreply.github.com>
-
+Hugo van Kemenade <hugovk@users.noreply.github.com> <1324225+hugovk@users.noreply.github.com>
 # Ignacio Fdez. Galván (https://github.com/Jellby)
 Ignacio Fdez. Galván <jellby@yahoo.com>
 
+# Jacob Mason (https://github.com/jacobmason)
+Jacob Mason <jacoblmason@gmail.com>
+Jacob Mason <jacoblmason@gmail.com> <jacob@panda>
+Jacob Mason <jacoblmason@gmail.com> <jacob@panther>
+
 # Jakob Lykke Andersen (https://github.com/jakobandersen)
 Jakob Lykke Andersen <Jakob@caput.dk> <jakobandersen@users.noreply.github.com>
 Jakob Lykke Andersen <Jakob@caput.dk> <jakob@caput.dk>
@@ -68,9 +77,9 @@ Jakub Wilk <jwilk@jwilk.net> <jwilk@debian.org>
 James Hilton-Balfe <gobot1234yt@gmail.com> <50501825+Gobot1234@users.noreply.github.com>
 
 # Jean-François B. (https://github.com/jfbu)
-Jean-François B. <jfbu@free.fr>
-Jean-François B. <jfbu@free.fr> <jfbu@users.noreply.github.com>
-Jean-François B. <jfbu@free.fr> <2589111+jfbu@users.noreply.github.com>
+Jean-François B. <jfbu@users.noreply.github.com>
+Jean-François B. <jfbu@users.noreply.github.com> <jfbu@users.noreply.github>
+Jean-François B. <jfbu@users.noreply.github.com> <2589111+jfbu@users.noreply.github.com>
 
 Jean Abou-Samra <jean@abou-samra.fr>
 
@@ -87,6 +96,9 @@ Justin Mathews <justin.mathews@isara.com> <jamathews@users.noreply.github.com>
 # Justus Magin (https://github.com/keewis)
 Justus Magin <keewis@posteo.de>
 
+# KINEBUCHI Tomohiko (https://github.com/cocoatomo)
+KINEBUCHI Tomohiko <cocoatomo77@gmail.com>
+
 Latosha Maltba <79100569+latosha-maltba@users.noreply.github.com>
 
 # Louis Maddox (https://github.com/lmmx)

.ruff.toml

@@ -1,5 +1,5 @@
-target-version = "py39"  # Pin Ruff to Python 3.9
-line-length = 95
+target-version = "py310"  # Pin Ruff to Python 3.10
+line-length = 88
 output-format = "full"
 
 extend-exclude = [
@@ -419,14 +419,17 @@ select = [
 ]
 
 # these tests need old ``typing`` generic aliases
-"tests/test_util/test_util_typing.py" = ["UP006", "UP035"]
-"tests/test_util/typing_test_data.py" = ["FA100", "UP006", "UP035"]
+"tests/test_util/test_util_typing.py" = ["UP006", "UP007", "UP035"]
+"tests/test_util/typing_test_data.py" = ["FA100", "UP006", "UP007", "UP035"]
 
 "utils/*" = [
     "T201",  # whitelist ``print`` for stdout messages
     "ANN",  # utilities don't need annotations
 ]
 
+[lint.pycodestyle]
+max-line-length = 95
+
 [lint.flake8-quotes]
 inline-quotes = "single"
 
@@ -482,18 +485,4 @@ exclude = [
     "sphinx/transforms/*",
     "sphinx/util/*",
     "sphinx/writers/*",
-    "tests/*",
-    "tests/roots/*",
-    "tests/test_builders/*",
-    "tests/test_config/*",
-    "tests/test_directives/*",
-    "tests/test_domains/*",
-    "tests/test_environment/*",
-    "tests/test_extensions/*",
-    "tests/test_intl/*",
-    "tests/test_markup/*",
-    "tests/test_pycode/*",
-    "tests/test_transforms/*",
-    "tests/test_util/*",
-    "tests/test_writers/*",
 ]