Skip to content

Commit 2442ab9

Browse files
authored
Remove version logic on sphinxcontrib-jquery, require >=4,<5 (#1446)
* Remove version logic on sphinxcontrib-jquery, require >=4,<5 * Bump to Sphinx 6.1.x * Remove testing for Sphinx 1.7, sphinxcontrib-jquery 4.x blocks it
1 parent cd6b429 commit 2442ab9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ commands:
1111
type: string
1212
sphinx-version:
1313
type: string
14-
default: "17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,latest"
14+
default: "18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,latest"
1515
steps:
1616
- checkout
1717
- run: pip install --user tox~=3.27
@@ -65,14 +65,14 @@ jobs:
6565
steps:
6666
- run-tox:
6767
version: py38
68-
sphinx-version: "17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,60,latest"
68+
sphinx-version: "18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,60,latest"
6969
py39:
7070
docker:
7171
- image: 'cimg/python:3.9'
7272
steps:
7373
- run-tox:
7474
version: py39
75-
sphinx-version: "17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,60,latest"
75+
sphinx-version: "18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,60,latest"
7676
py310:
7777
docker:
7878
- image: 'cimg/python:3.10'

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sphinx>=6.0,<6.1
1+
sphinx>=6.1,<6.2

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*
4747
install_requires =
4848
sphinx >=1.6,<7
4949
docutils <0.19
50-
sphinxcontrib-jquery >=2.0.0,!=3.0.0 ; python_version > '3'
50+
sphinxcontrib-jquery >=4,<5
5151
tests_require =
5252
pytest
5353

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist =
33
# Python 2.7 support was removed in Sphinx 2
44
py{27}-sphinx{17,18}{-html4,-html5,}{-qa,}
5-
py{36,37,38,39}-sphinx{17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52}{-html4,-html5,}{-qa,}
5+
py{36,37,38,39}-sphinx{18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52}{-html4,-html5,}{-qa,}
66
# Python 3.10 working from Sphinx 4.2 and up
77
py{310}-sphinx{42,43,44,45,50,51,52,53,latest}{-html4,-html5}{-qa,}
88
# Sphinx 6+ has simplified docutils and Python support

0 commit comments

Comments
 (0)