diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d24cb8d4..1f18c3b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,10 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [quality, docs, pii-annotations, django32, django40] + python-version: + - '3.8' + - '3.12' + toxenv: [quality, docs, pii-annotations, django42] steps: - uses: actions/checkout@v2 diff --git a/tox.ini b/tox.ini index 981aad49..e9252224 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40},quality,pii-annotations +envlist = py{38, 312}-django{42},quality,pii-annotations [pycodestyle] exclude = .git,.tox,migrations @@ -7,7 +7,7 @@ max-line-length = 120 [isort] line_length = 120 -known_edx = +known_edx = known_django = django known_djangoapp = model_utils known_first_party = taxonomy @@ -16,42 +16,25 @@ multi_line_output = 3 sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,DJANGOAPP,EDX,FIRSTPARTY,LOCALFOLDER [pydocstyle] -; D101 = Missing docstring in public class -; D200 = One-line docstring should fit on one line with quotes -; D203 = 1 blank line required before class docstring -; D212 = Multi-line docstring summary should start at the first line -; D215 = Section underline is over-indented (numpy style) -; D404 = First word of the docstring should not be This (numpy style) -; D405 = Section name should be properly capitalized (numpy style) -; D406 = Section name should end with a newline (numpy style) -; D407 = Missing dashed underline after section (numpy style) -; D408 = Section underline should be in the line following the section’s name (numpy style) -; D409 = Section underline should match the length of its name (numpy style) -; D410 = Missing blank line after section (numpy style) -; D411 = Missing blank line before section (numpy style) -; D412 = No blank lines allowed between a section header and its content (numpy style) -; D413 = Missing blank line after last section (numpy style) -; D414 = Section has no content (numpy style) ignore = D101,D200,D203,D212,D215,D404,D405,D406,D407,D408,D409,D410,D411,D412,D413,D414 match-dir = (?!migrations) [pytest] -DJANGO_SETTINGS_MODULE = test_settings +django_settings_module = test_settings addopts = --cov taxonomy --cov-report term-missing --cov-report xml norecursedirs = .* docs requirements site-packages -markers = +markers = use_signals: mark a test to use django signals. [testenv] -deps = - django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 +deps = + django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt -commands = +commands = pytest {posargs} [testenv:quality] -allowlist_externals = +allowlist_externals = make rm touch @@ -59,9 +42,9 @@ allowlist_externals = pycodestyle pydocstyle isort -deps = +deps = -r{toxinidir}/requirements/dev.txt -commands = +commands = touch tests/__init__.py pylint -j 0 taxonomy tests test_utils manage.py setup.py rm tests/__init__.py @@ -71,27 +54,25 @@ commands = make selfcheck [testenv:pii-annotations] -setenv = +setenv = DJANGO_SETTINGS_MODULE = test_settings -deps = +deps = -r{toxinidir}/requirements/test.txt -commands = +commands = code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage - [testenv:docs] -setenv = +setenv = PYTHONPATH = {toxinidir} -allowlist_externals = +allowlist_externals = make rm -deps = +deps = -r{toxinidir}/requirements/doc.txt -commands = - # TODO: Fix docs so they pass quality checks - # doc8 --ignore-path docs/_build README.rst docs +commands = rm -f docs/taxonomy.rst rm -f docs/modules.rst make -e -C docs clean make -e -C docs html python setup.py check --restructuredtext --strict +