From 5a263753d52c1628c88392fbf52c729f5a8e79b5 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Thu, 20 Feb 2025 11:22:56 +0100
Subject: [PATCH] Run tests and build docs with Sphinx 8.2 (#1640)

* Run tests and build docs with Sphinx 8.2

* CircleCI job

* Update Read the Docs dependencies

* Update matrix

* Run tests with 3.13

* Use 8.x to build our docs
---
 .circleci/config.yml  | 17 ++++++++++++++---
 .readthedocs.yml      |  4 ++--
 docs/requirements.txt |  2 +-
 tox.ini               |  6 ++++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dfe6f364..7de15bbf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,14 +64,14 @@ jobs:
     steps:
       - run-tox:
           version: py310
-          sphinx-version: "60,61,62,70,71,72,73,74,80,latest,dev"
+          sphinx-version: "60,61,62,70,71,72,73,74,80"
   py311:
     docker:
       - image: 'cimg/python:3.11'
     steps:
       - run-tox:
           version: py311
-          sphinx-version: "72,73,74,80,latest,dev"
+          sphinx-version: "72,73,74,80,81,82,latest,dev"
 
   py312:
     docker:
@@ -79,13 +79,24 @@ jobs:
     steps:
       - run-tox:
           version: py312
-          sphinx-version: "72,73,74,80,latest,dev"
+          sphinx-version: "72,73,74,80,81,82,latest,dev"
+
+  py313:
+    docker:
+      - image: 'cimg/python:3.13'
+    steps:
+      - run-tox:
+          version: py313
+          sphinx-version: "72,73,74,80,81,82,latest,dev"
 
 workflows:
   version: 2
   tests:
     jobs:
       - build
+      - py313:
+          requires:
+            - build
       - py312:
           requires:
             - build
diff --git a/.readthedocs.yml b/.readthedocs.yml
index e0f00d70..ec28aea1 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: "ubuntu-22.04"
+  os: "ubuntu-24.04"
   tools:
-    python: "3.10"
+    python: "3.12"
 
 python:
   install:
diff --git a/docs/requirements.txt b/docs/requirements.txt
index a6760f7c..97cdc7f9 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1 @@
-sphinx>=7.1,<7.2
+sphinx~=8.0
diff --git a/tox.ini b/tox.ini
index a010796a..438157f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
     py{38,39,310}-sphinx{60,61,62,70,71}{-qa}
-    py{39,310,311,312}-sphinx{72,73,74,80}{-qa}
-    py{310,311,312}-sphinx{latest,dev}{-qa}
+    py{39,310,311,312,313}-sphinx{72,73,74,80}{-qa}
+    py{311,312,313}-sphinx{81,82,latest,dev}{-qa}
 
 [testenv]
 setenv =
@@ -17,6 +17,8 @@ deps =
     sphinx71: Sphinx>=7.1,<7.2
     sphinx72: Sphinx>=7.2,<7.3
     sphinx80: Sphinx>=8.0,<8.1
+    sphinx81: Sphinx>=8.1,<8.2
+    sphinx82: Sphinx>=8.2,<8.3
     sphinxlatest: Sphinx
     sphinxdev: https://github.com/sphinx-doc/sphinx/archive/refs/heads/master.zip
 allowlist_externals =