Skip to content

Commit

Permalink
tox.ini: Avoid running pytest twice for py3.8-ptype and py38-covcombine
Browse files Browse the repository at this point in the history
- remove running pytest for py311-pyre: It means we run pytest for:
  tox -e py38-covcombine (Py3.8 and 2.7) -e py36-lint and -e py310-check
- run pyright after pyre to show annotations in GitHub code reviews

Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
  • Loading branch information
bernhardkaindl committed Jun 20, 2023
1 parent 4a55ef9 commit 6c059b6
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6c059b6

Please sign in to comment.