Update tests for newer Sphinx and docutils versions

sphinx-toolbox · Sep 14, 2022 · 946b84d · 946b84d
1 parent 3c24517
commit 946b84d
Show file tree

Hide file tree

Showing 14 changed files with 537 additions and 840 deletions.
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -22,19 +22,22 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-dev-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
+          - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
+          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
+          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
+          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True}
 
     steps:
       - name: Checkout 🛎️

diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -23,19 +23,22 @@ jobs:
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-dev-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
+          - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
+          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
+          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
+          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True}
 
     steps:
       - name: Checkout 🛎️

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -22,18 +22,21 @@ jobs:
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-dev-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
+          - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
+          - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
+          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
+          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
+          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True}
 
     steps:
       - name: Checkout 🛎️

diff --git a/pyproject.toml b/pyproject.toml
@@ -35,7 +35,7 @@ base-classifiers = [
     "Topic :: Software Development :: Documentation",
     "Typing :: Typed",
 ]
-python-versions = [ "3.6", "3.7", "3.8", "3.9",]
+python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10",]
 python-implementations = [ "CPython", "PyPy",]
 platforms = [ "Windows", "macOS", "Linux",]
 license-key = "MIT"

diff --git a/repo_helper.yml b/repo_helper.yml
@@ -16,14 +16,32 @@ sphinx_html_theme: furo
 preserve_custom_theme: true
 min_coverage: 95
 
+# Versions to run tests for
 python_versions:
- - 3.6
- - 3.7
- - 3.8
- - 3.9
- - 3.10-dev
- - pypy36
- - pypy37
+ '3.6':
+  matrix_exclude:
+   sphinx:
+    - 5.0
+    - 5.1
+ '3.7':
+ '3.8':
+ '3.9':
+ '3.10':
+ 3.11-dev:
+ pypy36:
+  matrix_exclude:
+   sphinx:
+    - 4.0
+    - 4.1
+    - 4.2
+    - 4.3
+    - 4.4
+    - 4.5
+    - 5.0
+    - 5.1
+ pypy37:
+ pypy38:
+ pypy39:
 
 conda_channels:
  - conda-forge
@@ -38,6 +56,14 @@ third_party_version_matrix:
     - 3.3
     - 3.4
     - 3.5
+    - 4.0
+    - 4.1
+    - 4.2
+    - 4.3
+    - 4.4
+    - 4.5
+    - 5.0
+    - 5.1
 
 keywords:
   - sphinx
@@ -56,3 +82,6 @@ classifiers:
 
 exclude_files:
  - contributing
+
+tox_unmanaged:
+ - testenv
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-domdf-python-tools>=1.5.0
-sphinx<3.6.0,>=3.0.3
+domdf-python-tools>=3.0.0
+sphinx>=3.0.3
 sphinx-jinja2-compat>=0.1.2
diff --git a/tests/test_directive.py b/tests/test_directive.py
@@ -53,13 +53,6 @@ def original_datadir(request: Any) -> Path:
 								not_pypy("Output differs on PyPy")
 								]
 						),
-				pytest.param(
-						"37",
-						marks=[
-								only_version("3.7", reason="Output differs on 3.7"),
-								not_pypy("Output differs on PyPy")
-								]
-						),
 				pytest.param(
 						"36-pypy",
 						marks=[
@@ -70,18 +63,19 @@ def original_datadir(request: Any) -> Path:
 				pytest.param(
 						"37-pypy",
 						marks=[
-								only_version("3.7", reason="Output differs on 3.7"),
+								min_version("3.7", reason="Output differs on 3.7"),
 								only_pypy("Output differs on PyPy")
 								]
 						),
 				pytest.param(
-						"38",
+						"37",
 						marks=[
-								min_version("3.8", reason="Output differs on 3.6-3.7"),
-								max_version("3.9.99", reason="Output differs on 3.10")
+								min_version("3.7", reason="Output differs on 3.6"),
+								max_version("3.9.99", reason="Output differs on 3.10"),
+								not_pypy("Output differs on PyPy"),
 								]
 						),
-				pytest.param("310", marks=only_version("3.10", reason="Output differs on 3.10")),
+				pytest.param("310", marks=min_version("3.10", reason="Output differs on 3.10")),
 				]
 		)
 def test_output(