Update to 4.23.2

- Fixes: rhbz#2318843

.gitignore

@@ -1,7 +1,2 @@
-/tox-1.4.2.zip
+/tox-*.tar.gz
-/tox-1.6.1.tar.gz
+/tox-*/
-/tox-1.7.1.tar.gz
-/tox-1.8.1.tar.gz
-/tox-2.1.1.tar.gz
-/tox-2.3.1.tar.gz
-/tox-2.7.0.tar.gz

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,124 @@
+From 1ade3df7eaefad792a2a519c0f3cc3a8f28a5829 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          |  8 --------
+ src/tox/pytest.py       | 16 +++-------------
+ tests/test_provision.py | 18 ++----------------
+ 3 files changed, 5 insertions(+), 37 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 74219b1..6cd2da8 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -167,9 +167,6 @@ report.omit = [
+   "tests/type_check/*",
+ ]
+ run.parallel = true
+-run.plugins = [
+-  "covdefaults",
+-]
+ 
+ [tool.towncrier]
+ name = "tox"
+@@ -229,17 +226,12 @@ release = [
+ ]
+ test = [
+   "build[virtualenv]>=1.2.2",
+-  "covdefaults>=2.3",
+-  "detect-test-pollution>=1.2",
+-  "devpi-process>=1.0.2",
+-  "diff-cover>=9.2",
+   "distlib>=0.3.8",
+   "flaky>=3.8.1",
+   "hatch-vcs>=0.4",
+   "hatchling>=1.25",
+   "psutil>=6",
+   "pytest>=8.3.3",
+-  "pytest-cov>=5",
+   "pytest-mock>=3.14",
+   "pytest-xdist>=3.6.1",
+   "re-assert>=1.1",
+diff --git a/src/tox/pytest.py b/src/tox/pytest.py
+index ca42a5b..183e2f4 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
+@@ -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")
+-                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:
+@@ -475,15 +474,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:
+     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 5b2b652..7657c2e 100644
+--- a/tests/test_provision.py
++++ b/tests/test_provision.py
+@@ -98,22 +98,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:
+     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.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.47.0
+

python-tox.spec

@@ -1,49 +1,62 @@
-# Tests requiring Internet connections are disabled by default
+%bcond bootstrap 0
-# pass --with internet to run them (e.g. when doing a local rebuild
+# Many tests are enabled by default, unless bootstrapping
-# for sanity checks before committing)
+%bcond tests %{without bootstrap}
-%bcond_with internet
+# However, some tests are disabled by default, becasue they require:
+#  a) tested tox to be installed and/or
+#  b) internet connection
+# To run them, do the following:
+#  1) Build --without ci_tests (the default) and optionally --without tests
+#     (e.g. fedpkg mockbuild --without tests)
+#  2) Install the built package
+#     (e.g. mock install ./results_python-tox/.../tox-...rpm)
+#  3) Build again --with ci_tests (and internet connection)
+#     (e.g. fedpkg mockbuild --no-clean-all --enable-network --with ci_tests)
+# The Fedora CI tests do this.
+%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
+%undefine _py3_shebang_s
 
-%global pypiname tox
+Name:           python-tox
-Name:           python-%{pypiname}
+Version:        4.23.2
-Version:        2.7.0
+Release:        %autorelease
-Release:        1%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
-# file toxbootstrap.py is licensed under MIT License
+License:        MIT
-License:        GPLv2+ and MIT
+URL:            https://tox.readthedocs.io/
-URL:            http://tox.testrun.org/
+Source:         %{pypi_source tox}
-Source0:        https://files.pythonhosted.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
+
+# 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
 
-%description
+BuildRequires:  python3-devel
-Tox as is a generic virtualenv management and test command line tool you
+# for dependency-groups support:
-can use for:
+BuildRequires:  pyproject-rpm-macros >= 1.16
 
- - checking your package installs correctly with different Python versions
+%if %{with tests}
-   and interpreters
+BuildRequires:  /usr/bin/gcc
- - running your tests in each of the environments, configuring your test tool
+BuildRequires:  /usr/bin/git
-   of choice
+BuildRequires:  /usr/bin/pip
- - acting as a frontend to Continuous Integration servers, greatly reducing
+BuildRequires:  /usr/bin/pytest
-   boilerplate and merging CI and shell-based testing.
+BuildRequires:  /usr/bin/python
-
+BuildRequires:  libffi-devel
-%package -n     python2-%{pypiname}
+# xdist is not used upstream, but we use it to speed up the %%check
-Summary:        %{summary}
+BuildRequires:  python3-pytest-xdist
-%{?python_provide:%python_provide python2-%{pypiname}}
+%if %{with ci_tests}
-BuildRequires:  python2-devel
+# The CI tests only work if the tested tox is installed :(
-BuildRequires:  python2-setuptools
+# This should technically be the same V-R, but the CI does not handle %%autorelease well
-Requires:  python2-py
+BuildRequires:  tox = %{version}
-Requires:  python2-virtualenv >= 1.11.2
+%endif
-Requires:  python-pluggy
-
-%if %{with internet}
-# for tests
-BuildRequires:  python2-py
-BuildRequires:  python2-pytest
-BuildRequires:  python2-virtualenv >= 1.11.2
 %endif
 
-%description -n python2-%{pypiname}
+%global _description %{expand:
 Tox as is a generic virtualenv management and test command line tool you
 can use for:
 
@@ -52,177 +65,102 @@ can use for:
  - running your tests in each of the environments, configuring your test tool
    of choice
  - acting as a frontend to Continuous Integration servers, greatly reducing
-   boilerplate and merging CI and shell-based testing.
+   boilerplate and merging CI and shell-based testing.}
 
-This package contains just the module you can import from Python 2,
+%description %_description
-for the actual command line utility, dnf install tox.
 
-%package -n python3-%{pypiname}
+
+%package -n tox
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypiname}}
-Provides:       %{pypiname} = %{version}-%{release}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-Requires:       python3-py
-Requires:       python3-pluggy
-Requires:       python3-virtualenv
 
 # Recommend "all the Pythons"
