From 6507e2be2a24c01a817bdac3ae020b3dd06d1652 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sun, 30 Apr 2023 09:56:14 +0200 Subject: [PATCH 1/4] Allow Sphinx 7 --- setup.cfg | 2 +- tox.ini | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4c07f193f..da43b4b1c 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 >=2.0.0,!=3.0.0 ; python_version > '3' tests_require = diff --git a/tox.ini b/tox.ini index 5f9fa7ca6..ea74e40ed 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}{-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,latest}{html5}{-qa,} [testenv] setenv = @@ -41,6 +41,8 @@ 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 # 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 From cf6b828b91b2c670824f38308afc53d6d2ca91a5 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Thu, 25 May 2023 18:46:51 +0200 Subject: [PATCH 2/4] Also build theme docs with Sphinx 7 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index b28f68ee9..ef6d9c01e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1 +1 @@ -sphinx>=6.0,<6.1 +sphinx>=7.0,<7.1 From 71a9ccf37bbad2b4e2c1976987677498c56a9d84 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 3 Aug 2023 11:59:36 +0200 Subject: [PATCH 3/4] Add more tests cases on tox.ini --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 9cbf159f5..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,61,70}{-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,61,70,latest}{html5}{-qa,} + py{311}-sphinx{53,60,61,70,71,latest}{html5}{-qa,} [testenv] setenv = @@ -43,6 +43,7 @@ deps = 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 From 95455995976fa42badb8df5a8f8eb610c4a640a4 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 3 Aug 2023 11:59:46 +0200 Subject: [PATCH 4/4] Increase the Sphinx version for the docs --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index ef6d9c01e..a6760f7c4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1 +1 @@ -sphinx>=7.0,<7.1 +sphinx>=7.1,<7.2