Remove 3.10, run tests with 3.12

Ubuntu 22.04 is the only one with 3.10, which we no longer test/supported replace that with 24.04 which uses 3.12. so we can drop 3.10. Also switch runs to run with "3.x" so that we can update to 3.13 when available.
SUSE · Oct 24, 2024 · a9d28c5 · a9d28c5
1 parent 4b42c14
commit a9d28c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -66,7 +66,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python_version: ["3.6", "3.9", "3.10", "3.11", "3.12"]
+        # 3.6: SLE15
+        # 3.9: RHEL/Centos/Liberty 9
+        # 3.11: Tumbleweed
+        # 3.12: Ubuntu 24.04
+        # 3.13: Future Tumbleweed
+        python_version: ["3.6", "3.9", "3.11", "3.12"]
     container:
       image: registry.suse.com/bci/python:${{ matrix.python_version }}
     steps:
@@ -179,13 +184,16 @@ jobs:
         run: sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc /opt/hostedtoolcache/CodeQL && sudo docker image prune --all --force
       - name: checkout source code
         uses: actions/checkout@v4
-      - name: Install tox
-        run: sudo apt update && sudo apt install tox
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-
+      - name: Install tox
+        run: |
+          sudo apt-get install python3-pip
+          python3 --version
+          python3 -m pip install tox
+          sudo python3 -m pip install tox
       - name: Install ldap-utils to have ldapwhoami for the 389ds tests
         run: |
           sudo apt-get update
@@ -375,15 +383,15 @@ jobs:
           done
 
       - name: Run the tests for docker
-        run: tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 3 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
+        run: python3 -m tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 3 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
         env:
           CONTAINER_RUNTIME: docker
           OS_VERSION: ${{ matrix.os_version }}
           TARGET: ${{ matrix.testing_target != '' && matrix.testing_target || 'obs' }}
           PULL_ALWAYS: 0
 
       - name: Run tests as root for podman
-        run: sudo --preserve-env=CONTAINER_RUNTIME,OS_VERSION,TARGET,PULL_ALWAYS -H tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 3 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
+        run: sudo --preserve-env=CONTAINER_RUNTIME,OS_VERSION,TARGET,PULL_ALWAYS -H python3 -m tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 3 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
         env:
           CONTAINER_RUNTIME: podman
           OS_VERSION: ${{ matrix.os_version }}

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,6 @@
 [tox]
 envlist = {py36,py39,py310,py311,py312,py313}-unit, all, base, fips, init, dotnet, python, ruby, node, go, openjdk, openjdk_devel, rust, php, busybox, 389ds, metadata, minimal, multistage, repository, doc, lint, get_urls, pcp, distribution, postgres, git, helm, nginx, kernel_module, mariadb, tomcat, spack, gcc, prometheus, grafana, kiwi, postfix
-isolated_build = True
 skip_missing_interpreters = True
-skip_install = True
 
 [common]
 deps =
@@ -19,6 +17,7 @@ deps =
     doc: Sphinx
 
 [testenv]
+skip_install = True
 deps =
     {[common]deps}
     pg8000 < 1.27.0 ; python_version < "3.7"
@@ -41,11 +40,11 @@ passenv =
     XDG_CONFIG_HOME
     XDG_RUNTIME_DIR
 commands =
-    pytest -vv tests/test_{envname}.py --junitxml={toxinidir}/junit_{envname}.xml --pytest-container-log-level=debug []
+    python -m pytest -vv tests/test_{envname}.py --junitxml={toxinidir}/junit_{envname}.xml --pytest-container-log-level=debug []
 
 [testenv:{py36,py39,py310,py311,py312,py313}-unit]
 commands =
-    pytest -n auto tests/test_unit.py --junitxml={toxinidir}/junit_unit.xml []
+    python -m pytest -n auto tests/test_unit.py --junitxml={toxinidir}/junit_unit.xml []
 deps =
     {[common]deps}