Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Sphinx 7 support #1464

Merged
merged 7 commits into from
Aug 4, 2023
Merged

Add Sphinx 7 support #1464

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6507e2b
Allow Sphinx 7
benjaoming Apr 30, 2023
efc9b0e
Merge branch 'master' of github.com:readthedocs/sphinx_rtd_theme into…
benjaoming May 25, 2023
cf6b828
Also build theme docs with Sphinx 7
benjaoming May 25, 2023
81ca3c0
Merge branch 'master' of github.com:readthedocs/sphinx_rtd_theme into…
benjaoming May 25, 2023
9f022ea
Merge branch 'master' into add-sphinx-7
benjaoming Jun 15, 2023
71a9ccf
Add more tests cases on tox.ini
humitos Aug 3, 2023
9545599
Increase the Sphinx version for the docs
humitos Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sphinx>=6.1,<6.2
sphinx>=7.0,<7.1
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
ericholscher marked this conversation as resolved.
Show resolved Hide resolved
docutils <0.19
sphinxcontrib-jquery >=4,<5
tests_require =
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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
Expand Down