From cf25dcdcd87573a6c67bc2ea1c91d592efa6f8ef Mon Sep 17 00:00:00 2001 From: Mathieu Dupuy Date: Sat, 7 Oct 2023 14:04:33 +0200 Subject: [PATCH] move back non-packing related config into setup.cfg --- pyproject.toml | 26 -------------------------- setup.cfg | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 91dc09298..b4c0c232e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,29 +55,3 @@ license-files = ["LICENSE.md"] [tool.setuptools.packages.find] namespaces = false - -[tool.pytest.ini_options] -addopts = "--tb=short --strict-markers -ra" -testspath = "tests" -filterwarnings = ["ignore:CoreAPI compatibility is deprecated*:rest_framework.RemovedInDRF317Warning"] - -[tool.isort] -skip = [".tox"] -atomic = true -multi_line_output = 5 -extra_standard_library = ["types"] -known_third_party = ["pytest", "_pytest", "django", "pytz", "uritemplate"] -known_first_party = ["rest_framework", "tests"] - -[tool.coverage.run] -# NOTE: source is ignored with pytest-cov (but uses the same). -source = ["."] -include = ["rest_framework/*", "tests/*"] -branch = true - -[tool.coverage.report] -include = ["rest_framework/*", "tests/*"] -exclude_lines = [ - "pragma: no cover", - "raise NotImplementedError", -] diff --git a/setup.cfg b/setup.cfg index aebdf5362..874b27acd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,28 @@ +[tool:pytest] +addopts=--tb=short --strict-markers -ra +testspath = tests +filterwarnings = ignore:CoreAPI compatibility is deprecated*:rest_framework.RemovedInDRF317Warning + [flake8] ignore = E501,W503,W504 banned-modules = json = use from rest_framework.utils import json! + +[isort] +skip=.tox +atomic=true +multi_line_output=5 +extra_standard_library=types +known_third_party=pytest,_pytest,django,pytz,uritemplate +known_first_party=rest_framework,tests + +[coverage:run] +# NOTE: source is ignored with pytest-cov (but uses the same). +source = . +include = rest_framework/*,tests/* +branch = 1 + +[coverage:report] +include = rest_framework/*,tests/* +exclude_lines = + pragma: no cover + raise NotImplementedError