Skip to content

Commit

Permalink
Merge pull request #1291 from tfranzel/maintenance
Browse files Browse the repository at this point in the history
update tests targets and docs theme to something more modern
  • Loading branch information
tfranzel authored Sep 7, 2024
2 parents b401672 + c4b6bc1 commit 36cd973
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
# a list of builtin themes.
#
# html_theme = 'alabaster'
html_theme = 'sphinx_rtd_theme'
html_theme = 'furo'

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Sphinx>=4.1.0
sphinx_rtd_theme>=0.5.1
furo
typing-extensions
19 changes: 11 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[tox]
envlist =
py311-lint,py311-docs,
py312-lint,py312-docs,
{py37,py38}-django{2.2}-drf{3.10,3.11},
{py37,py38,py39}-django{3.2}-drf{3.11,3.12},
{py38,py39,py310}-django{4.0,4.1}-drf{3.13,3.14},
{py311}-django{4.1, 4.2, 5.0}-drf{3.14},
{py312}-django{4.2, 5.0}-drf{3.14},
py311-django5.0-drfmaster
py311-djangomaster-drf3.14
py311-drfmaster-djangomaster
py311-drfmaster-djangomaster-allowcontribfail
{py312}-django{5.1}-drf{3.15},
py312-django5.1-drfmaster,
py312-djangomaster-drf3.15,
py312-drfmaster-djangomaster
py312-drfmaster-djangomaster-allowcontribfail
skip_missing_interpreters = true

[testenv]
Expand All @@ -25,30 +26,32 @@ deps =
django4.1: Django>=4.1,<4.2
django4.2: Django>=4.2,<4.3
django5.0: Django>=5.0,<5.1
django5.1: Django>=5.1,<5.2

drf3.10: djangorestframework>=3.10,<3.11
drf3.11: djangorestframework>=3.11,<3.12
drf3.12: djangorestframework>=3.12,<3.13
drf3.13: djangorestframework>=3.13,<3.14
drf3.14: djangorestframework>=3.14,<3.15
drf3.15: djangorestframework>=3.15,<3.16

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

-r requirements/testing.txt
-r requirements/optionals.txt

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

[testenv:py311-lint]
[testenv:py312-lint]
commands = python runtests.py --lintonly
deps =
-r requirements/base.txt
-r requirements/linting.txt
-r requirements/linting-base.txt

[testenv:py311-docs]
[testenv:py312-docs]
commands = sphinx-build -WEa -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
deps =
-r requirements/docs.txt
Expand Down

0 comments on commit 36cd973

Please sign in to comment.