-Recommends:     python26
+# Why? Tox exists to enable developers to test libraries against various Python
-Recommends:     python27
+# versions, with just "dnf install tox" and a config file.
-Recommends:     python33
+# See: https://developer.fedoraproject.org/tech/languages/python/python-installation.html#using-virtualenv
-Recommends:     python34
+# Tox itself runs on the system python3 (i.e. %%{python3_version},
-Recommends:     python35
+# however it launches other Python versions as subprocesses.
-Recommends:     python36
+# It recommends all Python versions it supports. (This is an exception to
-Recommends:     pypy-devel
+# the rule that Fedora packages may not require the alternative interpreters.)
+Recommends:     python3.8
+Recommends:     python3.9
+Recommends:     python3.10
 Recommends:     pypy3-devel
-Recommends:     python2-devel
 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/
 
-%if %{with internet}
+%py_provides    python3-tox
-# for tests
-BuildRequires:  python3-py
-BuildRequires:  python3-pytest
-BuildRequires:  python3-virtualenv
-%endif
 
-%description -n python3-%{pypiname}
+%description -n tox %_description
-Tox as is a generic virtualenv management and test command line tool you
-can use for:
 
- - checking your package installs correctly with different Python versions
-   and interpreters
- - running your tests in each of the environments, configuring your test tool
-   of choice
- - acting as a frontend to Continuous Integration servers, greatly reducing
-   boilerplate and merging CI and shell-based testing.
 
 %prep
-%setup -q -n %{pypiname}-%{version}
+%autosetup -p1 -n tox-%{version}
+
+# Upstream updates dependencies too aggressively
+# see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356
+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/"(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:-g test}
 
-# remove bundled egg-info
-rm -rf %{pypiname}.egg-info
 
 %build
-%py2_build
+export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}"
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py2_install
+%pyproject_install
-rm %{buildroot}%{_bindir}/%{pypiname}*
+%pyproject_save_files tox
 
-%py3_install
 
-# if internet connection available, run tests
+%if %{with tests}
-%if %{with internet}
 %check
-TOXENV=py27 %{__python2} setup.py test
+# Skipped tests use internal virtualenv functionality to
-TOXENV=py%{python3_version_nodots} %{__python3} setup.py test
+# 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"
+
+# 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
 
-%files -n python2-%{pypiname}
+# https://github.com/tox-dev/tox/commit/698f1dd663
-%license LICENSE
+# Until we have setuptools 70.1+ we skip those
-%{python2_sitelib}/%{pypiname}
+k="${k-}${k+ and }not test_result_json_sequential"
-%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
+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}
+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"
+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
 
-%files -n python3-%{pypiname}
-%{_bindir}/%{pypiname}
-%{_bindir}/%{pypiname}-quickstart
-%{python3_sitelib}/%{pypiname}
-%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
-* Tue Apr 25 2017 Matthias Runge <mrunge@redhat.com> - 2.7.0-1
+%autochangelog
-- 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-2.7.0.tar.gz) = 96088a9f77e8b994d920a8c9907a0fa50d5e0fe918e5a67673d4c30810642be2872283810d1d8b5ae9cc311605236b64343248485c4d4067b54c7b6d9f31a4b4
+SHA512 (tox-4.23.2.tar.gz) = 5008964ebed3c94a6ad5f0985150c7bf73fd3996b91171b16323d195bf0288102aac0dc38848bd4c63e5c5678ab1a82c170579139eda97132a4555eb11d381a0

tests/all_supplementing_pythons.py

