diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d79b6f4..bad3bbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,10 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [py38-django32, py38-django40, quality] + python-version: + - '3.8' + - '3.12' + toxenv: [py38-django32, py38-django40, quality, django42] steps: - uses: actions/checkout@v3 diff --git a/tox.ini b/tox.ini index ce71be9..9c79bf4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40}, quality +envlist = py{38, 312}-django{42}, quality [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,36 +16,34 @@ multi_line_output = 3 sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,DJANGOAPP,EDX,FIRSTPARTY,LOCALFOLDER [pytest] -DJANGO_SETTINGS_MODULE = test_settings +django_settings_module = test_settings addopts = --cov skill_tagging --cov-report term-missing --cov-report xml norecursedirs = .* docs requirements site-packages [testenv] -whitelist_externals = +whitelist_externals = make - -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 = make test - [testenv:quality] -whitelist_externals = +whitelist_externals = make rm touch pylint pycodestyle isort -deps = +deps = -r{toxinidir}/requirements/quality.txt -commands = +commands = touch tests/__init__.py pylint skill_tagging tests rm tests/__init__.py pycodestyle skill_tagging tests isort --check-only --diff tests skill_tagging test_settings.py make selfcheck +