Skip to content

Commit 45785e8

Browse files
domdfcodingdomdfcoding
committed
Test on newer sphinx versions up to 4.5
1 parent 25cbabf commit 45785e8

File tree

6 files changed

+122
-79
lines changed

6 files changed

+122
-79
lines changed

‎.github/workflows/python_ci.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,20 @@ jobs:
2222
runs-on: "windows-2019"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9'
25+
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8,pypy-3.9'
2626

2727
strategy:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
32-
- {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
33-
- {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
34-
- {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
35-
- {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
36-
- {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
37-
- {python-version: "3.13", testenvs: "py313-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: False}
39-
- {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
40-
- {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
31+
- {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},build", experimental: False}
32+
- {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},build", experimental: False}
33+
- {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},build", experimental: False}
34+
- {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},build", experimental: False}
35+
- {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
36+
- {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},build", experimental: False}
37+
- {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},build", experimental: False}
38+
- {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: True}
4139

4240
steps:
4341
- name: Checkout 🛎️

‎.github/workflows/python_ci_linux.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,20 @@ jobs:
2323
runs-on: "ubuntu-22.04"
2424
continue-on-error: ${{ matrix.config.experimental }}
2525
env:
26-
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9'
26+
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8,pypy-3.9'
2727

2828
strategy:
2929
fail-fast: False
3030
matrix:
3131
config:
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-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
36-
- {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
37-
- {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
38-
- {python-version: "3.13", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
39-
- {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
40-
- {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
41-
- {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
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},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},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},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},build", experimental: False}
36+
- {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
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},build", experimental: False}
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},build", experimental: False}
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},build", experimental: True}
4240

4341
steps:
4442
- name: Checkout 🛎️

‎.github/workflows/python_ci_macos.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,20 @@ jobs:
2222
runs-on: "macos-${{ matrix.config.os-ver }}"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9'
25+
USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8,pypy-3.9'
2626

2727
strategy:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.7", os-ver: "13", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
32-
- {python-version: "3.8", os-ver: "14", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
33-
- {python-version: "3.9", os-ver: "14", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
34-
- {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
35-
- {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
36-
- {python-version: "3.12", os-ver: "14", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
37-
- {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
38-
- {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
39-
- {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5},build", experimental: False}
40-
- {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5},build", experimental: True}
31+
- {python-version: "3.7", os-ver: "13", testenvs: "py37-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.8", os-ver: "14", testenvs: "py38-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.9", os-ver: "14", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
34+
- {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
35+
- {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
36+
- {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
37+
- {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
38+
- {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: True}
4139

4240
steps:
4341
- 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 :: Utilities",
3636
"Typing :: Typed",
3737
]
38-
python-versions = [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13",]
38+
python-versions = [ "3.7", "3.8", "3.9", "3.10", "3.11",]
3939
python-implementations = [ "CPython", "PyPy",]
4040
platforms = [ "Windows", "macOS", "Linux",]
4141
license-key = "MIT"

‎repo_helper.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ python_versions:
2727
- 3.9
2828
- "3.10"
2929
- "3.11"
30-
- "3.12"
31-
- "3.13"
3230
- pypy37
3331
- pypy38
3432
- pypy39
@@ -44,6 +42,12 @@ third_party_version_matrix:
4442
- 3.3
4543
- 3.4
4644
- 3.5
45+
- 4.0
46+
- 4.1
47+
- 4.2
48+
- 4.3
49+
- 4.4
50+
- 4.5
4751

4852
classifiers:
4953
- 'Development Status :: 4 - Beta'

‎tox.ini

Lines changed: 88 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@
2222

2323
[tox]
2424
envlist =
25-
py37-sphinx{3.2,3.3,3.4,3.5}
26-
py38-sphinx{3.2,3.3,3.4,3.5}
27-
py39-sphinx{3.2,3.3,3.4,3.5}
28-
py310-sphinx{3.2,3.3,3.4,3.5}
29-
py311-sphinx{3.2,3.3,3.4,3.5}
30-
py312-sphinx{3.2,3.3,3.4,3.5}
31-
py313-sphinx{3.2,3.3,3.4,3.5}
32-
pypy37-sphinx{3.2,3.3,3.4,3.5}
33-
pypy38-sphinx{3.2,3.3,3.4,3.5}
34-
pypy39-sphinx{3.2,3.3,3.4,3.5}
25+
py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
26+
py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
27+
py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
28+
py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
29+
py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
30+
pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
31+
pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
32+
pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
3533
mypy
3634
build
3735
skip_missing_interpreters = True
@@ -44,16 +42,14 @@ requires =
4442

4543
[envlists]
4644
test =
47-
py37-sphinx{3.2,3.3,3.4,3.5}
48-
py38-sphinx{3.2,3.3,3.4,3.5}
49-
py39-sphinx{3.2,3.3,3.4,3.5}
50-
py310-sphinx{3.2,3.3,3.4,3.5}
51-
py311-sphinx{3.2,3.3,3.4,3.5}
52-
py312-sphinx{3.2,3.3,3.4,3.5}
53-
py313-sphinx{3.2,3.3,3.4,3.5}
54-
pypy37-sphinx{3.2,3.3,3.4,3.5}
55-
pypy38-sphinx{3.2,3.3,3.4,3.5}
56-
pypy39-sphinx{3.2,3.3,3.4,3.5}
45+
py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
46+
py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
47+
py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
48+
py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
49+
py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
50+
pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
51+
pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
52+
pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
5753
qa = mypy, lint
5854
cov = py38-sphinx3.2, coverage
5955
raspi = py3{7,8,9,10}-sphinx3.5
@@ -63,19 +59,6 @@ setenv =
6359
PYTHONDEVMODE=1
6460
PIP_DISABLE_PIP_VERSION_CHECK=1
6561

66-
[testenv:py313]
67-
download = True
68-
setenv =
69-
PYTHONDEVMODE=1
70-
PIP_DISABLE_PIP_VERSION_CHECK=1
71-
UNSAFE_PYO3_SKIP_VERSION_CHECK=1
72-
73-
[testenv:py312]
74-
download = True
75-
setenv =
76-
PYTHONDEVMODE=1
77-
PIP_DISABLE_PIP_VERSION_CHECK=1
78-
7962
[testenv:docs]
8063
setenv = SHOW_TODOS = 1
8164
passenv = SPHINX_BUILDER
@@ -250,13 +233,13 @@ filterwarnings =
250233
always::FutureWarning
251234
markers = sphinx
252235
253-
[testenv:py312-sphinx{3.2,3.3,3.4,3.5}]
236+
[testenv:py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}]
254237
download = True
255238
setenv =
256239
PYTHONDEVMODE=1
257240
PIP_DISABLE_PIP_VERSION_CHECK=1
258241
259-
[testenv:py313-sphinx{3.2,3.3,3.4,3.5}]
242+
[testenv:py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}]
260243
download = True
261244
setenv =
262245
PYTHONDEVMODE=1
@@ -270,10 +253,17 @@ setenv =
270253
SETUPTOOLS_USE_DISTUTILS=stdlib
271254
deps =
272255
-r{toxinidir}/tests/requirements.txt
273-
sphinx3.2: sphinx~=3.2.0
274-
sphinx3.3: sphinx~=3.3.0
275-
sphinx3.4: sphinx~=3.4.0
276-
sphinx3.5: sphinx~=3.5.0
256+
sphinx3.2: sphinx==3.2.1
257+
sphinx3.3: sphinx==3.3.1
258+
sphinx3.4: sphinx==3.4.3
259+
sphinx3.5: sphinx==3.5.4
260+
sphinx4.0: sphinx==4.0.3
261+
sphinx4.1: sphinx==4.1.2
262+
sphinx4.2: sphinx==4.2.0
263+
sphinx4.3: sphinx==4.3.2
264+
sphinx4.4: sphinx==4.4.0
265+
sphinx4.5: sphinx==4.5.0
266+
277267
sphinxcontrib-applehelp<=1.0.4
278268
sphinxcontrib-devhelp<=1.0.2
279269
sphinxcontrib-htmlhelp<=2.0.1
@@ -285,7 +275,62 @@ commands =
285275
python --version
286276
python -m pytest --cov=sphinx_highlights -r aR tests/ {posargs}
287277
288-
[testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5}]
289-
setenv =
290-
PYTHONDEVMODE=1
291-
PIP_DISABLE_PIP_VERSION_CHECK=1
278+
[testenv:py{39,310,311,312,313,py39}-sphinx7.2]
279+
deps =
280+
-r{toxinidir}/tests/requirements.txt
281+
-r{toxinidir}/requirements.txt
282+
commands =
283+
pip install sphinx==7.2.6
284+
pip install pygments>=2.7.4,<=2.13.0
285+
python --version
286+
python -m pytest --cov=sphinx_highlights -r aR tests/ {posargs}
287+
288+
[testenv:py{39,310,311,312,313,py39}-sphinx7.3]
289+
deps =
290+
-r{toxinidir}/tests/requirements.txt
291+
-r{toxinidir}/requirements.txt
292+
commands =
293+
pip install sphinx==7.3.7
294+
pip install pygments>=2.7.4,<=2.13.0
295+
python --version
296+
python -m pytest --cov=sphinx_highlights -r aR tests/ {posargs}
297+
298+
[testenv:py{39,310,311,312,313,py39}-sphinx7.4]
299+
deps =
300+
-r{toxinidir}/tests/requirements.txt
301+
-r{toxinidir}/requirements.txt
302+
commands =
303+
pip install sphinx==7.4.7
304+
pip install pygments>=2.7.4,<=2.13.0
305+
python --version
306+
python -m pytest --cov=sphinx_highlights -r aR tests/ {posargs}
307+
308+
[testenv:py{310,311,312,313}-sphinx8.0]
309+
deps =
310+
-r{toxinidir}/tests/requirements.txt
311+
-r{toxinidir}/requirements.txt
312+
commands =
313+
pip install sphinx==8.0.2
314+
pip install pygments>=2.7.4,<=2.13.0
315+
python --version
316+
python -m pytest --cov=sphinx_highlights -r aR tests/ {posargs}
317+
318+
[testenv:py{310,311,312,313}-sphinx8.1]
319+
deps =
320+
-r{toxinidir}/tests/requirements.txt
321+
-r{toxinidir}/requirements.txt
322+
commands =
323+
pip install sphinx==8.1.3
324+
pip install pygments>=2.7.4,<=2.13.0
325+
python --version
326+
python -m pytest --cov=sphinx_highlights -r aR tests/ {posargs}
327+
328+
[testenv:py{311,312,313}-sphinx8.2]
329+
deps =
330+
-r{toxinidir}/tests/requirements.txt
331+
-r{toxinidir}/requirements.txt
332+
commands =
333+
pip install sphinx==8.2.1
334+
pip install pygments>=2.7.4,<=2.13.0
335+
python --version
336+
python -m pytest --cov=sphinx_highlights -r aR tests/ {posargs}

0 commit comments

Comments
 (0)