Tests use Sphinx 4

executablebooks · Aug 6, 2021 · 59ab648 · 59ab648
1 parent 9e983da
commit 59ab648
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/setup.py b/setup.py
@@ -28,39 +28,40 @@
     license="BSD",
     packages=find_packages(),
     install_requires=[
-        "pyyaml",
-        "docutils>=0.15",
-        "sphinx>=3,<5",
-        "click",
-        "pydata-sphinx-theme~=0.6.0",
         "beautifulsoup4>=4.6.1,<5",
+        "click",
+        "docutils>=0.15",
         'importlib-resources>=3.0,<3.5; python_version < "3.7"',
+        "pydata-sphinx-theme~=0.6.0",
+        "pyyaml",
+        "sphinx>=3,<5",
     ],
     extras_require={
         "code_style": ["pre-commit~=2.7.0"],
         "sphinx": [
+            "ablog~=0.10.13",
             "folium",
-            "numpy",
-            "matplotlib",
             "ipywidgets",
-            "pandas",
-            "nbclient",
+            "matplotlib",
             "myst-nb~=0.11.1",
-            "sphinx-togglebutton>=0.2.1",
-            "sphinx-copybutton",
+            "nbclient",
+            "numpy",
+            "pandas",
             "plotly",
-            "sphinxcontrib-bibtex~=2.2",
+            "sphinx~=4.0",  # Force Sphinx to be the latest version
+            "sphinx-copybutton",
             "sphinx-thebe",
-            "ablog~=0.10.13",
+            "sphinx-togglebutton>=0.2.1",
+            "sphinxcontrib-bibtex~=2.2",
             "sphinxext-opengraph",
         ],
         "testing": [
-            "myst_nb~=0.11.1",
-            "sphinx_thebe",
             "coverage",
+            "myst_nb~=0.11.1",
             "pytest~=6.0.1",
             "pytest-cov",
             "pytest-regressions~=2.0.1",
+            "sphinx_thebe",
         ],
         "live-dev": ["sphinx-autobuild", "web-compile~=0.2.1"],
     },

diff --git a/tox.ini b/tox.ini
@@ -16,11 +16,11 @@ envlist = py37-sphinx3
 [testenv]
 usedevelop=true
 
-[testenv:py{36,37,38}-sphinx{2,3}]
+[testenv:py{36,37,38}-sphinx{3,4}]
 extras = testing
 deps =
-    sphinx2: sphinx>=2,<3
     sphinx3: sphinx>=3,<4
+    sphinx4: sphinx>=4,<5
 commands = pytest {posargs}
 
 [testenv:py{36,37,38}-pre-commit]