@@ -0,0 +1,88 @@
+#!/usr/bin/python3
+"""
+Several packages with various Python interpreters *Supplement* tox.
+*Supplements* is a reverse dependency to *Recommends*.
+
+See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/
+
+This script:
+
+ 1) figures out all packages in the enabled repositories supplementing tox
+ 2) ensures there is a venv.sh test for each of them in tests.yml
+
+That way, when we change tox (update, patch, etc.),
+we will always test it with all Pythons that supplement it.
+"""
+
+import shlex
+import subprocess
+import sys
+import yaml
+
+
+def parse_python_test_arg(command):
+    tokens = shlex.split(command)
+    for token in tokens:
+        if token.startswith('PYTHON='):
+            return token.removeprefix('PYTHON=')
+    # only check VERSION if PYTHON was not found
+    for token in tokens:
+        if token.startswith('VERSION='):
+            return 'python' + token.removeprefix('VERSION=')
+    raise RuntimeError(f'Could not determine the Python version from `{command}`')
+
+
+# First, construct a set of various Pythons we test, e.g. {python3.10, python3.7, pypy3.6, ...}
+tested_pythons = set()
+with open('tests.yml') as f:
+    tests_yml = yaml.safe_load(f)
+# this nested structure access is quite fragile,
+# but at least it should fail the test if we reach to a wrong place
+for test in tests_yml[-1]['roles'][0]['tests']:
+    for value in test.values():
+        run = value['run']
+        if run.endswith('./venv.sh'):
+            tested_pythons.add(parse_python_test_arg(run))
+print('Tested Pythons found in tests.yml:', file=sys.stderr)
+for python in sorted(tested_pythons):
+    print('    ', python, file=sys.stderr)
+
+
+# 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-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-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
+
+
+# We use this hack to treat -devel and -libs packages as if they were not such
+def normalize_name(pkgname):
+    for suffix in '-devel', '-libs':
+        if pkgname.endswith(suffix):
+            return pkgname.removesuffix(suffix)
+    return pkgname
+
+
+# Now, for each package that supplements tox, we check if there is a tested Python that *is* it
+exit_code = 0
+for pkg, provides in supplementing_pkgs_provides.items():
+    if normalize_name(pkg) in tested_pythons:
+        print(f'{pkg} is tested', file=sys.stderr)
+        continue
+    for provide in provides:
+        if normalize_name(provide) in tested_pythons:
+            print(f'{pkg} is tested (via {provide})', file=sys.stderr)
+            break
+    else:
+        print(f'{pkg} is NOT tested', file=sys.stderr)
+        exit_code = 1
+
+sys.exit(exit_code)

tests/tests.yml

@@ -0,0 +1,86 @@
+---
+- hosts: localhost
+  tags:
+    - classic
+  tasks:
+    - dnf:
+        name: "*"
+        state: latest
+
+- hosts: localhost
+  tags:
+  - classic
+  pre_tasks:
+  - import_role:
+      name: standard-test-source
+    vars:
+      fetch_only: True
+
+  roles:
+  - role: standard-test-basic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/python.git"
+      dest: "python"
+    - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
+      dest: "pyproject-rpm-macros"
+    tests:
+    - mock_with_tests:
+        dir: .
+        run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with ci_tests
+    - all_supplementing_pythons:
+        dir: tests
+        run: ./all_supplementing_pythons.py
+    - smoke38:
+        dir: python/smoke
+        run: VERSION=3.8 ./venv.sh
+    - smoke39:
+        dir: python/smoke
+        run: VERSION=3.9 ./venv.sh
+    - smoke310:
+        dir: python/smoke
+        run: VERSION=3.10 ./venv.sh
+    - smoke311:
+        dir: python/smoke
+        run: VERSION=3.11 ./venv.sh
+    - smoke312:
+        dir: python/smoke
+        run: VERSION=3.12 ./venv.sh
+    - smoke313:
+        dir: python/smoke
+        run: VERSION=3.13 ./venv.sh
+    - smoke314:
+        dir: python/smoke
+        run: VERSION=3.14 ./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
+    - pyproject_pluggy:
+        dir: pyproject-rpm-macros/tests
+        run: ./mocktest.sh python-pluggy
+    - pyproject_openqa_client:
+        dir: pyproject-rpm-macros/tests
+        run: ./mocktest.sh python-openqa_client
+    required_packages:
+    - gcc
+    - virtualenv
+    - python3.8
+    - python3.9
+    - python3.10-devel
+    - python3.11-devel
+    - python3.12-devel
+    - python3.13-devel
+    - python3.14-devel
+    - pypy3.9-devel
+    - pypy3.10-devel
+    - python3-tox
+    - python3-dnf
+    - mock
+    - rpmdevtools
+    - rpm-build
+    - python3-pyyaml