Skip to content
This repository was archived by the owner on Apr 9, 2025. It is now read-only.

Commit b36f128

Browse files
committed
Update test suite: run Python 3.10
1 parent 17ee681 commit b36f128

File tree

2 files changed

+48
-31
lines changed

2 files changed

+48
-31
lines changed

.circleci/config.yml

+35-26
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,63 @@
11
version: 2.1
22

33
commands:
4-
run-tests:
4+
run-tox:
5+
description: "Run tox"
6+
parameters:
7+
version:
8+
type: string
9+
sphinx-version:
10+
type: string
11+
default: "18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,latest"
512
steps:
613
- checkout
714
- run: pip install --user tox
8-
- run: tox
15+
- run: tox -e "<<parameters.version>>-sphinx{<<parameters.sphinx-version>>}"
916

1017
jobs:
11-
tests-py36:
18+
py36:
1219
docker:
1320
- image: 'cimg/python:3.6'
14-
environment:
15-
# Select only the environments that match the Python version we have
16-
# installed in this Docker image (e.g. `py36-*`). Use TOX_SKIP_ENV with
17-
# a negated regex to only match the environment we want to run. Read
18-
# more at https://github.com/tox-dev/tox/issues/238
19-
TOX_SKIP_ENV: '^(?!py36-)'
2021
steps:
21-
- run-tests
22-
tests-py37:
22+
- run-tox:
23+
version: py36
24+
py37:
2325
docker:
2426
- image: 'cimg/python:3.7'
25-
environment:
26-
TOX_SKIP_ENV: '^(?!py37-)'
2727
steps:
28-
- run-tests
28+
- run-tox:
29+
version: py37
2930

30-
tests-py38:
31+
py38:
3132
docker:
3233
- image: 'cimg/python:3.8'
33-
environment:
34-
TOX_SKIP_ENV: '^(?!py38-)'
3534
steps:
36-
- run-tests
35+
- run-tox:
36+
version: py38
3737

38-
tests-py39:
38+
py39:
3939
docker:
4040
- image: 'cimg/python:3.9'
41-
environment:
42-
TOX_SKIP_ENV: '^(?!py39-)'
4341
steps:
44-
- run-tests
42+
- run-tox:
43+
version: py39
4544

45+
py310:
46+
docker:
47+
- image: 'cimg/python:3.10'
48+
steps:
49+
- run-tox:
50+
version: py310
51+
# Do not run tests for Python 3.10 and Sphinx3 because it's broken
52+
# See https://github.com/sphinx-doc/sphinx/issues/9816
53+
sphinx-version: "18,20,21,22,23,24,40,41,42,latest"
4654

4755
workflows:
4856
version: 2
4957
test:
5058
jobs:
51-
- tests-py36
52-
- tests-py37
53-
- tests-py38
54-
- tests-py39
59+
- py36
60+
- py37
61+
- py38
62+
- py39
63+
- py310

tox.ini

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[tox]
22
envlist =
33
docs
4-
py{36,37,38,39}-sphinx{18,20,21,22,23,24,30,31,32,33,34,35,latest}
4+
py{36,37,38,39}-sphinx{18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,latest}
5+
py{310}-sphinx{18,20,21,22,23,24,40,41,42,latest}
56

67
[testenv]
78
deps =
@@ -22,10 +23,20 @@ deps =
2223
sphinx34: sphinx~=3.4.0
2324
sphinx35: sphinx~=3.5.0
2425
sphinx40: sphinx~=4.0.0
26+
sphinx41: sphinx~=4.1.0
27+
sphinx42: sphinx~=4.2.0
2528
sphinxlatest: sphinx
2629
commands = pytest {posargs}
2730

28-
[testenv:py38-sphinx30]
31+
# Pin docutils<0.18 for all Python versions using Sphinx 1.x, 2.x, 3.x, 4.0, 4.1
32+
# since it's incompatible and generating lot of errors
33+
# https://tox.wiki/en/latest/config.html#generating-environments-conditional-settings
34+
[testenv:py{36,37,38,39,310}-sphinx{18,20,21,22,23,24,30,31,32,33,34,35,40,41]
35+
deps =
36+
{[testenv]deps}
37+
docutils<0.18
38+
39+
[testenv:py310-sphinx42]
2940
deps =
3041
{[testenv]deps}
3142
pytest-cov
@@ -36,8 +47,5 @@ deps =
3647
-r {toxinidir}/docs/requirements.txt
3748
.
3849
changedir = {toxinidir}/docs
39-
setenv =
40-
READTHEDOCS_PROJECT = sphinx-hoverxref
41-
READTHEDOCS_VERSION = latest
4250
commands =
4351
sphinx-build -W -E -q -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

0 commit comments

Comments
 (0)