From c12e9f5e3a62d87a6f91c019d8ad2ca091ef4a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 2 Sep 2025 17:35:04 +0200
Subject: [PATCH] CI: Adjust for EPEL Python 3.13

Note that epel-rpm-macros was added as a requirement to bring
rpmautospec-rpm-macros on EPEL 9.
rpmautospec-rpm-macros no longer exists on EPEL 10,
the macros were added to redhat-rpm-config.
The rpmautospec macros are needed for the mock_bootstrap_build test.

Technically, always pulling epel-rpm-macros is the right thing to do,
as it allows us to build SRPM correctly.
The EPEL macros are installed by default inside the mock chroot,
but not on the CI system.
Alternatively, we could build the SRPM using mock,
but that's an overkill.

[skip changelog]
---
 plan.fmf                       | 56 +++-------------------------------
 tests/bash_completion/main.fmf |  6 ++--
 2 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/plan.fmf b/plan.fmf
index 79f9d9c..432ab08 100644
--- a/plan.fmf
+++ b/plan.fmf
@@ -6,61 +6,19 @@ discover:
     how: shell
     url: https://src.fedoraproject.org/tests/python.git
     tests:
-    - name: smoke36
-      path: /smoke
-      test: VERSION=3.6 TOX=false ./venv.sh
-    - name: smoke39
-      path: /smoke
-      test: VERSION=3.9 ./venv.sh
-    - name: smoke310
-      path: /smoke
-      test: VERSION=3.10 ./venv.sh
-    - name: smoke311
-      path: /smoke
-      test: VERSION=3.11 ./venv.sh
-    - name: smoke312
-      path: /smoke
-      test: VERSION=3.12 ./venv.sh
     - name: smoke313
       path: /smoke
       test: VERSION=3.13 ./venv.sh
-    - name: smoke314
-      path: /smoke
-      test: VERSION=3.14 ./venv.sh
-    - name: smoke39_virtualenv
-      path: /smoke
-      test: VERSION=3.9 METHOD=virtualenv ./venv.sh
-    - name: smoke310_virtualenv
-      path: /smoke
-      test: VERSION=3.10 METHOD=virtualenv ./venv.sh
-    - name: smoke311_virtualenv
-      path: /smoke
-      test: VERSION=3.11 METHOD=virtualenv ./venv.sh
-    - name: smoke312_virtualenv
-      path: /smoke
-      test: VERSION=3.12 METHOD=virtualenv ./venv.sh
     - name: smoke313_virtualenv
       path: /smoke
       test: VERSION=3.13 METHOD=virtualenv ./venv.sh
-    - name: smoke314_virtualenv
-      path: /smoke
-      test: VERSION=3.14 METHOD=virtualenv ./venv.sh
   - name: rpms_pyproject-rpm-macros
     how: shell
     url: https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git
     tests:
-    - name: pyproject_pytest
+    - name: pyproject_isort
       path: /tests
-      test: ./mocktest.sh python-pytest
-    - name: pyproject_entrypoints
-      path: /tests
-      test: ./mocktest.sh python-entrypoints
-    - name: pyproject_pluggy
-      path: /tests
-      test: ./mocktest.sh python-pluggy
-    - name: pyproject_clikit
-      path: /tests
-      test: ./mocktest.sh python-clikit
+      test: ./mocktest.sh python-isort
   - name: same_repo
     how: shell
     dist-git-source: true
@@ -69,7 +27,7 @@ discover:
     - name: mock_bootstrap_build
       test: |
         cd $TMT_SOURCE_DIR &&
-        $TMT_TREE/../discover/rpms_pyproject-rpm-macros/tests/tests/mocktest.sh python-pip --without tests --without man
+        $TMT_TREE/../discover/rpms_pyproject-rpm-macros/tests/tests/mocktest.sh python3.13-pip --without tests --without man
     - name: pip_install_upgrade
       path: /tests/pip_install_upgrade/
       test: ./runtest.sh
@@ -82,18 +40,12 @@ prepare:
     package:
     - gcc
     - virtualenv
-    - python3.6
-    - python3.9
-    - python3.10-devel
-    - python3.11-devel
-    - python3.12-devel
     - python3.13-devel
-    - python3.14-devel
-    - python3-devel
     - python3-tox
     - mock
     - rpmdevtools
     - rpm-build
+    - epel-rpm-macros
     - grep
     - util-linux
     - shadow-utils
diff --git a/tests/bash_completion/main.fmf b/tests/bash_completion/main.fmf
index cde6f68..74a8b68 100644
--- a/tests/bash_completion/main.fmf
+++ b/tests/bash_completion/main.fmf
@@ -13,7 +13,7 @@ description: |
     installed and functional after package installation.
 
 component:
-    - python3-pip
+    - python3.13-pip
 
 test: ./pip_completion_full_test.sh
 
@@ -24,7 +24,7 @@ tier: 1
 
 
 require:
-    - python3-pip
+    - python3.13-pip
     - bash-completion
     - expect
     - rpm
@@ -32,4 +32,4 @@ require:
 
 
 environment:
-    PACKAGE: python3-pip
+    PACKAGE: python3.13-pip