tox.ini: Cleanup obsolete py27 test environments

Signed-off-by: Bernhard Kaindl <[email protected]>

Author: bernhardkaindl

tox.ini

@@ -1,4 +1,5 @@
 [tox]
+min_version = 4.6
 # Set the envlist:
 # Defines the environments that tox runs by default (when -e <environment> is not used)
 #
@@ -35,7 +36,6 @@ commands    =
 [testenv]
 description = Run in a {basepython} virtualenv:
     cov:        {[cov]description}
-    covcombine: {[covcombine]description}
     covcp:      Copy the generated .converage and coverage.xml to the UPLOAD_DIR dir
     fox:        {[fox]description}
     lint:       {[lint]description}
@@ -47,27 +47,24 @@ description = Run in a {basepython} virtualenv:
     pytype:     Run pytype for static analyis, intro: https://youtu.be/abvW0mOrDiY
 # checkers(mypy) need the pytest dependices as well:
 extras =
-    {check,pytype}: {[check]extras}
-    {cov,covcp,covcombine,fox,check,lint,test,pytype,pyright,mdreport}: {[test]extras}
-    {cov,covcp,covcombine,fox}:                                         {[cov]extras}
+    check: {[check]extras}
+    pytype: {[pytype]extras}
+    {lint,test,pyright,mdreport}: {[test]extras}
+    {cov,covcp,fox}:              {[cov]extras}
 deps =
     mdreport: pytest-md-report
-    {py27-test,py27-cov}: pyftpdlib
-    {py27-test,py27-cov}: pylint
-    {cov,covcp,covcombine,fox}: coverage[toml]
-    {cov,covcp,covcombine,fox}: diff-cover
+    {cov,covcp,fox}: coverage[toml]
+    {cov,covcp,fox}: diff-cover
     {lint,fox}: {[lint]deps}
     pyright: pyright
-    pytype: {[pytype]deps}
 allowlist_externals =
-    {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
+    {cov,covcp,fox,check,lint,test,mdreport}: echo
+    {cov,covcp,fox,check,lint,test,mdreport}: sh
+    {cov,covcp,fox}: cp
     check: cat
     fox: firefox
 passenv =
-    {pytype,covcombine,lint,test}: GITHUB_STEP_SUMMARY
+    {pytype,lint,test}: GITHUB_STEP_SUMMARY
     pytype: GITHUB_SERVER_URL
     pytype: GITHUB_REPOSITORY
     pytype: GITHUB_HEAD_REF
@@ -106,20 +103,16 @@ commands =
     pyright: {[pyright]commands}
     check: {[check]commands}
     pytype: {[pytype]commands}
-    {cov,covcp,covcombine,check,fox,test,mdreport}: {[test]commands}
-    # covcombine shall not call [cov]commands: diff-cover shall check the combined cov:
+    {cov,covcp,check,fox,test,mdreport}: {[test]commands}
     {cov,covcp}: {[cov]commands}
-    {py27-test}: pylint --py3k --disable=no-absolute-import xcp/
     covcp: cp -av {envlogdir}/coverage.xml {envlogdir}/coverage.lcov {envlogdir}/.coverage {envlogdir}/junit.xml {env:UPLOAD_DIR:.}
-    covcombine: {[covcombine]commands}
-    fox: {[covcombine]commands}
+    fox: {[cov]commands}
     fox: {[lint]commands}
     fox: {[fox]commands}
 
 [cov]
 description = Generate coverage html reports (incl. diff-cover) for this environment
 setenv      = PY3_DIFFCOVER_OPTIONS=--ignore-whitespace --show-uncovered
-       py27:  PY3_DIFFCOVER_OPTIONS=
 extras      = coverage
     test
 commands    =
@@ -133,27 +126,6 @@ commands    =
       --html-report  {envlogdir}/coverage-diff.html                                   \
                      {envlogdir}/coverage.xml
 
-[covcombine]
-description = Generate combined coverage reports with py27-test coverage merged
-commands =
-    tox -e py27-test
-    sh -c 'export COVERAGE_FILE=$COVERAGE_FILE-combined; \
-    coverage combine --keep {envlogdir}/../../py27-test/log/.coverage {envlogdir}/.coverage;\
-    coverage xml  -o {envlogdir}/coverage.xml;\
-    coverage html -d {envlogdir}/htmlcov;\
-    coverage html -d {envlogdir}/htmlcov-tests --include="tests/*"'
-    sh -c '\
-    diff-cover --compare-branch=origin/master --ignore-staged --ignore-unstaged       \
-      --ignore-whitespace --show-uncovered --fail-under {env:DIFF_COVCOMBINE_MIN:100} \
-      --html-report     {envlogdir}/coverage-diff.html                                \
-      --markdown-report {envlogdir}/coverage-diff.md                                  \
-                        {envlogdir}/coverage.xml;      EXIT_CODE=$?;echo $EXIT_CODE;  \
-    GITHUB_STEP_SUMMARY={env:GITHUB_STEP_SUMMARY:.git/GITHUB_STEP_SUMMARY.md};          \
-                            if  [ -n "$GITHUB_STEP_SUMMARY" ]; then                     \
-                            mkdir -p ${GITHUB_STEP_SUMMARY%/*};sed "/title/,/\/style/d" \
-    {envlogdir}/coverage-diff.html >>"$GITHUB_STEP_SUMMARY"; fi;                        \
-    exit $EXIT_CODE'
-
 [lint]
 description = Run pylint and fail on warnings remaining on lines in the diff to master
 deps = pylint
@@ -168,7 +140,7 @@ commands =
       --html-report  {envlogdir}/pylint-diff.html {envlogdir}/pylint.txt
 
 [fox]
-description = Generate combined coverage html reports and open them in firefox
+description = Generate pylint and coverage html reports and open them in firefox
 commands = firefox   {envlogdir}/coverage-diff.html                                   \
                      {envlogdir}/htmlcov/index.html                                   \
                      {envlogdir}/htmlcov-tests/index.html                             \
@@ -183,7 +155,6 @@ commands = firefox   {envlogdir}/coverage-diff.html
 # the local venvs will be the same as the venvs created by tox on the GitHub runners:
 [gh-actions]
 python =
-    2.7: py27
     3.6: py36
     3.7: py37
     3.8: py38