From efccbbcd1bba5f14684f45c883b0de1533ca8099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
Date: Mon, 17 Jun 2024 12:37:11 +0200
Subject: [PATCH] Remove 3.10, add 3.12

Ubuntu 22.04 is the only one with 3.10, we replace that with 24.04
which uses 3.12
---
 .github/workflows/ci.yaml | 13 ++++++++++---
 tox.ini                   |  8 ++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fd814cc3..70286f48 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -65,7 +65,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python_version: ["3.6", "3.9", "3.10", "3.11"]
+        # 3.6: SLE15
+        # 3.9: RHEL/Centos/Liberty 9
+        # 3.11: SLES15/Tumbleweed
+        # 3.12: Ubuntu 24.04
+        python_version: ["3.6", "3.9", "3.11", "3.12"]
     container:
       image: registry.suse.com/bci/python:${{ matrix.python_version }}
     steps:
@@ -159,15 +163,18 @@ jobs:
     steps:
       - name: Clean up disk space to maximize available space
         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 update && sudo apt install tox
+
       - name: Install ldap-utils to have ldapwhoami for the 389ds tests
         run: |
           sudo apt-get update
diff --git a/tox.ini b/tox.ini
index 38c0bf38..e1ffa422 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,9 @@
 [tox]
-envlist = {py36,py39,py310,py311,py312}-unit, build, 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
+min_version = 3.8
+envlist = {py36,py39,py311,py312}-unit, build, 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
 isolated_build = True
 skip_missing_interpreters = True
+skip_install = True
 
 [common]
 deps =
@@ -17,6 +19,7 @@ deps =
     doc: Sphinx
 
 [testenv]
+basepython = python3.11
 deps =
     {[common]deps}
     # Require a recent version of psycopg2 to avoid poo#128900
@@ -42,7 +45,8 @@ passenv =
 commands =
     pytest -vv tests/test_{envname}.py --junitxml={toxinidir}/junit_{envname}.xml --pytest-container-log-level=debug []
 
-[testenv:{py36,py39,py310,py311,py312}-unit]
+[testenv:{py36,py39,py311,py312}-unit]
+ignore_basepython_conflict = True
 commands =
     pytest -n auto tests/test_unit.py --junitxml={toxinidir}/junit_unit.xml []
 deps =