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

Fixes: rhbz#2350693

fix-tests.patch

@@ -1,46 +1,60 @@
-From 9e70838d0fe10576c8e991a2ac8cff09eab8a4b8 Mon Sep 17 00:00:00 2001
+From b8024813cb3e477a4ada44c5835e9f62ecda79bd Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
-Date: Tue, 10 Jan 2023 08:34:25 +0100
+Date: Fri, 28 Mar 2025 09:44:24 +0100
-Subject: [PATCH] fix tests
+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          |  5 -----
+ pyproject.toml                                 | 11 +----------
- src/tox/pytest.py       | 16 +++-------------
+ src/tox/pytest.py                              | 16 +++-------------
- tests/test_provision.py | 17 ++---------------
+ tests/test_provision.py                        | 18 ++----------------
- 3 files changed, 5 insertions(+), 33 deletions(-)
+ .../package/test_python_package_util.py        | 10 ++++++++--
+ 4 files changed, 14 insertions(+), 41 deletions(-)
 
 diff --git a/pyproject.toml b/pyproject.toml
-index c34eed8..4604c52 100644
+index 9c1116c..e499874 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -72,9 +72,6 @@ optional-dependencies.docs = [
+@@ -82,22 +82,16 @@ dev = [
  ]
- optional-dependencies.testing = [
+ test = [
-   "build[virtualenv]>=1.0.3",
+   "build[virtualenv]>=1.2.2.post1",
 -  "covdefaults>=2.3",
 -  "detect-test-pollution>=1.2",
--  "devpi-process>=1",
+-  "devpi-process>=1.0.2",
-   "diff-cover>=8.0.2",
+-  "diff-cover>=9.2",
-   "distlib>=0.3.8",
+   "distlib>=0.3.9",
-   "flaky>=3.7",
+   "flaky>=3.8.1",
-@@ -82,7 +79,6 @@ optional-dependencies.testing = [
+   "hatch-vcs>=0.4",
-   "hatchling>=1.21",
+   "hatchling>=1.27",
-   "psutil>=5.9.7",
+   "psutil>=6.1.1",
-   "pytest>=7.4.4",
+   "pytest>=8.3.4",
--  "pytest-cov>=4.1",
+-  "pytest-cov>=5",
-   "pytest-mock>=3.12",
+   "pytest-mock>=3.14",
-   "pytest-xdist>=3.5",
+   "pytest-xdist>=3.6.1",
    "re-assert>=1.1",
-@@ -162,7 +158,6 @@ paths.source = [
+-  "setuptools>=75.3; python_version<='3.8'",
- report.fail_under = 88
+-  "setuptools>=75.8; python_version>'3.8'",
- report.omit = ["src/tox/config/cli/for_docs.py", "tests/execute/local_subprocess/bad_process.py", "tests/type_check/*"]
++  "setuptools>=75.1",
+   "time-machine>=2.15; implementation_name!='pypy'",
+   "wheel>=0.45.1",
+ ]
+@@ -223,9 +217,6 @@ report.omit = [
+   "tests/type_check/*",
+ ]
  run.parallel = true
--run.plugins = ["covdefaults"]
+-run.plugins = [
+-  "covdefaults",
+-]
  
  [tool.towncrier]
  name = "tox"
 diff --git a/src/tox/pytest.py b/src/tox/pytest.py
-index d734def..5e6df35 100644
+index 72f410b..48cf9bc 100644
 --- a/src/tox/pytest.py
 +++ b/src/tox/pytest.py
 @@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c
@@ -51,7 +65,7 @@ index d734def..5e6df35 100644
  from virtualenv.info import fs_supports_symlink
  
  import tox.run
-@@ -277,9 +276,9 @@ class ToxProject:
+@@ -280,9 +279,9 @@ class ToxProject:
                  m.setattr(sys, "argv", [sys.executable, "-m", "tox", *list(args)])
                  m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1")
                  m.setenv("VIRTUALENV_SYMLINKS", "1")
@@ -64,7 +78,7 @@ index d734def..5e6df35 100644
                  try:
                      tox_run(args)
                  except SystemExit as exception:
-@@ -472,15 +471,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None
+@@ -475,15 +474,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None
      monkeypatch.setenv("PIP_TIMEOUT", str(2))
  
  
@@ -78,13 +92,13 @@ index d734def..5e6df35 100644
 -
 -
  @pytest.fixture(scope="session")
- def _invalid_index_fake_port() -> int:  # noqa: PT005
+ def _invalid_index_fake_port() -> int:
      with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as socket_handler:
 diff --git a/tests/test_provision.py b/tests/test_provision.py
-index 41eb630..1df7e76 100644
+index 2030cb9..f706d6c 100644
 --- a/tests/test_provision.py
 +++ b/tests/test_provision.py
-@@ -92,21 +92,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
+@@ -98,22 +98,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
          return result
  
  
@@ -97,25 +111,56 @@ index 41eb630..1df7e76 100644
 -    return self_index
 -
 -
- @pytest.fixture()
+ @pytest.fixture
 -def _pypi_index_self(pypi_index_self: Index, monkeypatch: MonkeyPatch) -> None:
 -    pypi_index_self.use()
 -    monkeypatch.setenv("PIP_INDEX_URL", pypi_index_self.url)
 -    monkeypatch.setenv("PIP_RETRIES", str(2))
 -    monkeypatch.setenv("PIP_TIMEOUT", str(5))
+-
 +def _pypi_index_self():
 +    pytest.skip("needs devpi-process")
  
- 
  def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None:
-@@ -155,7 +143,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
+     ini = "[tox]\nrequires = pkg-does-not-exist\n setuptools==1\nskipsdist=true\n"
+@@ -161,7 +148,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
  
  
- @pytest.mark.integration()
+ @pytest.mark.integration
 -@pytest.mark.usefixtures("_pypi_index_self")
  def test_provision_platform_check(tox_project: ToxProjectCreator) -> None:
      ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform"
      proj = tox_project({"tox.ini": ini})
+diff --git a/tests/tox_env/python/virtual_env/package/test_python_package_util.py b/tests/tox_env/python/virtual_env/package/test_python_package_util.py
+index efb5b12..8a57426 100644
+--- a/tests/tox_env/python/virtual_env/package/test_python_package_util.py
++++ b/tests/tox_env/python/virtual_env/package/test_python_package_util.py
+@@ -15,6 +15,12 @@ if TYPE_CHECKING:
+ 
+ from importlib.metadata import Distribution, PathDistribution
+ 
++from importlib.metadata import version
++from packaging.version import Version
++
++SETUPTOOLS_VERSION = Version(version("setuptools"))
++SETUPTOOLS_75_6 = SETUPTOOLS_VERSION >= Version("75.6")
++
+ 
+ @pytest.fixture(scope="session")
+ def pkg_with_extras(pkg_with_extras_project: Path) -> PathDistribution:
+@@ -43,10 +49,10 @@ def test_load_dependency_many_extra(pkg_with_extras: PathDistribution) -> None:
+     exp = [
+         Requirement("platformdirs>=2.1"),
+         Requirement("colorama>=0.4.3"),
+-        *(sphinx if sys.version_info[0:2] <= (3, 8) else []),
++        *(sphinx if not SETUPTOOLS_75_6 else []),
+         Requirement(f'covdefaults>=1.2; python_version == "2.7" or python_version == "{py_ver}"'),
+         Requirement(f'pytest>=5.4.1; python_version == "{py_ver}"'),
+-        *(sphinx if sys.version_info[0:2] > (3, 8) else []),
++        *(sphinx if SETUPTOOLS_75_6 else []),
+     ]
+     for left, right in zip_longest(result, exp):
+         assert isinstance(right, Requirement)
 -- 
-2.44.0
+2.48.1
 

python-tox.spec

@@ -1,5 +1,6 @@
-# Many tests are enabled by default
+%bcond bootstrap 0
-%bcond tests 1
+# Many tests are enabled by default, unless bootstrapping
+%bcond tests %{without bootstrap}
 # However, some tests are disabled by default, becasue they require:
 #  a) tested tox to be installed and/or
 #  b) internet connection
@@ -19,7 +20,7 @@
 %undefine _py3_shebang_s
 
 Name:           python-tox
-Version:        4.14.2
+Version:        4.25.0
 Release:        %autorelease
 Summary:        Virtualenv-based automation of test activities
 
@@ -31,12 +32,14 @@ Source:         %{pypi_source tox}
 # Remove dependency on detect-test-pollution.
 # Remove coverage-related dependencies.
 # Adjust virtualenv environment variables to make it work with our patched virtualenv.
+# Adjust setuptools-version specific ifs to check for setuptools version rather than Python version.
 Patch:          fix-tests.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
-BuildRequires:  pyproject-rpm-macros
+# for dependency-groups support:
+BuildRequires:  pyproject-rpm-macros >= 1.16
 
 %if %{with tests}
 BuildRequires:  /usr/bin/gcc
@@ -47,12 +50,10 @@ BuildRequires:  /usr/bin/python
 BuildRequires:  libffi-devel
 # xdist is not used upstream, but we use it to speed up the %%check
 BuildRequires:  python3-pytest-xdist
-# for test_allowed_implicit_cli_envs[py310]
-# TODO remove this once https://github.com/tox-dev/tox/pull/3108 is released
-BuildRequires:  python3.10
 %if %{with ci_tests}
 # The CI tests only work if the tested tox is installed :(
-BuildRequires:  tox = %{version}-%{release}
+# This should technically be the same V-R, but the CI does not handle %%autorelease well
+BuildRequires:  tox = %{version}
 %endif
 %endif
 
@@ -81,15 +82,14 @@ Summary:        %{summary}
 # however it launches other Python versions as subprocesses.
 # It recommends all Python versions it supports. (This is an exception to
 # the rule that Fedora packages may not require the alternative interpreters.)
-Recommends:     python2.7
+%if 0%{?fedora}
-Recommends:     python3.6
+%if 0%{?fedora} < 42
-Recommends:     python3.7
 Recommends:     python3.8
+%endif
 Recommends:     python3.9
 Recommends:     python3.10
-Recommends:     pypy2-devel
 Recommends:     pypy3-devel
-Recommends:     python2-devel
+%endif
 Recommends:     python3-devel
 # Instead of adding new Pythons here, add `Supplements: tox` to them, see:
 # https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/
@@ -104,15 +104,15 @@ Recommends:     python3-devel
 
 # Upstream updates dependencies too aggressively
 # see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356
-sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools|build\[virtualenv\])>=.*/"\1",/g' \
+sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools|build\[virtualenv\]|setuptools|flaky)>=.*/"\1",/g' \
-        -e "s/'(time-machine)>=[^;']+/'\1/" \
+        -e 's/"(time-machine)>=[^;"]+/"\1/' \
         -e 's/"(virtualenv)>=.*/"\1>=20",/g' \
         -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \
     pyproject.toml
 
 %generate_buildrequires
 export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}"
-%pyproject_buildrequires -r %{?with_tests:-x testing}
+%pyproject_buildrequires -r %{?with_tests:-g test}
 
 
 %build
@@ -134,6 +134,18 @@ k="${k-}${k+ and }not test_virtualenv_flipped_settings"
 k="${k-}${k+ and }not test_virtualenv_env_ignored_if_set"
 k="${k-}${k+ and }not test_virtualenv_env_used_if_not_set"
 
+# https://github.com/tox-dev/tox/issues/3290
+%if v"0%{?python3_version}" >= v"3.13"
+k="${k-}${k+ and }not test_str_convert_ok_py39"
+%endif
+
+# https://github.com/tox-dev/tox/commit/698f1dd663
+# Until we have setuptools 70.1+ we skip those
+k="${k-}${k+ and }not test_result_json_sequential"
+k="${k-}${k+ and }not test_setuptools_package"
+k="${k-}${k+ and }not test_skip_develop_mode"
+k="${k-}${k+ and }not test_tox_install_pkg_sdist"
+
 # The following tests either need internet connection or installed tox
 # so we only run them on the CI.
 %if %{without ci_tests}
@@ -144,10 +156,6 @@ k="${k-}${k+ and }not test_build_wheel_external"
 k="${k-}${k+ and }not keyboard_interrupt"
 k="${k-}${k+ and }not test_call_as_module"
 k="${k-}${k+ and }not test_call_as_exe"
-# test_local_execute_* have "\r\n" in outputs for some
-# unknown reason, reported: https://github.com/tox-dev/tox/issues/2841
-k="${k-}${k+ and }not test_local_execute_basic_pass_show_on_standard_newline_flush"
-k="${k-}${k+ and }not test_local_execute_write_a_lot"
 k="${k-}${k+ and }not test_run_installpkg_targz"
 %endif
 

sources

@@ -1 +1 @@
-SHA512 (tox-4.14.2.tar.gz) = 45bbd3f8d00eee05158452295230321947ec16a8bfff43e84ea9825d514976526f3889709255ed042cfb7a7ebfed020707cfc2d25b69ce90c148f4472092350d
+SHA512 (tox-4.25.0.tar.gz) = 3560b667af03ca41c1bd8fa9eaa90f8c988b7f946498f3bc2d0a4dfa3a481d8ada27acb6201bde284a2bcfe14b86ee409a3ce8e875531423862d1af88e6248fb

tests/tests.yml

@@ -30,18 +30,15 @@
     - all_supplementing_pythons:
         dir: tests
         run: ./all_supplementing_pythons.py
-    - smoke27:
+    - smoke27_optional:
         dir: python/smoke
-        run: VERSION=2.7 METHOD=virtualenv ./venv.sh
+        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 ./venv.sh
+        run: VERSION=3.6 TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh
-    - smoke37_optional:
+    - smoke38_optional:
         dir: python/smoke
-        run: VERSION=3.7 INSTALL_OR_SKIP=true ./venv.sh
+        run: VERSION=3.8 INSTALL_OR_SKIP=true ./venv.sh
-    - smoke38:
-        dir: python/smoke
-        run: VERSION=3.8 ./venv.sh
     - smoke39:
         dir: python/smoke
         run: VERSION=3.9 ./venv.sh
@@ -57,18 +54,18 @@
     - smoke313:
         dir: python/smoke
         run: VERSION=3.13 ./venv.sh
-    - smoke_pypy37_optional:
+    - smoke314:
         dir: python/smoke
-        run: PYTHON=pypy3.7 VERSION=3.7 INSTALL_OR_SKIP=true ./venv.sh
+        run: VERSION=3.14 ./venv.sh
-    - smoke_pypy38_optional:
+    - smoke_pypy39_optional:
         dir: python/smoke
-        run: PYTHON=pypy3.8 VERSION=3.8 INSTALL_OR_SKIP=true ./venv.sh
+        run: PYTHON=pypy3.9 VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh
-    - smoke_pypy39:
-        dir: python/smoke
-        run: PYTHON=pypy3.9 VERSION=3.9 ./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
@@ -81,17 +78,15 @@
     required_packages:
     - gcc
     - virtualenv
-    - python2.7
     - python3.6
-    - python3.8
     - python3.9
     - python3.10-devel
     - python3.11-devel
     - python3.12-devel
     - python3.13-devel
-    - python2-devel
+    - python3.14-devel
-    - pypy3.9-devel
     - pypy3.10-devel
+    - pypy3.11-devel
     - python3-tox
     - python3-dnf
     - mock