Skip to content

Commit 946b84d

Browse files
domdfcodingdomdfcoding
committed
Update tests for newer Sphinx and docutils versions
1 parent 3c24517 commit 946b84d

14 files changed

+537
-840
lines changed

‎.github/workflows/python_ci.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,22 @@ jobs:
2222
runs-on: "windows-2019"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.6,pypy-3.7'
25+
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'
2626

2727
strategy:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
32-
- {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
33-
- {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
34-
- {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
35-
- {python-version: "3.10", testenvs: "py310-dev-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
31+
- {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}
32+
- {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}
33+
- {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}
34+
- {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}
35+
- {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}
36+
- {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}
3637
- {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
37-
- {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
38+
- {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}
39+
- {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}
40+
- {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}
3841

3942
steps:
4043
- name: Checkout 🛎️

‎.github/workflows/python_ci_linux.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,22 @@ jobs:
2323
runs-on: "ubuntu-20.04"
2424
continue-on-error: ${{ matrix.config.experimental }}
2525
env:
26-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.6,pypy-3.7'
26+
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'
2727

2828
strategy:
2929
fail-fast: False
3030
matrix:
3131
config:
32-
- {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
33-
- {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
34-
- {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
35-
- {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
36-
- {python-version: "3.10", testenvs: "py310-dev-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
32+
- {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}
33+
- {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}
34+
- {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}
35+
- {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}
36+
- {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}
37+
- {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}
3738
- {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
38-
- {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
39+
- {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}
40+
- {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}
41+
- {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}
3942

4043
steps:
4144
- name: Checkout 🛎️

‎.github/workflows/python_ci_macos.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,21 @@ jobs:
2222
runs-on: "macos-latest"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.7'
25+
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'
2626

2727
strategy:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
32-
- {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
33-
- {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
34-
- {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
35-
- {python-version: "3.10", testenvs: "py310-dev-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
36-
- {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
31+
- {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}
32+
- {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}
33+
- {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}
34+
- {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}
35+
- {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}
36+
- {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}
37+
- {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}
38+
- {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}
39+
- {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}
3740

3841
steps:
3942
- name: Checkout 🛎️

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ base-classifiers = [
3535
"Topic :: Software Development :: Documentation",
3636
"Typing :: Typed",
3737
]
38-
python-versions = [ "3.6", "3.7", "3.8", "3.9",]
38+
python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10",]
3939
python-implementations = [ "CPython", "PyPy",]
4040
platforms = [ "Windows", "macOS", "Linux",]
4141
license-key = "MIT"

‎repo_helper.yml‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,32 @@ sphinx_html_theme: furo
1616
preserve_custom_theme: true
1717
min_coverage: 95
1818

19+
# Versions to run tests for
1920
python_versions:
20-
- 3.6
21-
- 3.7
22-
- 3.8
23-
- 3.9
24-
- 3.10-dev
25-
- pypy36
26-
- pypy37
21+
'3.6':
22+
matrix_exclude:
23+
sphinx:
24+
- 5.0
25+
- 5.1
26+
'3.7':
27+
'3.8':
28+
'3.9':
29+
'3.10':
30+
3.11-dev:
31+
pypy36:
32+
matrix_exclude:
33+
sphinx:
34+
- 4.0
35+
- 4.1
36+
- 4.2
37+
- 4.3
38+
- 4.4
39+
- 4.5
40+
- 5.0
41+
- 5.1
42+
pypy37:
43+
pypy38:
44+
pypy39:
2745

2846
conda_channels:
2947
- conda-forge
@@ -38,6 +56,14 @@ third_party_version_matrix:
3856
- 3.3
3957
- 3.4
4058
- 3.5
59+
- 4.0
60+
- 4.1
61+
- 4.2
62+
- 4.3
63+
- 4.4
64+
- 4.5
65+
- 5.0
66+
- 5.1
4167

4268
keywords:
4369
- sphinx
@@ -56,3 +82,6 @@ classifiers:
5682

5783
exclude_files:
5884
- contributing
85+
86+
tox_unmanaged:
87+
- testenv

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
domdf-python-tools>=1.5.0
2-
sphinx<3.6.0,>=3.0.3
1+
domdf-python-tools>=3.0.0
2+
sphinx>=3.0.3
33
sphinx-jinja2-compat>=0.1.2

‎tests/test_directive.py‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ def original_datadir(request: Any) -> Path:
5353
not_pypy("Output differs on PyPy")
5454
]
5555
),
56-
pytest.param(
57-
"37",
58-
marks=[
59-
only_version("3.7", reason="Output differs on 3.7"),
60-
not_pypy("Output differs on PyPy")
61-
]
62-
),
6356
pytest.param(
6457
"36-pypy",
6558
marks=[
@@ -70,18 +63,19 @@ def original_datadir(request: Any) -> Path:
7063
pytest.param(
7164
"37-pypy",
7265
marks=[
73-
only_version("3.7", reason="Output differs on 3.7"),
66+
min_version("3.7", reason="Output differs on 3.7"),
7467
only_pypy("Output differs on PyPy")
7568
]
7669
),
7770
pytest.param(
78-
"38",
71+
"37",
7972
marks=[
80-
min_version("3.8", reason="Output differs on 3.6-3.7"),
81-
max_version("3.9.99", reason="Output differs on 3.10")
73+
min_version("3.7", reason="Output differs on 3.6"),
74+
max_version("3.9.99", reason="Output differs on 3.10"),
75+
not_pypy("Output differs on PyPy"),
8276
]
8377
),
84-
pytest.param("310", marks=only_version("3.10", reason="Output differs on 3.10")),
78+
pytest.param("310", marks=min_version("3.10", reason="Output differs on 3.10")),
8579
]
8680
)
8781
def test_output(

0 commit comments

Comments
 (0)