diff --git a/tox.ini b/tox.ini index 3fec4605..9d2bb7d4 100644 --- a/tox.ini +++ b/tox.ini @@ -63,8 +63,8 @@ deps = pyre: pyright pytype: {[pytype]deps} allowlist_externals = - {cov,covcp,covcombine,fox,check,lint,test,pytype,pyre,mdreport}: echo - {cov,covcp,covcombine,fox,check,lint,test,pytype,pyre,mdreport}: sh + {cov,covcp,covcombine,fox,check,lint,test,mdreport}: echo + {cov,covcp,covcombine,fox,check,lint,test,mdreport}: sh {cov,covcp,covcombine,fox}: cp {covcombine,fox}: tox check: cat @@ -104,14 +104,14 @@ setenv = commands = lint: {[lint]commands} pyre: {[pyre]commands} + check: {[check]commands} pytype: {[pytype]commands} - {cov,covcp,covcombine,check,fox,lint,test,pytype,mdreport}: {[test]commands} + {cov,covcp,covcombine,check,fox,lint,test,mdreport}: {[test]commands} # covcombine shall not call [cov]commands: diff-cover shall check the combined cov: {cov,covcp}: {[cov]commands} {py27-test}: pylint --py3k --disable=no-absolute-import xcp/ covcp: cp -av {envlogdir}/coverage.xml {env:UPLOAD_DIR:.} covcombine: {[covcombine]commands} - check: {[check]commands} fox: {[covcombine]commands} fox: {[lint]commands} fox: {[fox]commands} @@ -126,7 +126,7 @@ commands = coverage html -d {envlogdir}/htmlcov coverage html -d {envlogdir}/htmlcov-tests --fail-under {env:TESTS_COV_MIN:96} \ --include="tests/*" - diff-cover --compare-branch=origin/master \ + diff-cover --compare-branch=origin/master --include-untracked \ {env:PY3_DIFFCOVER_OPTIONS} --fail-under {env:DIFF_COV_MIN:92} \ --html-report {envlogdir}/coverage-diff.html \ {envlogdir}/coverage.xml @@ -158,7 +158,7 @@ deps = pylint pandas tabulate commands = - python run-pylint.py xcp + python run-pylint.py xcp tests diff-quality --compare-branch=origin/master --violations=pylint \ --ignore-whitespace --fail-under 100 \ --html-report {envlogdir}/pylint-diff.html {envlogdir}/pylint.txt @@ -201,7 +201,7 @@ max-line-length = 129 commands = pyre: python3.11 --version -V # Needs py311-pyre, does not work with py310-pyre python ./run-pyre.py - {[test]commands} + -pyright [pytype] deps = pytype