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
readthedocs · May 25, 2023 · 2442ab9 · 2442ab9
1 parent cd6b429
commit 2442ab9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,7 @@ commands:
         type: string
       sphinx-version:
         type: string
-        default: "17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,latest"
+        default: "18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,latest"
     steps:
       - checkout
       - run: pip install --user tox~=3.27
@@ -65,14 +65,14 @@ jobs:
     steps:
       - run-tox:
           version: py38
-          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"
+          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"
   py39:
     docker:
       - image: 'cimg/python:3.9'
     steps:
       - run-tox:
           version: py39
-          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"
+          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"
   py310:
     docker:
       - image: 'cimg/python:3.10'

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1 +1 @@
-sphinx>=6.0,<6.1
+sphinx>=6.1,<6.2
diff --git a/setup.cfg b/setup.cfg
@@ -47,7 +47,7 @@ python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*
 install_requires = 
 	sphinx >=1.6,<7
 	docutils <0.19
-	sphinxcontrib-jquery >=2.0.0,!=3.0.0 ; python_version > '3'
+	sphinxcontrib-jquery >=4,<5
 tests_require = 
 	pytest
 

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     # Python 2.7 support was removed in Sphinx 2
     py{27}-sphinx{17,18}{-html4,-html5,}{-qa,}
-    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,}
+    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,}
     # 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