From a0ce75dad47e3835656b2d45a89efbe35cff8195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <marcus.schaefer@gmail.com>
Date: Sun, 17 Dec 2023 20:33:43 +0100
Subject: [PATCH] Cleanup tox targets

Align tox targets with github workflows and fix targets
not associated with a specific python version to use
the python3 version installed on the host
---
 .github/workflows/ci-units-types.yml |  4 ++--
 tox.ini                              | 28 ++++------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci-units-types.yml b/.github/workflows/ci-units-types.yml
index 9f3b3bc77e8..a9cc5a6e711 100644
--- a/.github/workflows/ci-units-types.yml
+++ b/.github/workflows/ci-units-types.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3
@@ -26,4 +26,4 @@ jobs:
           python -m pip install tox
       - name: Run unit and type tests
         run: |
-          tox -e unit_py3_6,unit_py3_8,unit_py3_9,unit_py3_10
+          tox -e unit_py3_9,unit_py3_10,unit_py3_11
diff --git a/tox.ini b/tox.ini
index c96a4209813..49241e68b66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,14 +20,12 @@ envlist =
     unit_py3_11,
     unit_py3_10,
     unit_py3_9,
-    unit_py3_8,
-    unit_py3_6,
     packagedoc
 
 
 [testenv]
 description =
-    {unit_py3_6,unit_py3_8,unit_py3_9,unit_py3_10,unit_py3_11}: Unit Test run with basepython set to {basepython}
+    {unit_py3_9,unit_py3_10,unit_py3_11}: Unit Test run with basepython set to {basepython}
     devel: Test KIWI
 allowlist_externals =
     bash
@@ -44,9 +42,10 @@ basepython =
     unit_py3_11: python3.11
     unit_py3_10: python3.10
     unit_py3_9: python3.9
-    unit_py3_8: python3.8
-    unit_py3_6: python3.6
     release: python3.10
+    check: python3
+    devel: python3
+    packagedoc: python3
 passenv =
     *
 usedevelop = True
@@ -54,25 +53,6 @@ deps =
     -r.virtualenv.dev-requirements.txt
 
 
-# Unit Test run with basepython set to 3.6
-[testenv:unit_py3_6]
-setenv =
-    PYTHONPATH={toxinidir}/test
-deps = {[testenv:unit]deps}
-changedir=test/unit
-commands =
-    {[testenv:unit]commands}
-
-
-# Unit Test run with basepython set to 3.8
-[testenv:unit_py3_8]
-setenv =
-    PYTHONPATH={toxinidir}/test
-changedir=test/unit
-commands =
-    {[testenv:unit]commands}
-
-
 # Unit Test run with basepython set to 3.9
 [testenv:unit_py3_9]
 setenv =