Skip to content

Commit 36cd973

Browse files
authored
Merge pull request #1291 from tfranzel/maintenance
update tests targets and docs theme to something more modern
2 parents b401672 + c4b6bc1 commit 36cd973

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
# a list of builtin themes.
8989
#
9090
# html_theme = 'alabaster'
91-
html_theme = 'sphinx_rtd_theme'
91+
html_theme = 'furo'
9292

9393
# Add any paths that contain custom static files (such as style sheets) here,
9494
# relative to this directory. They are copied after the builtin static files,

requirements/docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Sphinx>=4.1.0
2-
sphinx_rtd_theme>=0.5.1
2+
furo
33
typing-extensions

tox.ini

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[tox]
22
envlist =
3-
py311-lint,py311-docs,
3+
py312-lint,py312-docs,
44
{py37,py38}-django{2.2}-drf{3.10,3.11},
55
{py37,py38,py39}-django{3.2}-drf{3.11,3.12},
66
{py38,py39,py310}-django{4.0,4.1}-drf{3.13,3.14},
77
{py311}-django{4.1, 4.2, 5.0}-drf{3.14},
88
{py312}-django{4.2, 5.0}-drf{3.14},
9-
py311-django5.0-drfmaster
10-
py311-djangomaster-drf3.14
11-
py311-drfmaster-djangomaster
12-
py311-drfmaster-djangomaster-allowcontribfail
9+
{py312}-django{5.1}-drf{3.15},
10+
py312-django5.1-drfmaster,
11+
py312-djangomaster-drf3.15,
12+
py312-drfmaster-djangomaster
13+
py312-drfmaster-djangomaster-allowcontribfail
1314
skip_missing_interpreters = true
1415

1516
[testenv]
@@ -25,30 +26,32 @@ deps =
2526
django4.1: Django>=4.1,<4.2
2627
django4.2: Django>=4.2,<4.3
2728
django5.0: Django>=5.0,<5.1
29+
django5.1: Django>=5.1,<5.2
2830

2931
drf3.10: djangorestframework>=3.10,<3.11
3032
drf3.11: djangorestframework>=3.11,<3.12
3133
drf3.12: djangorestframework>=3.12,<3.13
3234
drf3.13: djangorestframework>=3.13,<3.14
3335
drf3.14: djangorestframework>=3.14,<3.15
36+
drf3.15: djangorestframework>=3.15,<3.16
3437

3538
djangomaster: https://github.com/django/django/archive/main.tar.gz
3639
drfmaster: https://github.com/encode/django-rest-framework/archive/master.tar.gz
3740

3841
-r requirements/testing.txt
3942
-r requirements/optionals.txt
4043

41-
[testenv:py311-drfmaster-djangomaster-allowcontribfail]
44+
[testenv:py312-drfmaster-djangomaster-allowcontribfail]
4245
commands = python runtests.py {posargs:--fast --cov=drf_spectacular --cov=tests --cov-report=xml --allow-contrib-fail}
4346

44-
[testenv:py311-lint]
47+
[testenv:py312-lint]
4548
commands = python runtests.py --lintonly
4649
deps =
4750
-r requirements/base.txt
4851
-r requirements/linting.txt
4952
-r requirements/linting-base.txt
5053

51-
[testenv:py311-docs]
54+
[testenv:py312-docs]
5255
commands = sphinx-build -WEa -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
5356
deps =
5457
-r requirements/docs.txt

0 commit comments

Comments
 (0)