From 04f85fc42219f8148be142482b9887e64b990f4f Mon Sep 17 00:00:00 2001 From: Benjamin Balder Bach Date: Fri, 4 Aug 2023 02:15:33 +0200 Subject: [PATCH] Add Sphinx 7 support (#1464) * Allow Sphinx 7 * Also build theme docs with Sphinx 7 * Add more tests cases on tox.ini * Increase the Sphinx version for the docs --------- Co-authored-by: Manuel Kaufmann --- docs/requirements.txt | 2 +- setup.cfg | 2 +- tox.ini | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 0559f0444..a6760f7c4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1 +1 @@ -sphinx>=6.1,<6.2 +sphinx>=7.1,<7.2 diff --git a/setup.cfg b/setup.cfg index e6a23e381..8f3744d47 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,7 +45,7 @@ zip_safe = False packages = sphinx_rtd_theme python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.* install_requires = - sphinx >=1.6,<7 + sphinx >=1.6,<8 docutils <0.19 sphinxcontrib-jquery >=4,<5 tests_require = diff --git a/tox.ini b/tox.ini index 5c94223e4..3c435820e 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,9 @@ envlist = # Python 3.10 working from Sphinx 4.2 and up py{310}-sphinx{42,43,44,45,50,51,52,53,latest}{-html4,-html5}{-qa,} # Sphinx 6+ has simplified docutils and Python support - py{38,39,10}-sphinx{60}{-html5,}{-qa,} + py{38,39,10}-sphinx{60,61,70,71}{-html5,}{-qa,} # Python 3.11 working from Sphinx 5.3 and up - py{311}-sphinx{53,60,latest}{html5}{-qa,} + py{311}-sphinx{53,60,61,70,71,latest}{html5}{-qa,} [testenv] setenv = @@ -41,6 +41,9 @@ deps = sphinx52: Sphinx>=5.2,<5.3 sphinx53: Sphinx>=5.3,<5.4 sphinx60: Sphinx>=6.0,<6.1 + sphinx61: Sphinx>=6.1,<6.2 + sphinx70: Sphinx>=7.0,<7.1 + sphinx71: Sphinx>=7.1,<7.2 # All these Sphinx versions actually break since docutils 0.18, so we need to add this upper bound # Projects using these Sphinx versions will have to do the same # See: https://github.com/readthedocs/sphinx_rtd_theme/pull/1304