Skip to content

Commit 49ac26a

Browse files
committed
Move coverage and pytest config to pyproject.toml
1 parent d041027 commit 49ac26a

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

pyproject.toml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,3 +217,26 @@ transform-concats = true
217217
transform-joins = true
218218
exclude = ["newrelic/packages/", "setup.py"]
219219
# setup.py needs to not immediately crash on Python 2 to log error messages, so disable fstrings
220+
221+
[tool.pytest.ini_options]
222+
usefixtures = [
223+
"collector_available_fixture",
224+
"collector_agent_registration",
225+
]
226+
227+
[tool.coverage.run]
228+
branch = true
229+
source = [ "newrelic" ]
230+
231+
[tool.coverage.paths]
232+
source = [
233+
"newrelic/",
234+
"**/site-packages/newrelic/",
235+
"**\\site-packages\\newrelic\\",
236+
]
237+
238+
[tool.coverage.html]
239+
directory = "${TOX_ENV_DIR-.}/htmlcov"
240+
241+
[tool.coverage.xml]
242+
output = "${TOX_ENV_DIR-.}/coverage.xml"

tox.ini

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@ setenv =
461461
PYTHONPATH={toxinidir}/tests
462462
TOX_ENV_DIR={envdir}
463463
COVERAGE_FILE={envdir}/.coverage.{envname}
464-
COVERAGE_RCFILE={toxinidir}/tox.ini
465464
with_extensions: NEW_RELIC_EXTENSIONS = true
466465
without_extensions: NEW_RELIC_EXTENSIONS = false
467466
agent_features: NEW_RELIC_APDEX_T = 1000
@@ -586,26 +585,3 @@ changedir =
586585
template_genshi: tests/template_genshi
587586
template_jinja2: tests/template_jinja2
588587
template_mako: tests/template_mako
589-
590-
591-
[pytest]
592-
usefixtures =
593-
collector_available_fixture
594-
collector_agent_registration
595-
596-
[coverage:run]
597-
branch = True
598-
disable_warnings = couldnt-parse
599-
source = newrelic
600-
601-
[coverage:paths]
602-
source =
603-
newrelic/
604-
.tox/**/site-packages/newrelic/
605-
/__w/**/site-packages/newrelic/
606-
607-
[coverage:html]
608-
directory = ${TOX_ENV_DIR-.}/htmlcov
609-
610-
[coverage:xml]
611-
output = ${TOX_ENV_DIR-.}/coverage.xml

0 commit comments

Comments
 (0)