diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 0df8e4b..0000000 --- a/.coveragerc +++ /dev/null @@ -1,3 +0,0 @@ -[run] -branch = True -source = axes diff --git a/pyproject.toml b/pyproject.toml index 508294e..909f2cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,57 @@ [build-system] requires = ["setuptools>=30.3.0", "wheel", "setuptools_scm"] + +[tool.pytest.ini_options] +testpaths = "tests" +addopts = "--cov axes --cov-append --cov-branch --cov-report term-missing --cov-report=xml" +DJANGO_SETTINGS_MODULE = "tests.settings" + +[tool.tox] +legacy_tox_ini = """ +[tox] +envlist = + py38-djqa + py{36,37,38,39,py3}-dj{22,30,31,dev} + +[gh-actions] +python = + 3.6: py36 + 3.7: py37 + 3.8: py38 + 3.9: py39 + pypy3: pypy3 + +[gh-actions:env] +DJANGO = + 2.2: dj22 + 3.0: dj30 + 3.1: dj31 + dev: djdev + qa: djqa + +# Normal test environment runs pytest which orchestrates other tools +[testenv] +deps = + -r requirements-test.txt + dj22: django>=2.2,<2.3 + dj30: django>=3.0,<3.1 + dj31: django>=3.1,<3.2 + djdev: https://github.com/django/django/archive/master.tar.gz +usedevelop = true +commands = pytest +setenv = + PYTHONDONTWRITEBYTECODE=1 + +# Django development version is allowed to fail the test matrix +[testenv:py{36,37,38,39,py3}-dj{dev}] +ignore_errors = true +ignore_outcome = true + +# QA runs type checks, linting, and code formatting checks +[testenv:py38-djqa] +deps = -r requirements-qa.txt +commands = + mypy axes + prospector + black -t py36 --check --diff axes +""" diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index f5eae20..0000000 --- a/pytest.ini +++ /dev/null @@ -1,4 +0,0 @@ -[pytest] -testpaths = tests -addopts = --cov axes --cov-config .coveragerc --cov-append --cov-report term-missing --cov-report=xml -DJANGO_SETTINGS_MODULE = tests.settings diff --git a/tox.ini b/tox.ini deleted file mode 100644 index a511d9f..0000000 --- a/tox.ini +++ /dev/null @@ -1,46 +0,0 @@ -[tox] -envlist = - py38-djqa - py{36,37,38,39,py3}-dj{22,30,31,dev} - -[gh-actions] -python = - 3.6: py36 - 3.7: py37 - 3.8: py38 - 3.9: py39 - pypy3: pypy3 - -[gh-actions:env] -DJANGO = - 2.2: dj22 - 3.0: dj30 - 3.1: dj31 - dev: djdev - qa: djqa - -# Normal test environment runs pytest which orchestrates other tools -[testenv] -deps = - -r requirements-test.txt - dj22: django>=2.2,<2.3 - dj30: django>=3.0,<3.1 - dj31: django>=3.1,<3.2 - djdev: https://github.com/django/django/archive/master.tar.gz -usedevelop = true -commands = pytest -setenv = - PYTHONDONTWRITEBYTECODE=1 - -# Django development version is allowed to fail the test matrix -[testenv:py{36,37,38,39,py3}-dj{dev}] -ignore_errors = true -ignore_outcome = true - -# QA runs type checks, linting, and code formatting checks -[testenv:py38-djqa] -deps = -r requirements-qa.txt -commands = - mypy axes - prospector - black -t py36 --check --diff axes