From 453dfdb9aa57ab4fd8f97b87ce594c3750c63e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 28 Mar 2025 14:21:15 +0100
Subject: [PATCH] CI: Make the tests pass on EPEL 10, install or skip missing
 Pythons

[skip changelog]
---
 tests/tests.yml | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/tests/tests.yml b/tests/tests.yml
index 4ecedf5..0244e53 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -30,42 +30,42 @@
     - all_supplementing_pythons:
         dir: tests
         run: ./all_supplementing_pythons.py
-    - smoke27_optional:
+    - smoke27:
         dir: python/smoke
         run: VERSION=2.7 INSTALL_OR_SKIP=true METHOD=virtualenv TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh
     - smoke36:
         dir: python/smoke
-        run: VERSION=3.6 TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh
-    - smoke38_optional:
+        run: VERSION=3.6 INSTALL_OR_SKIP=true TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh
+    - smoke38:
         dir: python/smoke
         run: VERSION=3.8 INSTALL_OR_SKIP=true ./venv.sh
     - smoke39:
         dir: python/smoke
-        run: VERSION=3.9 ./venv.sh
+        run: VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh
     - smoke310:
         dir: python/smoke
-        run: VERSION=3.10 ./venv.sh
+        run: VERSION=3.10 INSTALL_OR_SKIP=true ./venv.sh
     - smoke311:
         dir: python/smoke
-        run: VERSION=3.11 ./venv.sh
+        run: VERSION=3.11 INSTALL_OR_SKIP=true ./venv.sh
     - smoke312:
         dir: python/smoke
         run: VERSION=3.12 ./venv.sh
     - smoke313:
         dir: python/smoke
-        run: VERSION=3.13 ./venv.sh
+        run: VERSION=3.13 INSTALL_OR_SKIP=true ./venv.sh
     - smoke314:
         dir: python/smoke
-        run: VERSION=3.14 ./venv.sh
-    - smoke_pypy39_optional:
+        run: VERSION=3.14 INSTALL_OR_SKIP=true ./venv.sh
+    - smoke_pypy39:
         dir: python/smoke
         run: PYTHON=pypy3.9 VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh
     - smoke_pypy310:
         dir: python/smoke
-        run: PYTHON=pypy3.10 VERSION=3.10 ./venv.sh
+        run: PYTHON=pypy3.10 VERSION=3.10 INSTALL_OR_SKIP=true ./venv.sh
     - smoke_pypy311:
         dir: python/smoke
-        run: PYTHON=pypy3.11 VERSION=3.11 ./venv.sh
+        run: PYTHON=pypy3.11 VERSION=3.11 INSTALL_OR_SKIP=true ./venv.sh
     - pyproject_pytest:
         dir: pyproject-rpm-macros/tests
         run: ./mocktest.sh python-pytest
@@ -78,15 +78,8 @@
     required_packages:
     - gcc
     - virtualenv
-    - python3.6
-    - python3.9
-    - python3.10-devel
-    - python3.11-devel
+    - python3-devel
     - python3.12-devel
-    - python3.13-devel
-    - python3.14-devel
-    - pypy3.10-devel
-    - pypy3.11-devel
     - python3-tox
     - python3-dnf
     - mock