CI: Test with pypy3.11, make pypy3.9 optional, as it was retired on Fedora 42+

Fixes: rhbz#2350693

fix-tests.patch

@@ -1,11 +1,12 @@
-From 156ff454c8df051b2cb3a6b5283810c51c1d5853 Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Tue, 10 Jan 2023 08:34:25 +0100
+From b8024813cb3e477a4ada44c5835e9f62ecda79bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
+Date: Fri, 28 Mar 2025 09:44:24 +0100
 Subject: [PATCH] Fix tests
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
 Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
 ---
  pyproject.toml                                 | 11 +----------
@@ -15,7 +16,7 @@ Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
  4 files changed, 14 insertions(+), 41 deletions(-)
 
 diff --git a/pyproject.toml b/pyproject.toml
-index 16f2e44..156d1af 100644
+index 9c1116c..e499874 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -82,22 +82,16 @@ dev = [
@@ -29,18 +30,18 @@ index 16f2e44..156d1af 100644
    "distlib>=0.3.9",
    "flaky>=3.8.1",
    "hatch-vcs>=0.4",
-   "hatchling>=1.26.3",
-   "psutil>=6.1",
-   "pytest>=8.3.3",
+   "hatchling>=1.27",
+   "psutil>=6.1.1",
+   "pytest>=8.3.4",
 -  "pytest-cov>=5",
    "pytest-mock>=3.14",
    "pytest-xdist>=3.6.1",
    "re-assert>=1.1",
--  "setuptools>=75.1; python_version<='3.8'",
--  "setuptools>=75.6; python_version>'3.8'",
+-  "setuptools>=75.3; python_version<='3.8'",
+-  "setuptools>=75.8; python_version>'3.8'",
 +  "setuptools>=75.1",
    "time-machine>=2.15; implementation_name!='pypy'",
-   "wheel>=0.45",
+   "wheel>=0.45.1",
  ]
 @@ -223,9 +217,6 @@ report.omit = [
    "tests/type_check/*",
@@ -161,5 +162,5 @@ index efb5b12..8a57426 100644
      for left, right in zip_longest(result, exp):
          assert isinstance(right, Requirement)
 -- 
-2.47.1
+2.48.1
 

python-tox.spec

@@ -20,7 +20,7 @@
 %undefine _py3_shebang_s
 
 Name:           python-tox
-Version:        4.24.1
+Version:        4.25.0
 Release:        %autorelease
 Summary:        Virtualenv-based automation of test activities
 

sources

@@ -1 +1 @@
-SHA512 (tox-4.24.1.tar.gz) = 8d7a3cd9c6140463dd2d2e1df7845c676f750ca23c0a9d528ee4fc7923bcadea94cfc0e7a1d70bd436d867be5f2edddd1576569777f2c15a0e11768cd932b6dd
+SHA512 (tox-4.25.0.tar.gz) = 3560b667af03ca41c1bd8fa9eaa90f8c988b7f946498f3bc2d0a4dfa3a481d8ada27acb6201bde284a2bcfe14b86ee409a3ce8e875531423862d1af88e6248fb

tests/tests.yml

@@ -57,12 +57,15 @@
     - smoke314:
         dir: python/smoke
         run: VERSION=3.14 ./venv.sh
-    - smoke_pypy39:
+    - smoke_pypy39_optional:
         dir: python/smoke
-        run: PYTHON=pypy3.9 VERSION=3.9 ./venv.sh
+        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
+    - smoke_pypy311:
+        dir: python/smoke
+        run: PYTHON=pypy3.11 VERSION=3.11 ./venv.sh
     - pyproject_pytest:
         dir: pyproject-rpm-macros/tests
         run: ./mocktest.sh python-pytest
@@ -82,8 +85,8 @@
     - python3.12-devel
     - python3.13-devel
     - python3.14-devel
-    - pypy3.9-devel
     - pypy3.10-devel
+    - pypy3.11-devel
     - python3-tox
     - python3-dnf
     - mock