Skip to content

Commit 39f4258

Browse files
committed
Set max Sphinx version, due to major changes in 3.4.0, and test on multiple Sphinx versions.
1 parent 3593e3b commit 39f4258

File tree

6 files changed

+35
-16
lines changed

6 files changed

+35
-16
lines changed

.github/workflows/python_ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
fail-fast: False
2020
matrix:
2121
config:
22-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23-
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24-
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25-
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
22+
- {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3},build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3},build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3},build", experimental: False}
25+
- {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3},build", experimental: False}
2626

2727
steps:
2828
- name: Checkout 🛎️

.github/workflows/python_ci_linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
fail-fast: False
2020
matrix:
2121
config:
22-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23-
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24-
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25-
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
22+
- {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3},build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3},build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3},build", experimental: False}
25+
- {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3},build", experimental: False}
2626

2727
steps:
2828
- name: Checkout 🛎️

.github/workflows/python_ci_macos.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
fail-fast: False
2020
matrix:
2121
config:
22-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23-
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24-
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25-
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
22+
- {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3},build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3},build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3},build", experimental: False}
25+
- {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3},build", experimental: False}
2626

2727
steps:
2828
- name: Checkout 🛎️

repo_helper.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ standalone_contrib_guide: true
2424

2525
extra_sphinx_extensions:
2626
- sphinx_autofixture
27+
28+
29+
third_party_version_matrix:
30+
sphinx:
31+
- 3.2
32+
- 3.3

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
domdf-python-tools>=1.5.0
2-
sphinx>=3.3.1
2+
sphinx<3.4.0,>=3.0.3

tox.ini

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,34 @@
1616
# * pytest
1717

1818
[tox]
19-
envlist = py36, py37, py38, py39, mypy, build
19+
envlist =
20+
py36-sphinx{3.2,3.3}
21+
py37-sphinx{3.2,3.3}
22+
py38-sphinx{3.2,3.3}
23+
py39-sphinx{3.2,3.3}
24+
mypy
25+
build
2026
skip_missing_interpreters = True
2127
requires =
2228
pip>=20.3.3
2329
tox-envlist>=0.1.0
2430
isolated_build = True
2531

2632
[envlists]
27-
test = py36, py37, py38, py39
33+
test =
34+
py36-sphinx{3.2,3.3}
35+
py37-sphinx{3.2,3.3}
36+
py38-sphinx{3.2,3.3}
37+
py39-sphinx{3.2,3.3}
2838
qa = mypy, lint
2939
cov = py36, coverage
3040

3141
[testenv]
3242
setenv = PYTHONDEVMODE = 1
33-
deps = -r{toxinidir}/tests/requirements.txt
43+
deps =
44+
-r{toxinidir}/tests/requirements.txt
45+
sphinx3.2: sphinx~=3.2.0
46+
sphinx3.3: sphinx~=3.3.0
3447
commands =
3548
python --version
3649
python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs}

0 commit comments

Comments
 (0)