Skip to content

Commit d516ab4

Browse files
committed
Fix commands
1 parent 86c412a commit d516ab4

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.vscode/settings.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"python.testing.unittestEnabled": false,
3-
// Override the pyproject.toml and disable xdist to enable test debugging
4-
"python.testing.pytestArgs": ["tests"],
2+
"[jsonc]": {
3+
"editor.defaultFormatter": "esbenp.prettier-vscode"
4+
},
55
"[python]": {
66
"editor.codeActionsOnSave": {
77
"source.fixAll": "explicit",
@@ -10,12 +10,12 @@
1010
"editor.defaultFormatter": "ms-python.black-formatter",
1111
"editor.formatOnSave": true
1212
},
13-
"[jsonc]": {
14-
"editor.defaultFormatter": "esbenp.prettier-vscode"
15-
},
13+
"markiscodecoverage.searchCriteria": "coverage.lcov",
1614
"mypy-type-checker.importStrategy": "fromEnvironment",
1715
"mypy-type-checker.preferDaemon": true,
1816
"mypy-type-checker.reportingScope": "workspace",
17+
// Override the pyproject.toml and disable xdist to enable test debugging
18+
"python.testing.pytestArgs": ["tests"],
1919
"python.testing.pytestEnabled": true,
20-
"markiscodecoverage.searchCriteria": "coverage.lcov"
20+
"python.testing.unittestEnabled": false
2121
}

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ commands_pre =
3636
sh -c "rm -f {envdir}/.coverage.* 2>/dev/null || true"commands =
3737
commands_post =
3838
coverage run -m pytest {posargs:-n auto}
39-
{py,py310,py311,py312,py313}: sh -c "coverage combine -a -q --data-file={envdir}/.coverage {envdir}/.coverage.* && coverage xml --data-file={envdir}/.coverage -o {envdir}/coverage.xml --ignore-errors --fail-under=0 && COVERAGE_FILE={envdir}/.coverage coverage lcov --fail-under=0 --ignore-errors -q && COVERAGE_FILE={envdir}/.coverage coverage report --fail-under=0 --ignore-errors"
39+
{py,py310,py311,py312,py313}: sh -c "<<EOF
40+
coverage combine -a -q --data-file={envdir}/.coverage {envdir}/.coverage.*
41+
coverage xml --data-file={envdir}/.coverage -o {envdir}/coverage.xml --ignore-errors --fail-under=0
42+
COVERAGE_FILE={envdir}/.coverage coverage lcov --fail-under=0 --ignore-errors -q
43+
COVERAGE_FILE={envdir}/.coverage coverage report --fail-under=0 --ignore-errors
44+
EOF"
4045
git diff --exit-code
4146
allowlist_externals =
4247
git

0 commit comments

Comments
 (0)