Update to 4.14.2

- Resolves: rhbz#2264626

changelog

@@ -0,0 +1,341 @@
+* Wed Sep 06 2023 Miro Hrončok <mhroncok@redhat.com> - 4.11.1-1
+- Update to 4.11.1 (rhbz#2236871)
+
+* Wed Aug 30 2023 Miro Hrončok <mhroncok@redhat.com> - 4.11.0-1
+- Update to 4.11.0 (rhbz#2189321)
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 29 2023 Python Maint <python-maint@redhat.com> - 4.4.12-3
+- Rebuilt for Python 3.12
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 4.4.12-2
+- Bootstrap for Python 3.12
+
+* Thu Apr 13 2023 Miro Hrončok <mhroncok@redhat.com> - 4.4.12-1
+- Update to 4.4.12 (rhbz#2186618)
+
+* Wed Apr 12 2023 Miro Hrončok <mhroncok@redhat.com> - 4.4.11-1
+- Update to 4.4.11 (rhbz#2184726)
+
+* Wed Mar 29 2023 Miro Hrončok <mhroncok@redhat.com> - 4.4.8-1
+- Update to 4.4.8 (rhbz#2177519)
+
+* Tue Feb 28 2023 Miro Hrončok <mhroncok@redhat.com> - 4.4.6-1
+- Update to 4.4.6 (rhbz#2164640)
+
+* Tue Jan 24 2023 Miro Hrončok <mhroncok@redhat.com> - 4.3.5-1
+- Update to 4.3.5 (rhbz#2161692)
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Miro Hrončok <mhroncok@redhat.com> - 4.3.3-1
+- Update to 4.3.3 (rhbz#2161429)
+
+* Mon Jan 16 2023 Miro Hrončok <mhroncok@redhat.com> - 4.3.2-1
+- Update to 4.3.2 (rhbz#2161388)
+
+* Mon Jan 16 2023 Lumír Balhar <lbalhar@redhat.com> - 4.3.1-1
+- Update to 4.3.1 (rhbz#2161119)
+
+* Thu Jan 12 2023 Miro Hrončok <mhroncok@redhat.com> - 4.2.8-1
+- Update to 4.2.8 (rhbz#2160315)
+
+* Wed Jan 11 2023 Miro Hrončok <mhroncok@redhat.com> - 4.2.7-1
+- Update to 4.2.7 (rhbz#2160186)
+
+* Tue Jan 3 2023 Lumír Balhar <lbalhar@redhat.com> - 4.2.6-1
+- Update to 4.2.6 (rhbz#1914413)
+
+* Sun Dec 18 2022 Miro Hrončok <mhroncok@redhat.com> - 3.28.0-1
+- Update to 3.28.0
+
+* Fri Nov 25 2022 Miro Hrončok <mhroncok@redhat.com> - 3.27.1-1
+- Update to 3.27.1
+
+* Wed Sep 14 2022 Miro Hrončok <mhroncok@redhat.com> - 3.26.0-1
+- Update to 3.26.0
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 13 2022 Lumír Balhar <lbalhar@redhat.com> - 3.25.1-1
+- Update to 3.25.1
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.25.0-2
+- Rebuilt for Python 3.11
+
+* Mon May 09 2022 Miro Hrončok <mhroncok@redhat.com> - 3.25.0-1
+- Update to 3.25.0
+
+* Tue Feb 22 2022 Rich Megginson <rmeggins@redhat.com> - 3.24.5-2
+- Remove -s flag from tox shebang, make tox see user-installed plugins
+- Fixes: rhbz#2057015
+
+* Tue Jan 25 2022 Miro Hrončok <mhroncok@redhat.com> - 3.24.5-1
+- Update to 3.24.5
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Dec 13 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.4-2
+- Always BuildRequire runtime dependencies to avoid non-installable builds
+- Remove no longer needed obsoletes of python3-detox
+
+* Wed Oct 13 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.24.4-1
+- Update to 3.24.4
+
+* Tue Aug 31 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.3-1
+- Update to 3.24.3
+
+* Wed Aug 04 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-2
+- Obsolete newer versions of python3-tox
+
+* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-1
+- Update to 3.24.1
+
+* Mon Aug 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-2
+- Remove Recommends Python 3.5
+- Add Recommends for Python 3.10
+- https://fedoraproject.org/wiki/Changes/RetirePython3.5
+- https://fedoraproject.org/wiki/Changes/Python3.10
+
+* Mon Jul 26 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-1
+- Update to 3.24.0
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 3.23.0-3
+- Rebuilt for Python 3.10
+
+* Tue Mar 30 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-2
+- Allow building with setuptools_scm 6+
+
+* Wed Mar 17 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-1
+- Update to 3.23.0
+
+* Tue Feb 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.4-1
+- Update to 3.21.4
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-2
+- Rename the installable package to "tox"
+
+* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-1
+- Update to 3.21.0
+
+* Mon Sep 07 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.20.0-1
+- Update to 3.20.0
+- Fixes rhbz#1874601
+
+* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-1
+- Update to 3.19.0
+- Fixes rhbz#1861313
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.0-1
+- Update to 3.18.0
+- Fixes rhbz#1859875
+
+* Tue Jul 14 2020 Miro Hrončok <mhroncok@redhat.com> - 3.17.0-1
+- Update to 3.17.0
+- Fixes rhbz#1856985
+
+* Thu Jul 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.16.1-1
+- Update to 3.16.1
+- Fixes rhbz#1851519
+
+* Mon Jun 08 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.2-1
+- Update to 3.15.2 (#1844689)
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 3.15.1-1
+- Update to 3.15.1 (#1838137)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.0-2
+- Rebuilt for Python 3.9
+
+* Wed May 13 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.15.0-1
+- Update to 3.15.0
+- Stop recommending Python 3.4
+
+* Thu Mar 19 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.14.6-1
+- Update to 3.14.6
+
+* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.14.3-1
+- Update to 3.14.3 (#1725939)
+- Fix invocation with Python 3.9 (#1798929)
+- Recommend Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-3
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jul 08 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-1
+- Update to 3.13.2 (#1699032)
+
+* Tue Apr 30 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0-1
+- Update to 3.9.0
+- Obsolete detox
+- License is MIT
+
+* Fri Feb 15 2019 Lumír Balhar <lbalhar@redhat.com> - 3.5.3-3
+- Recommend Python 3.8
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 22 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.5.3-1
+- Upgrade to 3.5.3 version
+
+* Mon Nov 19 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.4.0-1
+- Upgrade to 3.4.0 version (#1652657)
+
+* Thu Nov 01 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-6
+- remove and revert the change to recommend python 2.7 (rhbz#1645025)
+
+* Tue Aug 28 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-4
+- Don't recommend Python 2.6, it doesn't work with tox 3
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-2
+- Rebuilt for Python 3.7
+
+* Mon Jul 02 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-1
+- upgrade to 3.0.0
+
+* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-7
+- Rebuilt for Python 3.7
+
+* Tue May 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-6
+- Remove the python2 version once again
+- Stop recommending python33 (it's retired)
+
+* Mon May 07 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-5
+- Add python2 back, see #1575667
+
+* Mon Apr 30 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-4
+- Remove the python2 version
+
+* Thu Mar 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-3
+- Switch to automatic dependency generator (also fixes #1556164)
+- Recommend python37
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 29 2018 Matthias Runge <mrunge@redhat.com> - 2.9.1-1
+- update to 2.9.1
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Apr 25 2017 Matthias Runge <mrunge@redhat.com> - 2.7.0-1
+- upgrade to 2.7.0
+
+* Sun Apr 09 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-8
+- Recommend the devel subpackages of Pythons (so tox works with extension modules)
+
+* Tue Feb 14 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-7
+- Recommend python36
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-5
+- Rebuild for Python 3.6
+
+* Mon Oct 10 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-4
+- Recommend "all the Pythons"
+
+* Thu Aug 11 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-3
+- /usr/bin/tox is Python3
+- Python 2 subpackage is python2-tox
+- Run the tests also on Python 3
+- Update Source URL and URL
+- Use modern macros
+- Get rid of Fedora 17 checks
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Mon Feb 29 2016 Matthias Runge <mrunge@redhat.com> - 2.3.1-1
+- update to 2.3.1
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Nov 12 2015 Kalev Lember <klember@redhat.com> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Tue Aug 25 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-2
+- add requirement: python-pluggy
+
+* Tue Aug 18 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-1
+- update to 2.1.1
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Dec 16 2014 Matthias Runge <mrunge@redhat.com> - 1.8.1-1
+- update to 1.8.1
+
+* Wed Aug 13 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-3
+- Fix ConfigError: ConfigError: substitution key 'posargs' not found
+  (rhbz#1127961, rhbz#1128562)
+
+* Wed Jul 30 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-2
+- require virtualenv >= 1.11.2 (rhbz#1122603)
+
+* Tue Jul 08 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-1
+- update to 1.7.1 (rhbz#111797)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Sep 24 2013 Matthias Runge <mrunge@redhat.com> - 1.6.1-1
+- update to 1.6.1
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Nov 14 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-7
+- add requires python-py, python-virtualenv (rhbz#876246)
+
+* Thu Oct 18 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-6
+- change license to GPLv2+ and MIT
+
+* Tue Oct 16 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-5
+- totally disable python3 support for now
+
+* Fri Oct 12 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-4
+- conditionalize checks, as internet connection required, not available on koji
+
+* Thu Oct 11 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-3
+- buildrequirement: virtualenv
+- disable python3-tests because of missing build-requirement python3-virtualenv
+
+* Wed Oct 10 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-2
+- include tests
+
+* Tue Oct 09 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-1
+- initial packaging

fix-tests.patch

@@ -0,0 +1,121 @@
+From 9e70838d0fe10576c8e991a2ac8cff09eab8a4b8 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Tue, 10 Jan 2023 08:34:25 +0100
+Subject: [PATCH] fix tests
+
+---
+ pyproject.toml          |  5 -----
+ src/tox/pytest.py       | 16 +++-------------
+ tests/test_provision.py | 17 ++---------------
+ 3 files changed, 5 insertions(+), 33 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index c34eed8..4604c52 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -72,9 +72,6 @@ optional-dependencies.docs = [
+ ]
+ optional-dependencies.testing = [
+   "build[virtualenv]>=1.0.3",
+-  "covdefaults>=2.3",
+-  "detect-test-pollution>=1.2",
+-  "devpi-process>=1",
+   "diff-cover>=8.0.2",
+   "distlib>=0.3.8",
+   "flaky>=3.7",
+@@ -82,7 +79,6 @@ optional-dependencies.testing = [
+   "hatchling>=1.21",
+   "psutil>=5.9.7",
+   "pytest>=7.4.4",
+-  "pytest-cov>=4.1",
+   "pytest-mock>=3.12",
+   "pytest-xdist>=3.5",
+   "re-assert>=1.1",
+@@ -162,7 +158,6 @@ paths.source = [
+ report.fail_under = 88
+ report.omit = ["src/tox/config/cli/for_docs.py", "tests/execute/local_subprocess/bad_process.py", "tests/type_check/*"]
+ run.parallel = true
+-run.plugins = ["covdefaults"]
+ 
+ [tool.towncrier]
+ name = "tox"
+diff --git a/src/tox/pytest.py b/src/tox/pytest.py
+index d734def..5e6df35 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
+ 
+ import pytest
+ from _pytest.fixtures import SubRequest  # noqa: PLC2701
+-from devpi_process import IndexServer
+ from virtualenv.info import fs_supports_symlink
+ 
+ import tox.run
+@@ -277,9 +276,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")
+-                m.setenv("VIRTUALENV_PIP", "embed")
+-                m.setenv("VIRTUALENV_WHEEL", "embed")
+-                m.setenv("VIRTUALENV_SETUPTOOLS", "embed")
++                m.setenv("VIRTUALENV_PIP", "bundle")
++                m.setenv("VIRTUALENV_WHEEL", "bundle")
++                m.setenv("VIRTUALENV_SETUPTOOLS", "bundle")
+                 try:
+                     tox_run(args)
+                 except SystemExit as exception:
+@@ -472,15 +471,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None
+     monkeypatch.setenv("PIP_TIMEOUT", str(2))
+ 
+ 
+-@pytest.fixture(scope="session")
+-def pypi_server(tmp_path_factory: pytest.TempPathFactory) -> Iterator[IndexServer]:
+-    # takes around 2.5s
+-    path = tmp_path_factory.mktemp("pypi")
+-    with IndexServer(path) as server:
+-        server.create_index("empty", "volatile=False")
+-        yield server
+-
+-
+ @pytest.fixture(scope="session")
+ def _invalid_index_fake_port() -> int:  # noqa: PT005
+     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
+--- 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]
+         return result
+ 
+ 
+-@pytest.fixture(scope="session")
+-def pypi_index_self(pypi_server: IndexServer, tox_wheels: list[Path], demo_pkg_inline_wheel: Path) -> Index:
+-    with elapsed("start devpi and create index"):  # takes around 1s
+-        self_index = pypi_server.create_index("self", "volatile=False")
+-    with elapsed("upload tox and its wheels to devpi"):  # takes around 3.2s on build
+-        self_index.upload(*tox_wheels, demo_pkg_inline_wheel)
+-    return self_index
+-
+-
+ @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) -
+ 
+ 
+ @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})
+-- 
+2.44.0
+

python-tox.spec

@@ -1,29 +1,37 @@
-# Tests are disbaled by default, they require:
+# Many tests are enabled by default
-#  a) tested tox to be installed
+%bcond tests 1
+# However, some tests are disabled by default, becasue they require:
+#  a) tested tox to be installed and/or
 #  b) internet connection
-# To test, do the following:
+# To run them, do the following:
-#  1) Build --without tests (the default)
+#  1) Build --without ci_tests (the default) and optionally --without tests
-#     (e.g. fedpkg mockbuild)
+#     (e.g. fedpkg mockbuild --without tests)
 #  2) Install the built package
 #     (e.g. mock install ./results_python-tox/.../tox-...rpm)
-#  3) Build again --with tests (and internet connection)
+#  3) Build again --with ci_tests (and internet connection)
-#     (e.g. fedpkg mockbuild --enable-network --no-clean-all --with tests)
+#     (e.g. fedpkg mockbuild --no-clean-all --enable-network --with ci_tests)
 # The Fedora CI tests do this.
-%bcond_with tests
+%bcond ci_tests 0
 
 # Unset -s on python shebang - ensure that extensions installed with pip
 # to user locations are seen and properly loaded
 # Fixes https://bugzilla.redhat.com/2057015
-%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)
+%undefine _py3_shebang_s
 
 Name:           python-tox
-Version:        3.27.1
+Version:        4.14.2
-Release:        1%{?dist}
+Release:        %autorelease
 Summary:        Virtualenv-based automation of test activities
 
 License:        MIT
 URL:            https://tox.readthedocs.io/
-Source0:        %{pypi_source tox}
+Source:         %{pypi_source tox}
+
+# Remove dependency on devpi-process.
+# Remove dependency on detect-test-pollution.
+# Remove coverage-related dependencies.
+# Adjust virtualenv environment variables to make it work with our patched virtualenv.
+Patch:          fix-tests.patch
 
 BuildArch:      noarch
 
@@ -39,9 +47,14 @@ 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
-# The tests only work if the tested tox is installed :(
+# 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}
 %endif
+%endif
 
 %global _description %{expand:
 Tox as is a generic virtualenv management and test command line tool you
@@ -82,8 +95,6 @@ Recommends:     python3-devel
 # https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/
 
 %py_provides    python3-tox
-# Remove this once Fedora 36 goes EOL:
-Obsoletes:      python3-tox < 3.24.4-2
 
 %description -n tox %_description
 
@@ -91,17 +102,21 @@ Obsoletes:      python3-tox < 3.24.4-2
 %prep
 %autosetup -p1 -n tox-%{version}
 
-# In https://github.com/tox-dev/tox/pull/2463 upstream insisted on pinning tomli to >=2.0.1.
+# Upstream updates dependencies too aggressively
-# However, it works fine with 1.2.3 we have in Fedora 35+36, so we relax the dependency.
+# see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356
-# We rely on the Fedora CI to catch problems.
+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 -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg
+        -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}
 
 
 %build
+export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}"
 %pyproject_wheel
 
 
@@ -112,300 +127,37 @@ sed -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg
 
 %if %{with tests}
 %check
-%pytest -n auto
+# Skipped tests use internal virtualenv functionality to
+# download wheels which does not work with "bundled" version of wheel in
+# the Fedora's virtualenv patch.
+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"
+
+# The following tests either need internet connection or installed tox
+# so we only run them on the CI.
+%if %{without ci_tests}
+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"
+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
+
+%pytest -v -n auto -k "${k-}" --run-integration
 %endif
 
 
 %files -n tox -f %{pyproject_files}
 %{_bindir}/tox
-%{_bindir}/tox-quickstart
 
 
 %changelog
-* Fri Nov 25 2022 Miro Hrončok <mhroncok@redhat.com> - 3.27.1-1
+%autochangelog
-- Update to 3.27.1
-
-* Wed Sep 14 2022 Miro Hrončok <mhroncok@redhat.com> - 3.26.0-1
-- Update to 3.26.0
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jul 13 2022 Lumír Balhar <lbalhar@redhat.com> - 3.25.1-1
-- Update to 3.25.1
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.25.0-2
-- Rebuilt for Python 3.11
-
-* Mon May 09 2022 Miro Hrončok <mhroncok@redhat.com> - 3.25.0-1
-- Update to 3.25.0
-
-* Tue Feb 22 2022 Rich Megginson <rmeggins@redhat.com> - 3.24.5-2
-- Remove -s flag from tox shebang, make tox see user-installed plugins
-- Fixes: rhbz#2057015
-
-* Tue Jan 25 2022 Miro Hrončok <mhroncok@redhat.com> - 3.24.5-1
-- Update to 3.24.5
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Dec 13 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.4-2
-- Always BuildRequire runtime dependencies to avoid non-installable builds
-- Remove no longer needed obsoletes of python3-detox
-
-* Wed Oct 13 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.24.4-1
-- Update to 3.24.4
-
-* Tue Aug 31 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.3-1
-- Update to 3.24.3
-
-* Wed Aug 04 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-2
-- Obsolete newer versions of python3-tox
-
-* Tue Aug 03 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.1-1
-- Update to 3.24.1
-
-* Mon Aug 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-2
-- Remove Recommends Python 3.5
-- Add Recommends for Python 3.10
-- https://fedoraproject.org/wiki/Changes/RetirePython3.5
-- https://fedoraproject.org/wiki/Changes/Python3.10
-
-* Mon Jul 26 2021 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-1
-- Update to 3.24.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 3.23.0-3
-- Rebuilt for Python 3.10
-
-* Tue Mar 30 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-2
-- Allow building with setuptools_scm 6+
-
-* Wed Mar 17 2021 Miro Hrončok <mhroncok@redhat.com> - 3.23.0-1
-- Update to 3.23.0
-
-* Tue Feb 02 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.4-1
-- Update to 3.21.4
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-2
-- Rename the installable package to "tox"
-
-* Fri Jan 08 2021 Miro Hrončok <mhroncok@redhat.com> - 3.21.0-1
-- Update to 3.21.0
-
-* Mon Sep 07 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.20.0-1
-- Update to 3.20.0
-- Fixes rhbz#1874601
-
-* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 3.19.0-1
-- Update to 3.19.0
-- Fixes rhbz#1861313
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.0-1
-- Update to 3.18.0
-- Fixes rhbz#1859875
-
-* Tue Jul 14 2020 Miro Hrončok <mhroncok@redhat.com> - 3.17.0-1
-- Update to 3.17.0
-- Fixes rhbz#1856985
-
-* Thu Jul 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.16.1-1
-- Update to 3.16.1
-- Fixes rhbz#1851519
-
-* Mon Jun 08 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.2-1
-- Update to 3.15.2 (#1844689)
-
-* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 3.15.1-1
-- Update to 3.15.1 (#1838137)
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.15.0-2
-- Rebuilt for Python 3.9
-
-* Wed May 13 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.15.0-1
-- Update to 3.15.0
-- Stop recommending Python 3.4
-
-* Thu Mar 19 2020 Tomas Hrnciar <thrnciar@redhat.com> - 3.14.6-1
-- Update to 3.14.6
-
-* Thu Feb 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.14.3-1
-- Update to 3.14.3 (#1725939)
-- Fix invocation with Python 3.9 (#1798929)
-- Recommend Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 08 2019 Miro Hrončok <mhroncok@redhat.com> - 3.13.2-1
-- Update to 3.13.2 (#1699032)
-
-* Tue Apr 30 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0-1
-- Update to 3.9.0
-- Obsolete detox
-- License is MIT
-
-* Fri Feb 15 2019 Lumír Balhar <lbalhar@redhat.com> - 3.5.3-3
-- Recommend Python 3.8
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Nov 22 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.5.3-1
-- Upgrade to 3.5.3 version
-
-* Mon Nov 19 2018 Artem Goncharov <artem.goncharov@gmail.com> - 3.4.0-1
-- Upgrade to 3.4.0 version (#1652657)
-
-* Thu Nov 01 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-6
-- remove and revert the change to recommend python 2.7 (rhbz#1645025)
-
-* Tue Aug 28 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-4
-- Don't recommend Python 2.6, it doesn't work with tox 3
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-2
-- Rebuilt for Python 3.7
-
-* Mon Jul 02 2018 Matthias Runge <mrunge@redhat.com> - 3.0.0-1
-- upgrade to 3.0.0
-
-* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-7
-- Rebuilt for Python 3.7
-
-* Tue May 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-6
-- Remove the python2 version once again
-- Stop recommending python33 (it's retired)
-
-* Mon May 07 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-5
-- Add python2 back, see #1575667
-
-* Mon Apr 30 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-4
-- Remove the python2 version
-
-* Thu Mar 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-3
-- Switch to automatic dependency generator (also fixes #1556164)
-- Recommend python37
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 29 2018 Matthias Runge <mrunge@redhat.com> - 2.9.1-1
-- update to 2.9.1
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Apr 25 2017 Matthias Runge <mrunge@redhat.com> - 2.7.0-1
-- upgrade to 2.7.0
-
-* Sun Apr 09 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-8
-- Recommend the devel subpackages of Pythons (so tox works with extension modules)
-
-* Tue Feb 14 2017 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-7
-- Recommend python36
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-5
-- Rebuild for Python 3.6
-
-* Mon Oct 10 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-4
-- Recommend "all the Pythons"
-
-* Thu Aug 11 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-3
-- /usr/bin/tox is Python3
-- Python 2 subpackage is python2-tox
-- Run the tests also on Python 3
-- Update Source URL and URL
-- Use modern macros
-- Get rid of Fedora 17 checks
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-2
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Mon Feb 29 2016 Matthias Runge <mrunge@redhat.com> - 2.3.1-1
-- update to 2.3.1
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Nov 12 2015 Kalev Lember <klember@redhat.com> - 2.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Tue Aug 25 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-2
-- add requirement: python-pluggy
-
-* Tue Aug 18 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-1
-- update to 2.1.1
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Dec 16 2014 Matthias Runge <mrunge@redhat.com> - 1.8.1-1
-- update to 1.8.1
-
-* Wed Aug 13 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-3
-- Fix ConfigError: ConfigError: substitution key 'posargs' not found
-  (rhbz#1127961, rhbz#1128562)
-
-* Wed Jul 30 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-2
-- require virtualenv >= 1.11.2 (rhbz#1122603)
-
-* Tue Jul 08 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-1
-- update to 1.7.1 (rhbz#111797)
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Sep 24 2013 Matthias Runge <mrunge@redhat.com> - 1.6.1-1
-- update to 1.6.1
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Nov 14 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-7
-- add requires python-py, python-virtualenv (rhbz#876246)
-
-* Thu Oct 18 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-6
-- change license to GPLv2+ and MIT
-
-* Tue Oct 16 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-5
-- totally disable python3 support for now
-
-* Fri Oct 12 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-4
-- conditionalize checks, as internet connection required, not available on koji
-
-* Thu Oct 11 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-3
-- buildrequirement: virtualenv
-- disable python3-tests because of missing build-requirement python3-virtualenv
-
-* Wed Oct 10 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-2
-- include tests
-
-* Tue Oct 09 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-1
-- initial packaging

sources

@@ -1 +1 @@
-SHA512 (tox-3.27.1.tar.gz) = 89be82a1e0374ce3e281e63bdf36d1619878c46ba5e2a3b45ee28ed3a3ab13b1f7030ad27efabb866a084fb813d1e146ad9fa81f22580904d0e261a94fde0689
+SHA512 (tox-4.14.2.tar.gz) = 45bbd3f8d00eee05158452295230321947ec16a8bfff43e84ea9825d514976526f3889709255ed042cfb7a7ebfed020707cfc2d25b69ce90c148f4472092350d

tests/all_supplementing_pythons.py

@@ -50,14 +50,14 @@ for python in sorted(tested_pythons):
 
 # Get all packages that supplement tox,
 # no repo explicitly specified means we use the enabled repos on the CI system which should be what we want
-repoquery_result = subprocess.check_output(['dnf', 'repoquery', '--whatsupplements', 'tox'], text=True)
+repoquery_result = subprocess.check_output(['dnf-3', 'repoquery', '--whatsupplements', 'tox'], text=True)
 supplementing_pkgs = set(repoquery_result.splitlines())
 
 
 # It gets quite tricky, since packages like "pypy" can supplement tox, we get a set of provides for all of them
 supplementing_pkgs_provides = {}
 for nvra in supplementing_pkgs:
-    repoquery_result = subprocess.check_output(['dnf', '-q', 'repoquery', '--provides', nvra], text=True)
+    repoquery_result = subprocess.check_output(['dnf-3', '-q', 'repoquery', '--provides', nvra], text=True)
     provides = set(repoquery_result.splitlines())
     unversioned_provides = {provide.split(' ')[0] for provide in provides}
     supplementing_pkgs_provides[nvra.rsplit('-', 2)[0]] = unversioned_provides

tests/tests.yml

@@ -26,22 +26,19 @@
     tests:
     - mock_with_tests:
         dir: .
-        run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with tests
+        run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with ci_tests
     - all_supplementing_pythons:
         dir: tests
         run: ./all_supplementing_pythons.py
     - smoke27:
         dir: python/smoke
         run: VERSION=2.7 METHOD=virtualenv ./venv.sh
-    - smoke35_optional:
-        dir: python/smoke
-        run: VERSION=3.5 INSTALL_OR_SKIP=true ./venv.sh
     - smoke36:
         dir: python/smoke
         run: VERSION=3.6 ./venv.sh
-    - smoke37:
+    - smoke37_optional:
         dir: python/smoke
-        run: VERSION=3.7 ./venv.sh
+        run: VERSION=3.7 INSTALL_OR_SKIP=true ./venv.sh
     - smoke38:
         dir: python/smoke
         run: VERSION=3.8 ./venv.sh
@@ -57,15 +54,21 @@
     - smoke312:
         dir: python/smoke
         run: VERSION=3.12 ./venv.sh
+    - smoke313:
+        dir: python/smoke
+        run: VERSION=3.13 ./venv.sh
     - smoke_pypy37_optional:
         dir: python/smoke
         run: PYTHON=pypy3.7 VERSION=3.7 INSTALL_OR_SKIP=true ./venv.sh
-    - smoke_pypy38:
+    - smoke_pypy38_optional:
         dir: python/smoke
-        run: PYTHON=pypy3.8 VERSION=3.8 ./venv.sh
+        run: PYTHON=pypy3.8 VERSION=3.8 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
     - pyproject_pytest:
         dir: pyproject-rpm-macros/tests
         run: ./mocktest.sh python-pytest
@@ -80,17 +83,17 @@
     - virtualenv
     - python2.7
     - python3.6
-    - python3.7
     - python3.8
     - python3.9
     - python3.10-devel
     - python3.11-devel
     - python3.12-devel
+    - python3.13-devel
     - python2-devel
-    - pypy3.8-devel
     - pypy3.9-devel
+    - pypy3.10-devel
     - python3-tox
-    - dnf
+    - python3-dnf
     - mock
     - rpmdevtools
     - rpm-build