From 3646d9e27be0a4c4626ca211e87861ec46b78186 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 19:56:57 +0200 Subject: [PATCH 01/99] Rebuilt for Python 3.11 --- python-tox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 39388cb..2ccb2ea 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -18,7 +18,7 @@ Name: python-tox Version: 3.25.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Mon Jun 13 2022 Python Maint - 3.25.0-2 +- Rebuilt for Python 3.11 + * Mon May 09 2022 Miro Hrončok - 3.25.0-1 - Update to 3.25.0 From fc33709c23cfa05d1b7c0b517821143e8f4c9584 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 13 Jul 2022 10:49:15 +0200 Subject: [PATCH 02/99] Update to 3.25.1 --- python-tox.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 2ccb2ea..7db0a77 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,8 +17,8 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.25.0 -Release: 2%{?dist} +Version: 3.25.1 +Release: 1%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Wed Jul 13 2022 Lumír Balhar - 3.25.1-1 +- Update to 3.25.1 + * Mon Jun 13 2022 Python Maint - 3.25.0-2 - Rebuilt for Python 3.11 diff --git a/sources b/sources index a41a313..d5f0e15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.25.0.tar.gz) = d98ed9f589c751ddc187618caf509fbc64e99f1b5eafeb9cbd919d94d10e15a55331658121efabac53ef07adeb71af15da8be86fc4f35688a8f9b93bf3e723d1 +SHA512 (tox-3.25.1.tar.gz) = 53244a80d1dd851c62c5004a54acbbb0062747b037fac0c356016dbeaac75cc16e5e70ef51ec7825f702d1d475b12dfea19b8ec8573bdcb8a30dbc0c5a11fb65 From 95d829b80a94d6cff869e83877b086642771c2f0 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 14 Jul 2022 09:05:36 +0200 Subject: [PATCH 03/99] Fix names of dependencies for tests in CI --- tests/tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 83e4c96..74d78f5 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -80,10 +80,9 @@ - python3.7 - python3.8 - python3.9 - - python3.10 - - python3.11 + - python3.10-devel + - python3.11-devel - python2-devel - - python3-devel - pypy3.7-devel - pypy3.8-devel - pypy3.9-devel From b1d265dfe586a8174292cfef4d7c0324e588842b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 23:01:41 +0000 Subject: [PATCH 04/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-tox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 7db0a77..2f81dc0 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -18,7 +18,7 @@ Name: python-tox Version: 3.25.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 3.25.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Lumír Balhar - 3.25.1-1 - Update to 3.25.1 From 066e7174f8b8f66b52c72d38bed7154ea0637380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 14 Sep 2022 14:52:45 +0200 Subject: [PATCH 05/99] Update to 3.26.0 --- python-tox.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 2f81dc0..d4e6a36 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,8 +17,8 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.25.1 -Release: 2%{?dist} +Version: 3.26.0 +Release: 1%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Wed Sep 14 2022 Miro Hrončok - 3.26.0-1 +- Update to 3.26.0 + * Fri Jul 22 2022 Fedora Release Engineering - 3.25.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index d5f0e15..a024e50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.25.1.tar.gz) = 53244a80d1dd851c62c5004a54acbbb0062747b037fac0c356016dbeaac75cc16e5e70ef51ec7825f702d1d475b12dfea19b8ec8573bdcb8a30dbc0c5a11fb65 +SHA512 (tox-3.26.0.tar.gz) = 36a4a8deb5d2a9f36be9ddf75ce7422f9792911348b68a71acc9ae48a1159ef671e7ceaa1c86ef3e610c0c69f21f5a6e668ba2676ee811a427d04ebfab06111b From ca97e78349b08cebef98f67ab248671ef541207d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 13 Jul 2022 08:49:15 +0000 Subject: [PATCH 06/99] Update to 3.25.1 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 39388cb..104f5da 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,7 +17,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.25.0 +Version: 3.25.1 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Wed Jul 13 2022 Lumír Balhar - 3.25.1-1 +- Update to 3.25.1 + * Mon May 09 2022 Miro Hrončok - 3.25.0-1 - Update to 3.25.0 diff --git a/sources b/sources index a41a313..d5f0e15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.25.0.tar.gz) = d98ed9f589c751ddc187618caf509fbc64e99f1b5eafeb9cbd919d94d10e15a55331658121efabac53ef07adeb71af15da8be86fc4f35688a8f9b93bf3e723d1 +SHA512 (tox-3.25.1.tar.gz) = 53244a80d1dd851c62c5004a54acbbb0062747b037fac0c356016dbeaac75cc16e5e70ef51ec7825f702d1d475b12dfea19b8ec8573bdcb8a30dbc0c5a11fb65 From 494739e213c1e21b3bb1c9b7779810e8991f7c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 14 Sep 2022 12:52:45 +0000 Subject: [PATCH 07/99] Update to 3.26.0 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 104f5da..039f978 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,7 +17,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.25.1 +Version: 3.26.0 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Wed Sep 14 2022 Miro Hrončok - 3.26.0-1 +- Update to 3.26.0 + * Wed Jul 13 2022 Lumír Balhar - 3.25.1-1 - Update to 3.25.1 diff --git a/sources b/sources index d5f0e15..a024e50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.25.1.tar.gz) = 53244a80d1dd851c62c5004a54acbbb0062747b037fac0c356016dbeaac75cc16e5e70ef51ec7825f702d1d475b12dfea19b8ec8573bdcb8a30dbc0c5a11fb65 +SHA512 (tox-3.26.0.tar.gz) = 36a4a8deb5d2a9f36be9ddf75ce7422f9792911348b68a71acc9ae48a1159ef671e7ceaa1c86ef3e610c0c69f21f5a6e668ba2676ee811a427d04ebfab06111b From 9100fc98b13cb84144fe6a3679168c71c0ee09b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 14 Sep 2022 16:08:44 +0200 Subject: [PATCH 08/99] Relax the minimal tomli version to support Fedora 35 and 36 --- python-tox.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-tox.spec b/python-tox.spec index d4e6a36..a0e45a4 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -91,6 +91,11 @@ 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. +# However, it works fine with 1.2.3 we have in Fedora 35+36, so we relax the dependency. +# We rely on the Fedora CI to catch problems. +sed -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg + %generate_buildrequires %pyproject_buildrequires -r %{?with_tests:-x testing} From 4ba734801400676a8c36fd345935f8ef08d826a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 14 Sep 2022 16:16:53 +0200 Subject: [PATCH 09/99] CI: Remove Pythons not available on EL 9 and disable the mockbuild temporarily --- tests/tests.yml | 51 +++++-------------------------------------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 83e4c96..ec1854a 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -24,45 +24,15 @@ - 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 tests + #- mock_with_tests: -- still missing python3dist(pytest-randomly) and python3dist(flaky) + # dir: . + # run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with 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: - dir: python/smoke - run: VERSION=3.7 ./venv.sh - - 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 - - smoke_pypy37: - dir: python/smoke - run: PYTHON=pypy3.7 VERSION=3.7 ./venv.sh - - smoke_pypy38: - dir: python/smoke - run: PYTHON=pypy3.8 VERSION=3.8 ./venv.sh - - smoke_pypy39: - dir: python/smoke - run: PYTHON=pypy3.9 VERSION=3.9 ./venv.sh - pyproject_pytest: dir: pyproject-rpm-macros/tests run: ./mocktest.sh python-pytest @@ -75,19 +45,8 @@ required_packages: - gcc - virtualenv - - python2.7 - - python3.6 - - python3.7 - - python3.8 - - python3.9 - - python3.10 - - python3.11 - - python2-devel - - python3-devel - - pypy3.7-devel - - pypy3.8-devel - - pypy3.9-devel - - python3-tox + - python3.9-devel + - tox - dnf - mock - rpmdevtools From 0ead455dad61e1f54b3344d9b3bbba5fc0dce685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 21 Sep 2022 11:39:59 +0200 Subject: [PATCH 10/99] CI: Enable the --with tests mockbuild on EL 9 https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2022-9a09334937 https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2022-9a09334937 --- tests/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index ec1854a..bd44551 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -24,9 +24,9 @@ - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git" dest: "pyproject-rpm-macros" tests: - #- mock_with_tests: -- still missing python3dist(pytest-randomly) and python3dist(flaky) - # dir: . - # run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with tests + - mock_with_tests: + dir: . + run: pyproject-rpm-macros/tests/mocktest.sh python-tox --enable-network --with tests - all_supplementing_pythons: dir: tests run: ./all_supplementing_pythons.py From 83c7b43fe1485afef791742b23f0ea1f74062c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 25 Nov 2022 12:25:00 +0100 Subject: [PATCH 11/99] Update the test comment: the package name is different for a long time --- python-tox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index a0e45a4..4cd544a 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -5,7 +5,7 @@ # 1) Build --without tests (the default) # (e.g. fedpkg mockbuild) # 2) Install the built package -# (e.g. mock install ./results_python-tox/.../python3-tox-...rpm) +# (e.g. mock install ./results_python-tox/.../tox-...rpm) # 3) Build again --with tests (and internet connection) # (e.g. fedpkg mockbuild --enable-network --no-clean-all --with tests) # The Fedora CI tests do this. From d6ac38c0a6d380196f573be84ec28f50f74a2b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 25 Nov 2022 12:24:40 +0100 Subject: [PATCH 12/99] Update to 3.27.1 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 4cd544a..7e367fb 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,7 +17,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.26.0 +Version: 3.27.1 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -122,6 +122,9 @@ sed -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg %changelog +* Fri Nov 25 2022 Miro Hrončok - 3.27.1-1 +- Update to 3.27.1 + * Wed Sep 14 2022 Miro Hrončok - 3.26.0-1 - Update to 3.26.0 diff --git a/sources b/sources index a024e50..1bb144d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.26.0.tar.gz) = 36a4a8deb5d2a9f36be9ddf75ce7422f9792911348b68a71acc9ae48a1159ef671e7ceaa1c86ef3e610c0c69f21f5a6e668ba2676ee811a427d04ebfab06111b +SHA512 (tox-3.27.1.tar.gz) = 89be82a1e0374ce3e281e63bdf36d1619878c46ba5e2a3b45ee28ed3a3ab13b1f7030ad27efabb866a084fb813d1e146ad9fa81f22580904d0e261a94fde0689 From 0dcd415d3724c00f6590ac0135323f675192a5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 25 Nov 2022 12:25:00 +0100 Subject: [PATCH 13/99] Update the test comment: the package name is different for a long time --- python-tox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 039f978..f0ffbae 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -5,7 +5,7 @@ # 1) Build --without tests (the default) # (e.g. fedpkg mockbuild) # 2) Install the built package -# (e.g. mock install ./results_python-tox/.../python3-tox-...rpm) +# (e.g. mock install ./results_python-tox/.../tox-...rpm) # 3) Build again --with tests (and internet connection) # (e.g. fedpkg mockbuild --enable-network --no-clean-all --with tests) # The Fedora CI tests do this. From 7722f8bcaa2c14cd8ccf2b4c07c599832e8a6374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 25 Nov 2022 12:24:40 +0100 Subject: [PATCH 14/99] Update to 3.27.1 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index f0ffbae..1e71d51 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,7 +17,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.26.0 +Version: 3.27.1 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Fri Nov 25 2022 Miro Hrončok - 3.27.1-1 +- Update to 3.27.1 + * Wed Sep 14 2022 Miro Hrončok - 3.26.0-1 - Update to 3.26.0 diff --git a/sources b/sources index a024e50..1bb144d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.26.0.tar.gz) = 36a4a8deb5d2a9f36be9ddf75ce7422f9792911348b68a71acc9ae48a1159ef671e7ceaa1c86ef3e610c0c69f21f5a6e668ba2676ee811a427d04ebfab06111b +SHA512 (tox-3.27.1.tar.gz) = 89be82a1e0374ce3e281e63bdf36d1619878c46ba5e2a3b45ee28ed3a3ab13b1f7030ad27efabb866a084fb813d1e146ad9fa81f22580904d0e261a94fde0689 From 7c86179926ac53e88fd9397d0ab532ad0bb6d9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 25 Nov 2022 12:53:14 +0100 Subject: [PATCH 15/99] CI: Add Python 3.12 --- tests/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index 74d78f5..d662b58 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -54,6 +54,9 @@ - smoke311: dir: python/smoke run: VERSION=3.11 ./venv.sh + - smoke312: + dir: python/smoke + run: VERSION=3.12 ./venv.sh - smoke_pypy37: dir: python/smoke run: PYTHON=pypy3.7 VERSION=3.7 ./venv.sh @@ -82,6 +85,7 @@ - python3.9 - python3.10-devel - python3.11-devel + - python3.12-devel - python2-devel - pypy3.7-devel - pypy3.8-devel From fbeaddaea878b615adadd6126cad78ca2df7eb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 25 Nov 2022 13:23:32 +0100 Subject: [PATCH 16/99] CI: Make pypy3.7 optional, as it was retired on Fedora 37+ --- tests/tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index d662b58..eb39037 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -57,9 +57,9 @@ - smoke312: dir: python/smoke run: VERSION=3.12 ./venv.sh - - smoke_pypy37: + - smoke_pypy37_optional: dir: python/smoke - run: PYTHON=pypy3.7 VERSION=3.7 ./venv.sh + run: PYTHON=pypy3.7 VERSION=3.7 INSTALL_OR_SKIP=true ./venv.sh - smoke_pypy38: dir: python/smoke run: PYTHON=pypy3.8 VERSION=3.8 ./venv.sh @@ -87,7 +87,6 @@ - python3.11-devel - python3.12-devel - python2-devel - - pypy3.7-devel - pypy3.8-devel - pypy3.9-devel - python3-tox From e2ec7b8b811de689817accd18af27902a879acf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 18 Dec 2022 15:17:56 +0100 Subject: [PATCH 17/99] Update to 3.28.0 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 7e367fb..38119a2 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,7 +17,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.27.1 +Version: 3.28.0 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -122,6 +122,9 @@ sed -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg %changelog +* Sun Dec 18 2022 Miro Hrončok - 3.28.0-1 +- Update to 3.28.0 + * Fri Nov 25 2022 Miro Hrončok - 3.27.1-1 - Update to 3.27.1 diff --git a/sources b/sources index 1bb144d..ffbddf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.27.1.tar.gz) = 89be82a1e0374ce3e281e63bdf36d1619878c46ba5e2a3b45ee28ed3a3ab13b1f7030ad27efabb866a084fb813d1e146ad9fa81f22580904d0e261a94fde0689 +SHA512 (tox-3.28.0.tar.gz) = 15c2b5e8f3220cc5be436d5eb0b460fa06ecb04c639f45d31fba284d23743d754e85dfe72fe6a1945f4e3aa094278911834e85c6d973972a3179c905178dec6e From 7b7d159bedb6605a949f8bf5a705e2741e1c33ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 18 Dec 2022 15:17:56 +0100 Subject: [PATCH 18/99] Update to 3.28.0 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 1e71d51..93ff873 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,7 +17,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.27.1 +Version: 3.28.0 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -117,6 +117,9 @@ Obsoletes: python3-tox < 3.24.4-2 %changelog +* Sun Dec 18 2022 Miro Hrončok - 3.28.0-1 +- Update to 3.28.0 + * Fri Nov 25 2022 Miro Hrončok - 3.27.1-1 - Update to 3.27.1 diff --git a/sources b/sources index 1bb144d..ffbddf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.27.1.tar.gz) = 89be82a1e0374ce3e281e63bdf36d1619878c46ba5e2a3b45ee28ed3a3ab13b1f7030ad27efabb866a084fb813d1e146ad9fa81f22580904d0e261a94fde0689 +SHA512 (tox-3.28.0.tar.gz) = 15c2b5e8f3220cc5be436d5eb0b460fa06ecb04c639f45d31fba284d23743d754e85dfe72fe6a1945f4e3aa094278911834e85c6d973972a3179c905178dec6e From b0d91f94dd8e7b2ee39ba60fc2fe938f1e01a4eb Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 8 Dec 2022 09:56:35 +0100 Subject: [PATCH 19/99] Update to 4.2.6 --- fix-tests.patch | 163 ++++++++++++++++++++++++++++++++++++++++++++++++ python-tox.spec | 75 +++++++++++++++++----- sources | 2 +- 3 files changed, 222 insertions(+), 18 deletions(-) create mode 100644 fix-tests.patch diff --git a/fix-tests.patch b/fix-tests.patch new file mode 100644 index 0000000..1458054 --- /dev/null +++ b/fix-tests.patch @@ -0,0 +1,163 @@ +From 56aa64d876a298c68057d15b0c89866aebfc0d4c Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Tue, 10 Jan 2023 08:34:25 +0100 +Subject: [PATCH] fix tests + +--- + pyproject.toml | 4 ---- + src/tox/pytest.py | 16 +++---------- + tests/test_provision.py | 53 ----------------------------------------- + 3 files changed, 3 insertions(+), 70 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index e4735d3..0eeab4f 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -46,8 +46,6 @@ optional-dependencies.docs = [ + ] + optional-dependencies.testing = [ + "build[virtualenv]>=0.9", +- "covdefaults>=2.2.2", +- "devpi-process>=0.3", + "diff-cover>=7.3", + "distlib>=0.3.6", + "flaky>=3.7", +@@ -55,7 +53,6 @@ optional-dependencies.testing = [ + "hatchling>=1.12", + "psutil>=5.9.4", + "pytest>=7.2", +- "pytest-cov>=4", + "pytest-mock>=3.10", + "pytest-xdist>=3.1", + "re-assert>=1.1", +@@ -106,7 +103,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.isort] + known_first_party = ["tox", "tests"] +diff --git a/src/tox/pytest.py b/src/tox/pytest.py +index ae21125..f2f1bfb 100644 +--- a/src/tox/pytest.py ++++ b/src/tox/pytest.py +@@ -26,7 +26,6 @@ from _pytest.logging import LogCaptureFixture + from _pytest.monkeypatch import MonkeyPatch + from _pytest.python import Function + from _pytest.tmpdir import TempPathFactory +-from devpi_process import IndexServer + from pytest_mock import MockerFixture + from virtualenv.info import fs_supports_symlink + +@@ -286,9 +285,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: MonkeyPatch, url: str | None) -> None: + monkeypatch.setenv("PIP_TIMEOUT", str(2)) + + +-@pytest.fixture(scope="session") +-def pypi_server(tmp_path_factory: 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 c7a7fac..76d0b2c 100644 +--- a/tests/test_provision.py ++++ b/tests/test_provision.py +@@ -12,7 +12,6 @@ from unittest import mock + from zipfile import ZipFile + + import pytest +-from devpi_process import Index, IndexServer + from filelock import FileLock + from packaging.requirements import Requirement + +@@ -93,23 +92,6 @@ 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 test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: + ini = "[tox]\nrequires = pkg-does-not-exist\n setuptools==1\nskipsdist=true\n" + outcome = tox_project({"tox.ini": ini}).run("c", "-e", "py") +@@ -121,42 +103,7 @@ def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: + regex=True, + ) + +- +-@pytest.mark.integration() +-@pytest.mark.usefixtures("_pypi_index_self") +-def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -> None: +- proj = tox_project({"tox.ini": "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip"}) +- log = tmp_path / "out.log" +- +- # initial run +- result_first = proj.run("r", "--result-json", str(log)) +- result_first.assert_success() +- prov_msg = ( +- f"ROOT: will run in automatically provisioned tox, host {sys.executable} is missing" +- f" [requires (has)]: demo-pkg-inline" +- ) +- assert prov_msg in result_first.out +- +- with log.open("rt") as file_handler: +- log_report = json.load(file_handler) +- assert "py" in log_report["testenvs"] +- +- # recreate without recreating the provisioned env +- provision_env = result_first.env_conf(".tox")["env_dir"] +- result_recreate_no_pr = proj.run("r", "--recreate", "--no-recreate-provision") +- result_recreate_no_pr.assert_success() +- assert prov_msg in result_recreate_no_pr.out +- assert f"ROOT: remove tox env folder {provision_env}" not in result_recreate_no_pr.out, result_recreate_no_pr.out +- +- # recreate with recreating the provisioned env +- result_recreate = proj.run("r", "--recreate") +- result_recreate.assert_success() +- assert prov_msg in result_recreate.out +- assert f"ROOT: remove tox env folder {provision_env}" in result_recreate.out, result_recreate.out +- +- + @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.38.1 + diff --git a/python-tox.spec b/python-tox.spec index 38119a2..450985f 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,15 +1,17 @@ -# Tests are disbaled by default, they require: -# a) tested tox to be installed +# Many tests are enabled by default +%bcond_without tests +# 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: -# 1) Build --without tests (the default) -# (e.g. fedpkg mockbuild) +# 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 tests (and internet connection) -# (e.g. fedpkg mockbuild --enable-network --no-clean-all --with tests) +# 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_with tests +%bcond_with ci_tests # Unset -s on python shebang - ensure that extensions installed with pip # to user locations are seen and properly loaded @@ -17,7 +19,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 3.28.0 +Version: 4.2.6 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -25,6 +27,11 @@ License: MIT URL: https://tox.readthedocs.io/ Source0: %{pypi_source tox} +# Remove dependency on devpi-process and 1 test that cannot work without it. +# Remove coverage-related dependencies. +# Adjust virtualenv environment variables to make it work with our patched virtualenv. +Patch: fix-tests.patch + BuildArch: noarch BuildRequires: python3-devel @@ -39,9 +46,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 :( +# wheel should be included upstream +# https://github.com/tox-dev/tox/pull/2843 +BuildRequires: python3-wheel +%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 @@ -91,17 +103,17 @@ 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. -# However, it works fine with 1.2.3 we have in Fedora 35+36, so we relax the dependency. -# We rely on the Fedora CI to catch problems. -sed -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg - +# Upstream updates dependencies too aggressively +# see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356 +sed -ri 's/"(packaging|filelock|platformdirs|psutil|diff-cover)>=.*/"\1",/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,16 +124,45 @@ sed -i 's/tomli>=2.0.1/tomli>=1.2.3/' setup.cfg %if %{with tests} %check -%pytest -n auto +# test_verbosity_guess_miss_match and some others need +# existing tox.ini config, reported https://github.com/tox-dev/tox/issues/2839 +touch tox.ini + +# 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" +%endif + +%pytest -v -n auto -k "${k-}" --run-integration %endif %files -n tox -f %{pyproject_files} %{_bindir}/tox -%{_bindir}/tox-quickstart %changelog +* Tue Jan 3 2023 Lumír Balhar - 4.2.6-1 +- Update to 4.2.6 (rhbz#1914413) + * Sun Dec 18 2022 Miro Hrončok - 3.28.0-1 - Update to 3.28.0 diff --git a/sources b/sources index ffbddf7..18d5e42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-3.28.0.tar.gz) = 15c2b5e8f3220cc5be436d5eb0b460fa06ecb04c639f45d31fba284d23743d754e85dfe72fe6a1945f4e3aa094278911834e85c6d973972a3179c905178dec6e +SHA512 (tox-4.2.6.tar.gz) = 23cd73e079c15083f3505d0a23dfd58a581c416292c335fb774d6317bd93baa0b81551e1fa233495910dcc478a19e08047fdbea598ee579b5cf33555c7bf04be From 157d42caacdb3cf5e646cdfcb96660d0d9cf7e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 11 Jan 2023 19:15:34 +0100 Subject: [PATCH 20/99] Update to 4.2.7 --- fix-tests.patch | 12 ++++++------ python-tox.spec | 8 ++++---- sources | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index 1458054..adb67cd 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From 56aa64d876a298c68057d15b0c89866aebfc0d4c Mon Sep 17 00:00:00 2001 +From 996ad0a53dac123ac0d16f71147f80ac47cc86fe Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,10 +10,10 @@ Subject: [PATCH] fix tests 3 files changed, 3 insertions(+), 70 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index e4735d3..0eeab4f 100644 +index e8be85a..ba07bde 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -46,8 +46,6 @@ optional-dependencies.docs = [ +@@ -47,8 +47,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ "build[virtualenv]>=0.9", @@ -22,15 +22,15 @@ index e4735d3..0eeab4f 100644 "diff-cover>=7.3", "distlib>=0.3.6", "flaky>=3.7", -@@ -55,7 +53,6 @@ optional-dependencies.testing = [ - "hatchling>=1.12", +@@ -56,7 +54,6 @@ optional-dependencies.testing = [ + "hatchling>=1.12.2", "psutil>=5.9.4", "pytest>=7.2", - "pytest-cov>=4", "pytest-mock>=3.10", "pytest-xdist>=3.1", "re-assert>=1.1", -@@ -106,7 +103,6 @@ paths.source = [ +@@ -108,7 +105,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 diff --git a/python-tox.spec b/python-tox.spec index 450985f..574e99d 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: python-tox -Version: 4.2.6 +Version: 4.2.7 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -46,9 +46,6 @@ 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 -# wheel should be included upstream -# https://github.com/tox-dev/tox/pull/2843 -BuildRequires: python3-wheel %if %{with ci_tests} # The CI tests only work if the tested tox is installed :( BuildRequires: tox = %{version}-%{release} @@ -160,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Wed Jan 11 2023 Miro Hrončok - 4.2.7-1 +- Update to 4.2.7 (rhbz#2160186) + * Tue Jan 3 2023 Lumír Balhar - 4.2.6-1 - Update to 4.2.6 (rhbz#1914413) diff --git a/sources b/sources index 18d5e42..a9116fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.2.6.tar.gz) = 23cd73e079c15083f3505d0a23dfd58a581c416292c335fb774d6317bd93baa0b81551e1fa233495910dcc478a19e08047fdbea598ee579b5cf33555c7bf04be +SHA512 (tox-4.2.7.tar.gz) = 3e58ea71c8b756955b3e065bdc0dbc93c109d08fc07a6d365eadc5b63268f3b7df5fb706aa24e60a9b1f4fe899f68cd8336dcb6415ef9eff08c091acd5472de1 From 4109755a9a03ee6d0b13e5608bcb8cdf5887196d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 11 Jan 2023 19:57:25 +0100 Subject: [PATCH 21/99] CI: Actually run the build --with ci_tests --- tests/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index eb39037..d8cde99 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -26,7 +26,7 @@ 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 From 120940119b41b255cde6bc3247fd28dc7b9faa08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 11 Jan 2023 19:58:12 +0100 Subject: [PATCH 22/99] Use the documented way to unset -s from Python shebangs --- python-tox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 574e99d..725586d 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -16,7 +16,7 @@ # 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: 4.2.7 From 7fffca7cd726f6fc258e638960a9d9610370c1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 12 Jan 2023 11:22:19 +0100 Subject: [PATCH 23/99] Update to 4.2.8 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 725586d..788ae69 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.2.7 +Version: 4.2.8 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Thu Jan 12 2023 Miro Hrončok - 4.2.8-1 +- Update to 4.2.8 (rhbz#2160315) + * Wed Jan 11 2023 Miro Hrončok - 4.2.7-1 - Update to 4.2.7 (rhbz#2160186) diff --git a/sources b/sources index a9116fc..0af8d64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.2.7.tar.gz) = 3e58ea71c8b756955b3e065bdc0dbc93c109d08fc07a6d365eadc5b63268f3b7df5fb706aa24e60a9b1f4fe899f68cd8336dcb6415ef9eff08c091acd5472de1 +SHA512 (tox-4.2.8.tar.gz) = c2ba36cfc6c4f97edcde97742d042ad1cc450a91818339e92ef6b422ecbd98747ce6cf9de58ba7d319167107e4fbf3977bbdfefd0628aa19778be65e22c55ee6 From 3863b87a2183bb09425911e9e8362d7573d087d7 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 16 Jan 2023 06:01:20 +0100 Subject: [PATCH 24/99] Update to 4.3.1 (rhbz#2161119) --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 788ae69..a529179 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.2.8 +Version: 4.3.1 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Mon Jan 16 2023 Lumír Balhar - 4.3.1-1 +- Update to 4.3.1 (rhbz#2161119) + * Thu Jan 12 2023 Miro Hrončok - 4.2.8-1 - Update to 4.2.8 (rhbz#2160315) diff --git a/sources b/sources index 0af8d64..c8f6b68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.2.8.tar.gz) = c2ba36cfc6c4f97edcde97742d042ad1cc450a91818339e92ef6b422ecbd98747ce6cf9de58ba7d319167107e4fbf3977bbdfefd0628aa19778be65e22c55ee6 +SHA512 (tox-4.3.1.tar.gz) = 51355a409fd0e59e5714116cf3d61a6cec13ecc958546e7281dc5a2bf5bfdfe0133d046241fd5668e237e5942320966d2c25c0be0ec322a34b1a356f92a62b11 From 901fa6c1f2c2d3f23070d4b9154a9e781cb2851d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 16 Jan 2023 20:44:56 +0100 Subject: [PATCH 25/99] Update to 4.3.2 --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index a529179..769c03e 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.3.1 +Version: 4.3.2 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Mon Jan 16 2023 Miro Hrončok - 4.3.2-1 +- Update to 4.3.2 (rhbz#2161388) + * Mon Jan 16 2023 Lumír Balhar - 4.3.1-1 - Update to 4.3.1 (rhbz#2161119) diff --git a/sources b/sources index c8f6b68..058e332 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.3.1.tar.gz) = 51355a409fd0e59e5714116cf3d61a6cec13ecc958546e7281dc5a2bf5bfdfe0133d046241fd5668e237e5942320966d2c25c0be0ec322a34b1a356f92a62b11 +SHA512 (tox-4.3.2.tar.gz) = 55cf7c7ae602063ffc6205acd06a4ff675c356fceae17259f4f34c4775a818e49ad169b935339db0560d9d62fa5529c6ae2ee3f63c0bd3cfb88d943805eac4c4 From b445b57792e3a89408d35db54ad4edbe2481f130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 16 Jan 2023 23:38:08 +0100 Subject: [PATCH 26/99] Update to 4.3.3 --- fix-tests.patch | 71 +++++++++++++------------------------------------ python-tox.spec | 7 +++-- sources | 2 +- 3 files changed, 24 insertions(+), 56 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index adb67cd..ed6640b 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,19 +1,19 @@ -From 996ad0a53dac123ac0d16f71147f80ac47cc86fe Mon Sep 17 00:00:00 2001 +From c58df8195d1ebe5d06ca440f91e909b3d94e834b Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests --- pyproject.toml | 4 ---- - src/tox/pytest.py | 16 +++---------- - tests/test_provision.py | 53 ----------------------------------------- - 3 files changed, 3 insertions(+), 70 deletions(-) + src/tox/pytest.py | 16 +++------------- + tests/test_provision.py | 18 ++---------------- + 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index e8be85a..ba07bde 100644 +index c0b4541..5375902 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -47,8 +47,6 @@ optional-dependencies.docs = [ +@@ -48,8 +48,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ "build[virtualenv]>=0.9", @@ -22,7 +22,7 @@ index e8be85a..ba07bde 100644 "diff-cover>=7.3", "distlib>=0.3.6", "flaky>=3.7", -@@ -56,7 +54,6 @@ optional-dependencies.testing = [ +@@ -57,7 +55,6 @@ optional-dependencies.testing = [ "hatchling>=1.12.2", "psutil>=5.9.4", "pytest>=7.2", @@ -30,7 +30,7 @@ index e8be85a..ba07bde 100644 "pytest-mock>=3.10", "pytest-xdist>=3.1", "re-assert>=1.1", -@@ -108,7 +105,6 @@ paths.source = [ +@@ -109,7 +106,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 @@ -80,7 +80,7 @@ index ae21125..f2f1bfb 100644 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 c7a7fac..76d0b2c 100644 +index 91d7689..615425a 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py @@ -12,7 +12,6 @@ from unittest import mock @@ -91,7 +91,7 @@ index c7a7fac..76d0b2c 100644 from filelock import FileLock from packaging.requirements import Requirement -@@ -93,23 +92,6 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] +@@ -93,21 +92,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] return result @@ -104,55 +104,20 @@ index c7a7fac..76d0b2c 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 test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: - ini = "[tox]\nrequires = pkg-does-not-exist\n setuptools==1\nskipsdist=true\n" - outcome = tox_project({"tox.ini": ini}).run("c", "-e", "py") -@@ -121,42 +103,7 @@ def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: - regex=True, - ) ++def _pypi_index_self(): ++ pytest.skip("needs devpi-process") + + + def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: +@@ -156,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_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -> None: -- proj = tox_project({"tox.ini": "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip"}) -- log = tmp_path / "out.log" -- -- # initial run -- result_first = proj.run("r", "--result-json", str(log)) -- result_first.assert_success() -- prov_msg = ( -- f"ROOT: will run in automatically provisioned tox, host {sys.executable} is missing" -- f" [requires (has)]: demo-pkg-inline" -- ) -- assert prov_msg in result_first.out -- -- with log.open("rt") as file_handler: -- log_report = json.load(file_handler) -- assert "py" in log_report["testenvs"] -- -- # recreate without recreating the provisioned env -- provision_env = result_first.env_conf(".tox")["env_dir"] -- result_recreate_no_pr = proj.run("r", "--recreate", "--no-recreate-provision") -- result_recreate_no_pr.assert_success() -- assert prov_msg in result_recreate_no_pr.out -- assert f"ROOT: remove tox env folder {provision_env}" not in result_recreate_no_pr.out, result_recreate_no_pr.out -- -- # recreate with recreating the provisioned env -- result_recreate = proj.run("r", "--recreate") -- result_recreate.assert_success() -- assert prov_msg in result_recreate.out -- assert f"ROOT: remove tox env folder {provision_env}" in result_recreate.out, result_recreate.out -- -- @pytest.mark.integration() -@pytest.mark.usefixtures("_pypi_index_self") def test_provision_platform_check(tox_project: ToxProjectCreator) -> None: diff --git a/python-tox.spec b/python-tox.spec index 769c03e..251fd96 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.3.2 +Version: 4.3.3 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -27,7 +27,7 @@ License: MIT URL: https://tox.readthedocs.io/ Source0: %{pypi_source tox} -# Remove dependency on devpi-process and 1 test that cannot work without it. +# Remove dependency on devpi-process. # Remove coverage-related dependencies. # Adjust virtualenv environment variables to make it work with our patched virtualenv. Patch: fix-tests.patch @@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Mon Jan 16 2023 Miro Hrončok - 4.3.3-1 +- Update to 4.3.3 (rhbz#2161429) + * Mon Jan 16 2023 Miro Hrončok - 4.3.2-1 - Update to 4.3.2 (rhbz#2161388) diff --git a/sources b/sources index 058e332..703c97e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.3.2.tar.gz) = 55cf7c7ae602063ffc6205acd06a4ff675c356fceae17259f4f34c4775a818e49ad169b935339db0560d9d62fa5529c6ae2ee3f63c0bd3cfb88d943805eac4c4 +SHA512 (tox-4.3.3.tar.gz) = d835ecceb0d218d9e724a85d1d5ca0a060ee6ff4728777c76343e47faaa5178a378f64adeda30d272b0a971b4bfe1fd4e49b3dfeb24cebd91607529d62e5e72e From 3d907599d946a643f12ff2331b729472699f04da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 17:59:54 +0000 Subject: [PATCH 27/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-tox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 251fd96..1a9b388 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ Name: python-tox Version: 4.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 4.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Miro Hrončok - 4.3.3-1 - Update to 4.3.3 (rhbz#2161429) From 8650fa20aea5e73a8bac3e7e9a93b1350e1eeaa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 24 Jan 2023 12:13:52 +0100 Subject: [PATCH 28/99] Update to 4.3.5 (rhbz#2161692) --- python-tox.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 1a9b388..8adb0f8 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,8 +19,8 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.3.3 -Release: 2%{?dist} +Version: 4.3.5 +Release: 1%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Tue Jan 24 2023 Miro Hrončok - 4.3.5-1 +- Update to 4.3.5 (rhbz#2161692) + * Fri Jan 20 2023 Fedora Release Engineering - 4.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 703c97e..edc077e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.3.3.tar.gz) = d835ecceb0d218d9e724a85d1d5ca0a060ee6ff4728777c76343e47faaa5178a378f64adeda30d272b0a971b4bfe1fd4e49b3dfeb24cebd91607529d62e5e72e +SHA512 (tox-4.3.5.tar.gz) = 142c1484598e61e7e3606d8f374b0847f1b7eb432506cf952e33dd7cce09e1471ff8a1baa394fedc3e2db6af020e8cab13c4cb84c5dfd3a671c6dbb270926b45 From 8699ee1196cbaef8181c4aae2aa887e323156203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:08:19 +0100 Subject: [PATCH 29/99] Update to 4.4.6 (rhbz#2164640) --- fix-tests.patch | 22 +++++++++++----------- python-tox.spec | 5 ++++- sources | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index ed6640b..a7f57f3 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From c58df8195d1ebe5d06ca440f91e909b3d94e834b Mon Sep 17 00:00:00 2001 +From 0c4ba1f47b8402e5a18d28596d923c03de75edc0 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,27 +10,27 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index c0b4541..5375902 100644 +index f6061b2..801be5e 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -48,8 +48,6 @@ optional-dependencies.docs = [ +@@ -73,8 +73,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ - "build[virtualenv]>=0.9", + "build[virtualenv]>=0.10", - "covdefaults>=2.2.2", - "devpi-process>=0.3", - "diff-cover>=7.3", + "diff-cover>=7.4", "distlib>=0.3.6", "flaky>=3.7", -@@ -57,7 +55,6 @@ optional-dependencies.testing = [ +@@ -82,7 +80,6 @@ optional-dependencies.testing = [ "hatchling>=1.12.2", "psutil>=5.9.4", - "pytest>=7.2", + "pytest>=7.2.1", - "pytest-cov>=4", "pytest-mock>=3.10", "pytest-xdist>=3.1", "re-assert>=1.1", -@@ -109,7 +106,6 @@ paths.source = [ +@@ -120,7 +117,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 @@ -39,7 +39,7 @@ index c0b4541..5375902 100644 [tool.isort] known_first_party = ["tox", "tests"] diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index ae21125..f2f1bfb 100644 +index fb83721..82a3857 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py @@ -26,7 +26,6 @@ from _pytest.logging import LogCaptureFixture @@ -80,7 +80,7 @@ index ae21125..f2f1bfb 100644 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 91d7689..615425a 100644 +index 290e48d..475d7f4 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py @@ -12,7 +12,6 @@ from unittest import mock @@ -124,5 +124,5 @@ index 91d7689..615425a 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.38.1 +2.39.2 diff --git a/python-tox.spec b/python-tox.spec index 8adb0f8..dd929e8 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.3.5 +Version: 4.4.6 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -157,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Tue Feb 28 2023 Miro Hrončok - 4.4.6-1 +- Update to 4.4.6 (rhbz#2164640) + * Tue Jan 24 2023 Miro Hrončok - 4.3.5-1 - Update to 4.3.5 (rhbz#2161692) diff --git a/sources b/sources index edc077e..d2c6dd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.3.5.tar.gz) = 142c1484598e61e7e3606d8f374b0847f1b7eb432506cf952e33dd7cce09e1471ff8a1baa394fedc3e2db6af020e8cab13c4cb84c5dfd3a671c6dbb270926b45 +SHA512 (tox-4.4.6.tar.gz) = d94b37cefc5b2bfd99c3e26fcbc1086f60d42c522b2173d8fc4e091085481775b096044e777cc9bc4e496f955edf25f93af491be0d8e592b6c61212d0dd4ec92 From 26d70dc88e97fb001d37b35d40a0a31c9de92f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Feb 2023 16:51:58 +0100 Subject: [PATCH 30/99] CI: Make pypy3.8 optional, as it was retired on Fedora 38+ --- tests/tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index d8cde99..9a9a3c2 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -60,9 +60,9 @@ - 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 @@ -87,7 +87,6 @@ - python3.11-devel - python3.12-devel - python2-devel - - pypy3.8-devel - pypy3.9-devel - python3-tox - dnf From fac05c2144ce5e26da108d6423dc9c942f490a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 29 Mar 2023 15:25:25 +0200 Subject: [PATCH 31/99] Update to 4.4.8 (rhbz#2177519) --- fix-tests.patch | 16 ++++++++-------- python-tox.spec | 9 +++++++-- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index a7f57f3..cbffb44 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From 0c4ba1f47b8402e5a18d28596d923c03de75edc0 Mon Sep 17 00:00:00 2001 +From bee1dabd4e560e1f2b798a597ccb848ab9a8a869 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,25 +10,25 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index f6061b2..801be5e 100644 +index ebb1ef7..aa4842f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,8 +73,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ "build[virtualenv]>=0.10", -- "covdefaults>=2.2.2", +- "covdefaults>=2.3", - "devpi-process>=0.3", - "diff-cover>=7.4", + "diff-cover>=7.5", "distlib>=0.3.6", "flaky>=3.7", @@ -82,7 +80,6 @@ optional-dependencies.testing = [ - "hatchling>=1.12.2", + "hatchling>=1.13", "psutil>=5.9.4", - "pytest>=7.2.1", + "pytest>=7.2.2", - "pytest-cov>=4", "pytest-mock>=3.10", - "pytest-xdist>=3.1", + "pytest-xdist>=3.2.1", "re-assert>=1.1", @@ -120,7 +117,6 @@ paths.source = [ report.fail_under = 88 @@ -39,7 +39,7 @@ index f6061b2..801be5e 100644 [tool.isort] known_first_party = ["tox", "tests"] diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index fb83721..82a3857 100644 +index 0bc9905..65701b5 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py @@ -26,7 +26,6 @@ from _pytest.logging import LogCaptureFixture diff --git a/python-tox.spec b/python-tox.spec index dd929e8..837a728 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.4.6 +Version: 4.4.8 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -102,7 +102,9 @@ Obsoletes: python3-tox < 3.24.4-2 # Upstream updates dependencies too aggressively # see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356 -sed -ri 's/"(packaging|filelock|platformdirs|psutil|diff-cover)>=.*/"\1",/g' pyproject.toml +sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|pyproject-api|pytest-xdist|wheel)>=.*/"\1",/g' \ + -e 's/"(virtualenv)>=.*/"\1>=20",/g' \ + pyproject.toml %generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" @@ -157,6 +159,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Wed Mar 29 2023 Miro Hrončok - 4.4.8-1 +- Update to 4.4.8 (rhbz#2177519) + * Tue Feb 28 2023 Miro Hrončok - 4.4.6-1 - Update to 4.4.6 (rhbz#2164640) diff --git a/sources b/sources index d2c6dd6..9a46cee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.4.6.tar.gz) = d94b37cefc5b2bfd99c3e26fcbc1086f60d42c522b2173d8fc4e091085481775b096044e777cc9bc4e496f955edf25f93af491be0d8e592b6c61212d0dd4ec92 +SHA512 (tox-4.4.8.tar.gz) = a6e5ceb19ebf1adcfe5cd093a2710da88c1552f2129211175990b7b7fb6b53716fdccd7592e9c6696bf13ce584443c9a266e40ed50953999883fa1a68ea6aec6 From 4934b264923dd3124e0f1b88f756430ecf78432f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 29 Mar 2023 15:26:35 +0200 Subject: [PATCH 32/99] Acknowledge the license is SPDX $ askalono identify tox-4.4.8/LICENSE License: MIT (original text) Score: 1.000 From 24ef320ae9e977fe052763e6b5825a20c3d73814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 12 Apr 2023 19:20:42 +0200 Subject: [PATCH 33/99] Update to 4.4.11 (rhbz#2184726) --- python-tox.spec | 16 ++++++++++------ sources | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 837a728..15ad0f7 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.4.8 +Version: 4.4.11 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -123,10 +123,6 @@ export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" %if %{with tests} %check -# test_verbosity_guess_miss_match and some others need -# existing tox.ini config, reported https://github.com/tox-dev/tox/issues/2839 -touch tox.ini - # Skipped tests use internal virtualenv functionality to # download wheels which does not work with "bundled" version of wheel in # the Fedora's virtualenv patch. @@ -150,7 +146,12 @@ k="${k-}${k+ and }not test_local_execute_basic_pass_show_on_standard_newline_flu k="${k-}${k+ and }not test_local_execute_write_a_lot" %endif -%pytest -v -n auto -k "${k-}" --run-integration +# test_sequential is flaky when heavily parallelized, +# some files are created in place and there seem to be a race condition. +# https://github.com/tox-dev/tox/issues/2985 +%pytest -v --run-integration tests/session/cmd/test_sequential.py + +%pytest -v -n auto -k "${k-}" --run-integration --ignore tests/session/cmd/test_sequential.py %endif @@ -159,6 +160,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Wed Apr 12 2023 Miro Hrončok - 4.4.11-1 +- Update to 4.4.11 (rhbz#2184726) + * Wed Mar 29 2023 Miro Hrončok - 4.4.8-1 - Update to 4.4.8 (rhbz#2177519) diff --git a/sources b/sources index 9a46cee..7e5904a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.4.8.tar.gz) = a6e5ceb19ebf1adcfe5cd093a2710da88c1552f2129211175990b7b7fb6b53716fdccd7592e9c6696bf13ce584443c9a266e40ed50953999883fa1a68ea6aec6 +SHA512 (tox-4.4.11.tar.gz) = 7a0a39ac55482aa423368fee6621aef9d95c58afd5d38975bcaf67edfebdc817aacc33efdd1f0f459953c25bceed73c6ef03ce789aea7f82f3ab1dcc6546118c From 342aea9ec703c9d298b626c3683e5d01a06e3c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 13 Apr 2023 21:31:58 +0200 Subject: [PATCH 34/99] Update to 4.4.12, fix race conditions in tests --- fix-tests.patch | 6 +++--- python-tox.spec | 13 ++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index cbffb44..4981679 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From bee1dabd4e560e1f2b798a597ccb848ab9a8a869 Mon Sep 17 00:00:00 2001 +From eb6cd0a5fe1734c5eee78b9889ba7a07fdeb2111 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,7 +10,7 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index ebb1ef7..aa4842f 100644 +index 19ee5ec..b806958 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,8 +73,6 @@ optional-dependencies.docs = [ @@ -23,7 +23,7 @@ index ebb1ef7..aa4842f 100644 "distlib>=0.3.6", "flaky>=3.7", @@ -82,7 +80,6 @@ optional-dependencies.testing = [ - "hatchling>=1.13", + "hatchling>=1.14", "psutil>=5.9.4", "pytest>=7.2.2", - "pytest-cov>=4", diff --git a/python-tox.spec b/python-tox.spec index 15ad0f7..a613040 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.4.11 +Version: 4.4.12 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -104,6 +104,7 @@ Obsoletes: python3-tox < 3.24.4-2 # see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356 sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|pyproject-api|pytest-xdist|wheel)>=.*/"\1",/g' \ -e 's/"(virtualenv)>=.*/"\1>=20",/g' \ + -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ pyproject.toml %generate_buildrequires @@ -146,12 +147,7 @@ k="${k-}${k+ and }not test_local_execute_basic_pass_show_on_standard_newline_flu k="${k-}${k+ and }not test_local_execute_write_a_lot" %endif -# test_sequential is flaky when heavily parallelized, -# some files are created in place and there seem to be a race condition. -# https://github.com/tox-dev/tox/issues/2985 -%pytest -v --run-integration tests/session/cmd/test_sequential.py - -%pytest -v -n auto -k "${k-}" --run-integration --ignore tests/session/cmd/test_sequential.py +%pytest -v -n auto -k "${k-}" --run-integration %endif @@ -160,6 +156,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Thu Apr 13 2023 Miro Hrončok - 4.4.12-1 +- Update to 4.4.12 (rhbz#2186618) + * Wed Apr 12 2023 Miro Hrončok - 4.4.11-1 - Update to 4.4.11 (rhbz#2184726) diff --git a/sources b/sources index 7e5904a..7375f34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.4.11.tar.gz) = 7a0a39ac55482aa423368fee6621aef9d95c58afd5d38975bcaf67edfebdc817aacc33efdd1f0f459953c25bceed73c6ef03ce789aea7f82f3ab1dcc6546118c +SHA512 (tox-4.4.12.tar.gz) = 896ecef178b0625246ffe4ab3a9a0c03650eb78633fa92706e93475d6589ac29d65bbf91b9ecfacfa8154739eefd463aeb1252be68998cdffddc270a4f89edd0 From 74fbe969cd1fc8ac1bca8d333988c12c6258d788 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 07:03:00 +0200 Subject: [PATCH 35/99] Bootstrap for Python 3.12 --- python-tox.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index a613040..4e1cc7b 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 # Many tests are enabled by default %bcond_without tests # However, some tests are disabled by default, becasue they require: @@ -20,7 +21,7 @@ Name: python-tox Version: 4.4.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -156,6 +157,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Wed Jun 14 2023 Python Maint - 4.4.12-2 +- Bootstrap for Python 3.12 + * Thu Apr 13 2023 Miro Hrončok - 4.4.12-1 - Update to 4.4.12 (rhbz#2186618) From 404f2b434c6a0deacd8aec2de2423543a652e052 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 29 Jun 2023 20:10:58 +0200 Subject: [PATCH 36/99] Rebuilt for Python 3.12 --- python-tox.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 4e1cc7b..25d00b8 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 # Many tests are enabled by default %bcond_without tests # However, some tests are disabled by default, becasue they require: @@ -21,7 +20,7 @@ Name: python-tox Version: 4.4.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -157,6 +156,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Thu Jun 29 2023 Python Maint - 4.4.12-3 +- Rebuilt for Python 3.12 + * Wed Jun 14 2023 Python Maint - 4.4.12-2 - Bootstrap for Python 3.12 From d8295e20cb33457b17c7c5e5f393772095b77a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 17 Jul 2023 11:37:55 +0200 Subject: [PATCH 37/99] Update a test regex to work with Python 3.12+ --- 3066.patch | 36 ++++++++++++++++++++++++++++++++++++ python-tox.spec | 3 +++ 2 files changed, 39 insertions(+) create mode 100644 3066.patch diff --git a/3066.patch b/3066.patch new file mode 100644 index 0000000..84a9ca8 --- /dev/null +++ b/3066.patch @@ -0,0 +1,36 @@ +From bf13dbdb80573a10942a23e4b6071aaa5d3e64cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 17 Jul 2023 11:35:38 +0200 +Subject: [PATCH] Update a test regex to work with Python 3.12+ + +Fixes https://github.com/tox-dev/tox/issues/3065 + +New message: + + "argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'type'" +--- + docs/changelog/3065.bugfix.rst | 1 + + tests/config/loader/test_memory_loader.py | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 docs/changelog/3065.bugfix.rst + +diff --git a/docs/changelog/3065.bugfix.rst b/docs/changelog/3065.bugfix.rst +new file mode 100644 +index 000000000..774b33b24 +--- /dev/null ++++ b/docs/changelog/3065.bugfix.rst +@@ -0,0 +1 @@ ++Update a regular expression in tests to match the exception message in both Python 3.12 and older. +diff --git a/tests/config/loader/test_memory_loader.py b/tests/config/loader/test_memory_loader.py +index 6f645540e..8ab7f8f62 100644 +--- a/tests/config/loader/test_memory_loader.py ++++ b/tests/config/loader/test_memory_loader.py +@@ -66,7 +66,7 @@ def test_memory_loader(value: Any, of_type: type[Any], outcome: Any) -> None: + (["m"], List[int], ValueError, "invalid literal for int"), + ({"m": 1}, Dict[int, int], ValueError, "invalid literal for int"), + ({1: "m"}, Dict[int, int], ValueError, "invalid literal for int"), +- (object, Path, TypeError, "expected str, bytes or os.PathLike object"), ++ (object, Path, TypeError, r"str(, bytes)? or (an )?os\.PathLike object"), + (1, Command, TypeError, "1"), + (1, EnvList, TypeError, "1"), + ], diff --git a/python-tox.spec b/python-tox.spec index 25d00b8..6db9581 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -32,6 +32,9 @@ Source0: %{pypi_source tox} # Adjust virtualenv environment variables to make it work with our patched virtualenv. Patch: fix-tests.patch +# Update a test regex to work with Python 3.12+ +Patch: https://github.com/tox-dev/tox/pull/3066.patch + BuildArch: noarch BuildRequires: python3-devel From 4d7512399845e2b55921d9dd5cb27df3744a22ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 17 Jul 2023 13:39:05 +0200 Subject: [PATCH 38/99] Enumerate patches to workaround CI's old RPM version See https://pagure.io/fedora-ci/general/issue/381 --- python-tox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 6db9581..19c8f12 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -30,10 +30,10 @@ Source0: %{pypi_source tox} # Remove dependency on devpi-process. # Remove coverage-related dependencies. # Adjust virtualenv environment variables to make it work with our patched virtualenv. -Patch: fix-tests.patch +Patch1: fix-tests.patch # Update a test regex to work with Python 3.12+ -Patch: https://github.com/tox-dev/tox/pull/3066.patch +Patch2: https://github.com/tox-dev/tox/pull/3066.patch BuildArch: noarch From 47a95338c998e202c14e622e22def1250e2ac8f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 17 Jul 2023 14:19:45 +0200 Subject: [PATCH 39/99] Use dnf-3 on the CI to workaround https://bugzilla.redhat.com/2223347 --- tests/all_supplementing_pythons.py | 4 ++-- tests/tests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/all_supplementing_pythons.py b/tests/all_supplementing_pythons.py index 728e6c3..223bdf1 100755 --- a/tests/all_supplementing_pythons.py +++ b/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 diff --git a/tests/tests.yml b/tests/tests.yml index 9a9a3c2..61bd878 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -89,7 +89,7 @@ - python2-devel - pypy3.9-devel - python3-tox - - dnf + - python3-dnf - mock - rpmdevtools - rpm-build From 6e1c15c976b3cf94386cef3e2e9f9398f605661b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 14:52:48 +0000 Subject: [PATCH 40/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-tox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 19c8f12..946378a 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ Name: python-tox Version: 4.4.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -159,6 +159,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 4.4.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 29 2023 Python Maint - 4.4.12-3 - Rebuilt for Python 3.12 From 9ec60fcdb52de2f5f8ae3756eb8d64bca4a7c49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 30 Aug 2023 20:07:41 +0200 Subject: [PATCH 41/99] Update to 4.11.0 (rhbz#2189321) --- 3066.patch | 36 ------------------------ fix-tests.patch | 73 ++++++++++++++++++++++--------------------------- python-tox.spec | 17 ++++++++---- sources | 2 +- 4 files changed, 45 insertions(+), 83 deletions(-) delete mode 100644 3066.patch diff --git a/3066.patch b/3066.patch deleted file mode 100644 index 84a9ca8..0000000 --- a/3066.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bf13dbdb80573a10942a23e4b6071aaa5d3e64cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 17 Jul 2023 11:35:38 +0200 -Subject: [PATCH] Update a test regex to work with Python 3.12+ - -Fixes https://github.com/tox-dev/tox/issues/3065 - -New message: - - "argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'type'" ---- - docs/changelog/3065.bugfix.rst | 1 + - tests/config/loader/test_memory_loader.py | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - create mode 100644 docs/changelog/3065.bugfix.rst - -diff --git a/docs/changelog/3065.bugfix.rst b/docs/changelog/3065.bugfix.rst -new file mode 100644 -index 000000000..774b33b24 ---- /dev/null -+++ b/docs/changelog/3065.bugfix.rst -@@ -0,0 +1 @@ -+Update a regular expression in tests to match the exception message in both Python 3.12 and older. -diff --git a/tests/config/loader/test_memory_loader.py b/tests/config/loader/test_memory_loader.py -index 6f645540e..8ab7f8f62 100644 ---- a/tests/config/loader/test_memory_loader.py -+++ b/tests/config/loader/test_memory_loader.py -@@ -66,7 +66,7 @@ def test_memory_loader(value: Any, of_type: type[Any], outcome: Any) -> None: - (["m"], List[int], ValueError, "invalid literal for int"), - ({"m": 1}, Dict[int, int], ValueError, "invalid literal for int"), - ({1: "m"}, Dict[int, int], ValueError, "invalid literal for int"), -- (object, Path, TypeError, "expected str, bytes or os.PathLike object"), -+ (object, Path, TypeError, r"str(, bytes)? or (an )?os\.PathLike object"), - (1, Command, TypeError, "1"), - (1, EnvList, TypeError, "1"), - ], diff --git a/fix-tests.patch b/fix-tests.patch index 4981679..f2236bc 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,57 +1,58 @@ -From eb6cd0a5fe1734c5eee78b9889ba7a07fdeb2111 Mon Sep 17 00:00:00 2001 +From c23f636eef39220989fcfde7aed6a505aaca993c Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests --- - pyproject.toml | 4 ---- + pyproject.toml | 5 ----- src/tox/pytest.py | 16 +++------------- - tests/test_provision.py | 18 ++---------------- + tests/test_provision.py | 17 ++--------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 19ee5ec..b806958 100644 +index 9bdfbca..51c6980 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -73,8 +73,6 @@ optional-dependencies.docs = [ +@@ -72,9 +72,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ "build[virtualenv]>=0.10", - "covdefaults>=2.3", -- "devpi-process>=0.3", - "diff-cover>=7.5", - "distlib>=0.3.6", +- "detect-test-pollution>=1.1.1", +- "devpi-process>=1", + "diff-cover>=7.7", + "distlib>=0.3.7", "flaky>=3.7", -@@ -82,7 +80,6 @@ optional-dependencies.testing = [ - "hatchling>=1.14", - "psutil>=5.9.4", - "pytest>=7.2.2", -- "pytest-cov>=4", - "pytest-mock>=3.10", - "pytest-xdist>=3.2.1", +@@ -82,7 +79,6 @@ optional-dependencies.testing = [ + "hatchling>=1.18", + "psutil>=5.9.5", + "pytest>=7.4", +- "pytest-cov>=4.1", + "pytest-mock>=3.11.1", + "pytest-xdist>=3.3.1", "re-assert>=1.1", -@@ -120,7 +117,6 @@ paths.source = [ +@@ -148,7 +144,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.isort] - known_first_party = ["tox", "tests"] + [tool.mypy] + python_version = "3.11" diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index 0bc9905..65701b5 100644 +index d7243bd..0e14e5d 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py -@@ -26,7 +26,6 @@ from _pytest.logging import LogCaptureFixture - from _pytest.monkeypatch import MonkeyPatch - from _pytest.python import Function - from _pytest.tmpdir import TempPathFactory +@@ -16,7 +16,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c + + import pytest + from _pytest.fixtures import SubRequest -from devpi_process import IndexServer - from pytest_mock import MockerFixture from virtualenv.info import fs_supports_symlink -@@ -286,9 +285,9 @@ class ToxProject: - m.setattr(sys, "argv", [sys.executable, "-m", "tox"] + list(args)) + import tox.run +@@ -276,9 +275,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") @@ -63,12 +64,12 @@ index 0bc9905..65701b5 100644 try: tox_run(args) except SystemExit as exception: -@@ -472,15 +471,6 @@ def enable_pypi_server(monkeypatch: MonkeyPatch, url: str | None) -> None: +@@ -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: TempPathFactory) -> Iterator[IndexServer]: +-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: @@ -80,18 +81,10 @@ index 0bc9905..65701b5 100644 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 290e48d..475d7f4 100644 +index f9275fb..ddf8607 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py -@@ -12,7 +12,6 @@ from unittest import mock - from zipfile import ZipFile - - import pytest --from devpi_process import Index, IndexServer - from filelock import FileLock - from packaging.requirements import Requirement - -@@ -93,21 +92,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] +@@ -92,21 +92,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] return result @@ -115,7 +108,7 @@ index 290e48d..475d7f4 100644 def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: -@@ -156,7 +143,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - +@@ -155,7 +143,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - @pytest.mark.integration() @@ -124,5 +117,5 @@ index 290e48d..475d7f4 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.39.2 +2.40.1 diff --git a/python-tox.spec b/python-tox.spec index 946378a..86af16c 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,8 +19,8 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.4.12 -Release: 4%{?dist} +Version: 4.11.0 +Release: 1%{?dist} Summary: Virtualenv-based automation of test activities License: MIT @@ -28,13 +28,11 @@ URL: https://tox.readthedocs.io/ Source0: %{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. Patch1: fix-tests.patch -# Update a test regex to work with Python 3.12+ -Patch2: https://github.com/tox-dev/tox/pull/3066.patch - BuildArch: noarch BuildRequires: python3-devel @@ -49,6 +47,9 @@ 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} @@ -105,7 +106,8 @@ Obsoletes: python3-tox < 3.24.4-2 # 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-xdist|wheel)>=.*/"\1",/g' \ +sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools)>=.*/"\1",/g' \ + -e "s/'(time-machine)>=[^;']+/'\1/" \ -e 's/"(virtualenv)>=.*/"\1>=20",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ pyproject.toml @@ -159,6 +161,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Wed Aug 30 2023 Miro Hrončok - 4.11.0-1 +- Update to 4.11.0 (rhbz#2189321) + * Fri Jul 21 2023 Fedora Release Engineering - 4.4.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 7375f34..07b69f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.4.12.tar.gz) = 896ecef178b0625246ffe4ab3a9a0c03650eb78633fa92706e93475d6589ac29d65bbf91b9ecfacfa8154739eefd463aeb1252be68998cdffddc270a4f89edd0 +SHA512 (tox-4.11.0.tar.gz) = 3e2e9f09874c39f6928d2502e5d01ca48721fc777d758f1d4b3df012261c3adc9e93a89ff6dcf7950fb4245df2624ff8c7cb84feb9424a8fcb6ab12117728692 From 2e5ee9fbed05f83358d790b7664432cb0b58efe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 30 Aug 2023 20:33:33 +0200 Subject: [PATCH 42/99] CI: Add PyPy 3.10 --- tests/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index 61bd878..a79f90b 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -66,6 +66,9 @@ - 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 @@ -88,6 +91,7 @@ - python3.12-devel - python2-devel - pypy3.9-devel + - pypy3.10-devel - python3-tox - python3-dnf - mock From f1b52407faa7b301c2864d5c4660fef8b7e1976a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 6 Sep 2023 21:14:37 +0200 Subject: [PATCH 43/99] Update to 4.11.1 (rhbz#2236871) --- python-tox.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 86af16c..65a7c65 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.11.0 +Version: 4.11.1 Release: 1%{?dist} Summary: Virtualenv-based automation of test activities @@ -161,6 +161,9 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog +* Wed Sep 06 2023 Miro Hrončok - 4.11.1-1 +- Update to 4.11.1 (rhbz#2236871) + * Wed Aug 30 2023 Miro Hrončok - 4.11.0-1 - Update to 4.11.0 (rhbz#2189321) diff --git a/sources b/sources index 07b69f7..74a6438 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.11.0.tar.gz) = 3e2e9f09874c39f6928d2502e5d01ca48721fc777d758f1d4b3df012261c3adc9e93a89ff6dcf7950fb4245df2624ff8c7cb84feb9424a8fcb6ab12117728692 +SHA512 (tox-4.11.1.tar.gz) = 8dc99f98a72ece1cae60e9a0d99fe44b66bd6d9fe6f2d45b0f4e7ab10a5e4a65049cced4b212fe8bfe34ded65b8e4b76d642e5c014d385d2d2cd7f87d8cf6816 From 2e83f2e3166e7b0dffa352cb4ba560691334519c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 25 Sep 2023 14:54:42 +0200 Subject: [PATCH 44/99] Stop needlessly enumerating sources and patches Now when https://pagure.io/fedora-ci/general/issue/381 is fixed, we don't need to preserve spec compatibility with RHEL 8. [skip changelog] --- python-tox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 65a7c65..95a4294 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -25,13 +25,13 @@ 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. -Patch1: fix-tests.patch +Patch: fix-tests.patch BuildArch: noarch From 7739b63e7b1e353d25f3d12d28842733ab9a8d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 25 Sep 2023 15:06:25 +0200 Subject: [PATCH 45/99] Switch to the new, more understandable bcond syntax Now when https://pagure.io/fedora-ci/general/issue/381 is fixed, we don't need to preserve spec compatibility with RHEL 8. [skip changelog] --- python-tox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 95a4294..1d4b06a 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,5 +1,5 @@ # Many tests are enabled by default -%bcond_without tests +%bcond tests 1 # However, some tests are disabled by default, becasue they require: # a) tested tox to be installed and/or # b) internet connection @@ -11,7 +11,7 @@ # 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_with ci_tests +%bcond ci_tests 0 # Unset -s on python shebang - ensure that extensions installed with pip # to user locations are seen and properly loaded From f480c33d04ee5e0989558f079b66afa3a0860fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 25 Sep 2023 15:06:57 +0200 Subject: [PATCH 46/99] Convert to %autorelease and %autochangelog Now when https://pagure.io/fedora-ci/general/issue/381 is fixed, we don't need to preserve spec compatibility with RHEL 8. [skip changelog] --- changelog | 341 +++++++++++++++++++++++++++++++++++++++++++++++ python-tox.spec | 344 +----------------------------------------------- 2 files changed, 343 insertions(+), 342 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..04a1bad --- /dev/null +++ b/changelog @@ -0,0 +1,341 @@ +* Wed Sep 06 2023 Miro Hrončok - 4.11.1-1 +- Update to 4.11.1 (rhbz#2236871) + +* Wed Aug 30 2023 Miro Hrončok - 4.11.0-1 +- Update to 4.11.0 (rhbz#2189321) + +* Fri Jul 21 2023 Fedora Release Engineering - 4.4.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 29 2023 Python Maint - 4.4.12-3 +- Rebuilt for Python 3.12 + +* Wed Jun 14 2023 Python Maint - 4.4.12-2 +- Bootstrap for Python 3.12 + +* Thu Apr 13 2023 Miro Hrončok - 4.4.12-1 +- Update to 4.4.12 (rhbz#2186618) + +* Wed Apr 12 2023 Miro Hrončok - 4.4.11-1 +- Update to 4.4.11 (rhbz#2184726) + +* Wed Mar 29 2023 Miro Hrončok - 4.4.8-1 +- Update to 4.4.8 (rhbz#2177519) + +* Tue Feb 28 2023 Miro Hrončok - 4.4.6-1 +- Update to 4.4.6 (rhbz#2164640) + +* Tue Jan 24 2023 Miro Hrončok - 4.3.5-1 +- Update to 4.3.5 (rhbz#2161692) + +* Fri Jan 20 2023 Fedora Release Engineering - 4.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Miro Hrončok - 4.3.3-1 +- Update to 4.3.3 (rhbz#2161429) + +* Mon Jan 16 2023 Miro Hrončok - 4.3.2-1 +- Update to 4.3.2 (rhbz#2161388) + +* Mon Jan 16 2023 Lumír Balhar - 4.3.1-1 +- Update to 4.3.1 (rhbz#2161119) + +* Thu Jan 12 2023 Miro Hrončok - 4.2.8-1 +- Update to 4.2.8 (rhbz#2160315) + +* Wed Jan 11 2023 Miro Hrončok - 4.2.7-1 +- Update to 4.2.7 (rhbz#2160186) + +* Tue Jan 3 2023 Lumír Balhar - 4.2.6-1 +- Update to 4.2.6 (rhbz#1914413) + +* Sun Dec 18 2022 Miro Hrončok - 3.28.0-1 +- Update to 3.28.0 + +* Fri Nov 25 2022 Miro Hrončok - 3.27.1-1 +- Update to 3.27.1 + +* Wed Sep 14 2022 Miro Hrončok - 3.26.0-1 +- Update to 3.26.0 + +* Fri Jul 22 2022 Fedora Release Engineering - 3.25.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Lumír Balhar - 3.25.1-1 +- Update to 3.25.1 + +* Mon Jun 13 2022 Python Maint - 3.25.0-2 +- Rebuilt for Python 3.11 + +* Mon May 09 2022 Miro Hrončok - 3.25.0-1 +- Update to 3.25.0 + +* Tue Feb 22 2022 Rich Megginson - 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 - 3.24.5-1 +- Update to 3.24.5 + +* Fri Jan 21 2022 Fedora Release Engineering - 3.24.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 13 2021 Miro Hrončok - 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 - 3.24.4-1 +- Update to 3.24.4 + +* Tue Aug 31 2021 Miro Hrončok - 3.24.3-1 +- Update to 3.24.3 + +* Wed Aug 04 2021 Miro Hrončok - 3.24.1-2 +- Obsolete newer versions of python3-tox + +* Tue Aug 03 2021 Miro Hrončok - 3.24.1-1 +- Update to 3.24.1 + +* Mon Aug 02 2021 Miro Hrončok - 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 - 3.24.0-1 +- Update to 3.24.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 3.23.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 02 2021 Python Maint - 3.23.0-3 +- Rebuilt for Python 3.10 + +* Tue Mar 30 2021 Miro Hrončok - 3.23.0-2 +- Allow building with setuptools_scm 6+ + +* Wed Mar 17 2021 Miro Hrončok - 3.23.0-1 +- Update to 3.23.0 + +* Tue Feb 02 2021 Miro Hrončok - 3.21.4-1 +- Update to 3.21.4 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.21.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 08 2021 Miro Hrončok - 3.21.0-2 +- Rename the installable package to "tox" + +* Fri Jan 08 2021 Miro Hrončok - 3.21.0-1 +- Update to 3.21.0 + +* Mon Sep 07 2020 Tomas Hrnciar - 3.20.0-1 +- Update to 3.20.0 +- Fixes rhbz#1874601 + +* Fri Aug 07 2020 Miro Hrončok - 3.19.0-1 +- Update to 3.19.0 +- Fixes rhbz#1861313 + +* Wed Jul 29 2020 Fedora Release Engineering - 3.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 23 2020 Miro Hrončok - 3.18.0-1 +- Update to 3.18.0 +- Fixes rhbz#1859875 + +* Tue Jul 14 2020 Miro Hrončok - 3.17.0-1 +- Update to 3.17.0 +- Fixes rhbz#1856985 + +* Thu Jul 09 2020 Miro Hrončok - 3.16.1-1 +- Update to 3.16.1 +- Fixes rhbz#1851519 + +* Mon Jun 08 2020 Miro Hrončok - 3.15.2-1 +- Update to 3.15.2 (#1844689) + +* Mon Jun 01 2020 Charalampos Stratakis - 3.15.1-1 +- Update to 3.15.1 (#1838137) + +* Sat May 23 2020 Miro Hrončok - 3.15.0-2 +- Rebuilt for Python 3.9 + +* Wed May 13 2020 Tomas Hrnciar - 3.15.0-1 +- Update to 3.15.0 +- Stop recommending Python 3.4 + +* Thu Mar 19 2020 Tomas Hrnciar - 3.14.6-1 +- Update to 3.14.6 + +* Thu Feb 06 2020 Miro Hrončok - 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 - 3.13.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 3.13.2-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Fri Aug 16 2019 Miro Hrončok - 3.13.2-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 3.13.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 08 2019 Miro Hrončok - 3.13.2-1 +- Update to 3.13.2 (#1699032) + +* Tue Apr 30 2019 Miro Hrončok - 3.9.0-1 +- Update to 3.9.0 +- Obsolete detox +- License is MIT + +* Fri Feb 15 2019 Lumír Balhar - 3.5.3-3 +- Recommend Python 3.8 + +* Sat Feb 02 2019 Fedora Release Engineering - 3.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Nov 22 2018 Artem Goncharov - 3.5.3-1 +- Upgrade to 3.5.3 version + +* Mon Nov 19 2018 Artem Goncharov - 3.4.0-1 +- Upgrade to 3.4.0 version (#1652657) + +* Thu Nov 01 2018 Matthias Runge - 3.0.0-6 +- remove and revert the change to recommend python 2.7 (rhbz#1645025) + +* Tue Aug 28 2018 Miro Hrončok - 3.0.0-4 +- Don't recommend Python 2.6, it doesn't work with tox 3 + +* Sat Jul 14 2018 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro Hrončok - 3.0.0-2 +- Rebuilt for Python 3.7 + +* Mon Jul 02 2018 Matthias Runge - 3.0.0-1 +- upgrade to 3.0.0 + +* Sun Jun 17 2018 Miro Hrončok - 2.9.1-7 +- Rebuilt for Python 3.7 + +* Tue May 15 2018 Miro Hrončok - 2.9.1-6 +- Remove the python2 version once again +- Stop recommending python33 (it's retired) + +* Mon May 07 2018 Miro Hrončok - 2.9.1-5 +- Add python2 back, see #1575667 + +* Mon Apr 30 2018 Miro Hrončok - 2.9.1-4 +- Remove the python2 version + +* Thu Mar 15 2018 Miro Hrončok - 2.9.1-3 +- Switch to automatic dependency generator (also fixes #1556164) +- Recommend python37 + +* Fri Feb 09 2018 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Matthias Runge - 2.9.1-1 +- update to 2.9.1 + +* Thu Jul 27 2017 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Apr 25 2017 Matthias Runge - 2.7.0-1 +- upgrade to 2.7.0 + +* Sun Apr 09 2017 Miro Hrončok - 2.3.1-8 +- Recommend the devel subpackages of Pythons (so tox works with extension modules) + +* Tue Feb 14 2017 Miro Hrončok - 2.3.1-7 +- Recommend python36 + +* Sat Feb 11 2017 Fedora Release Engineering - 2.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 2.3.1-5 +- Rebuild for Python 3.6 + +* Mon Oct 10 2016 Miro Hrončok - 2.3.1-4 +- Recommend "all the Pythons" + +* Thu Aug 11 2016 Miro Hrončok - 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 - 2.3.1-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Feb 29 2016 Matthias Runge - 2.3.1-1 +- update to 2.3.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 2.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Nov 12 2015 Kalev Lember - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Tue Aug 25 2015 Matthias Runge - 2.1.1-2 +- add requirement: python-pluggy + +* Tue Aug 18 2015 Matthias Runge - 2.1.1-1 +- update to 2.1.1 + +* Thu Jun 18 2015 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Dec 16 2014 Matthias Runge - 1.8.1-1 +- update to 1.8.1 + +* Wed Aug 13 2014 Matthias Runge - 1.7.1-3 +- Fix ConfigError: ConfigError: substitution key 'posargs' not found + (rhbz#1127961, rhbz#1128562) + +* Wed Jul 30 2014 Matthias Runge - 1.7.1-2 +- require virtualenv >= 1.11.2 (rhbz#1122603) + +* Tue Jul 08 2014 Matthias Runge - 1.7.1-1 +- update to 1.7.1 (rhbz#111797) + +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Sep 24 2013 Matthias Runge - 1.6.1-1 +- update to 1.6.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.4.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1.4.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 14 2012 Matthias Runge - 1.4.2-7 +- add requires python-py, python-virtualenv (rhbz#876246) + +* Thu Oct 18 2012 Matthias Runge - 1.4.2-6 +- change license to GPLv2+ and MIT + +* Tue Oct 16 2012 Matthias Runge - 1.4.2-5 +- totally disable python3 support for now + +* Fri Oct 12 2012 Matthias Runge - 1.4.2-4 +- conditionalize checks, as internet connection required, not available on koji + +* Thu Oct 11 2012 Matthias Runge - 1.4.2-3 +- buildrequirement: virtualenv +- disable python3-tests because of missing build-requirement python3-virtualenv + +* Wed Oct 10 2012 Matthias Runge - 1.4.2-2 +- include tests + +* Tue Oct 09 2012 Matthias Runge - 1.4.2-1 +- initial packaging diff --git a/python-tox.spec b/python-tox.spec index 1d4b06a..27b07a2 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ Name: python-tox Version: 4.11.1 -Release: 1%{?dist} +Release: %autorelease Summary: Virtualenv-based automation of test activities License: MIT @@ -161,344 +161,4 @@ k="${k-}${k+ and }not test_local_execute_write_a_lot" %changelog -* Wed Sep 06 2023 Miro Hrončok - 4.11.1-1 -- Update to 4.11.1 (rhbz#2236871) - -* Wed Aug 30 2023 Miro Hrončok - 4.11.0-1 -- Update to 4.11.0 (rhbz#2189321) - -* Fri Jul 21 2023 Fedora Release Engineering - 4.4.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 29 2023 Python Maint - 4.4.12-3 -- Rebuilt for Python 3.12 - -* Wed Jun 14 2023 Python Maint - 4.4.12-2 -- Bootstrap for Python 3.12 - -* Thu Apr 13 2023 Miro Hrončok - 4.4.12-1 -- Update to 4.4.12 (rhbz#2186618) - -* Wed Apr 12 2023 Miro Hrončok - 4.4.11-1 -- Update to 4.4.11 (rhbz#2184726) - -* Wed Mar 29 2023 Miro Hrončok - 4.4.8-1 -- Update to 4.4.8 (rhbz#2177519) - -* Tue Feb 28 2023 Miro Hrončok - 4.4.6-1 -- Update to 4.4.6 (rhbz#2164640) - -* Tue Jan 24 2023 Miro Hrončok - 4.3.5-1 -- Update to 4.3.5 (rhbz#2161692) - -* Fri Jan 20 2023 Fedora Release Engineering - 4.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 16 2023 Miro Hrončok - 4.3.3-1 -- Update to 4.3.3 (rhbz#2161429) - -* Mon Jan 16 2023 Miro Hrončok - 4.3.2-1 -- Update to 4.3.2 (rhbz#2161388) - -* Mon Jan 16 2023 Lumír Balhar - 4.3.1-1 -- Update to 4.3.1 (rhbz#2161119) - -* Thu Jan 12 2023 Miro Hrončok - 4.2.8-1 -- Update to 4.2.8 (rhbz#2160315) - -* Wed Jan 11 2023 Miro Hrončok - 4.2.7-1 -- Update to 4.2.7 (rhbz#2160186) - -* Tue Jan 3 2023 Lumír Balhar - 4.2.6-1 -- Update to 4.2.6 (rhbz#1914413) - -* Sun Dec 18 2022 Miro Hrončok - 3.28.0-1 -- Update to 3.28.0 - -* Fri Nov 25 2022 Miro Hrončok - 3.27.1-1 -- Update to 3.27.1 - -* Wed Sep 14 2022 Miro Hrončok - 3.26.0-1 -- Update to 3.26.0 - -* Fri Jul 22 2022 Fedora Release Engineering - 3.25.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 13 2022 Lumír Balhar - 3.25.1-1 -- Update to 3.25.1 - -* Mon Jun 13 2022 Python Maint - 3.25.0-2 -- Rebuilt for Python 3.11 - -* Mon May 09 2022 Miro Hrončok - 3.25.0-1 -- Update to 3.25.0 - -* Tue Feb 22 2022 Rich Megginson - 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 - 3.24.5-1 -- Update to 3.24.5 - -* Fri Jan 21 2022 Fedora Release Engineering - 3.24.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 13 2021 Miro Hrončok - 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 - 3.24.4-1 -- Update to 3.24.4 - -* Tue Aug 31 2021 Miro Hrončok - 3.24.3-1 -- Update to 3.24.3 - -* Wed Aug 04 2021 Miro Hrončok - 3.24.1-2 -- Obsolete newer versions of python3-tox - -* Tue Aug 03 2021 Miro Hrončok - 3.24.1-1 -- Update to 3.24.1 - -* Mon Aug 02 2021 Miro Hrončok - 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 - 3.24.0-1 -- Update to 3.24.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 3.23.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 02 2021 Python Maint - 3.23.0-3 -- Rebuilt for Python 3.10 - -* Tue Mar 30 2021 Miro Hrončok - 3.23.0-2 -- Allow building with setuptools_scm 6+ - -* Wed Mar 17 2021 Miro Hrončok - 3.23.0-1 -- Update to 3.23.0 - -* Tue Feb 02 2021 Miro Hrončok - 3.21.4-1 -- Update to 3.21.4 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.21.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 08 2021 Miro Hrončok - 3.21.0-2 -- Rename the installable package to "tox" - -* Fri Jan 08 2021 Miro Hrončok - 3.21.0-1 -- Update to 3.21.0 - -* Mon Sep 07 2020 Tomas Hrnciar - 3.20.0-1 -- Update to 3.20.0 -- Fixes rhbz#1874601 - -* Fri Aug 07 2020 Miro Hrončok - 3.19.0-1 -- Update to 3.19.0 -- Fixes rhbz#1861313 - -* Wed Jul 29 2020 Fedora Release Engineering - 3.18.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 23 2020 Miro Hrončok - 3.18.0-1 -- Update to 3.18.0 -- Fixes rhbz#1859875 - -* Tue Jul 14 2020 Miro Hrončok - 3.17.0-1 -- Update to 3.17.0 -- Fixes rhbz#1856985 - -* Thu Jul 09 2020 Miro Hrončok - 3.16.1-1 -- Update to 3.16.1 -- Fixes rhbz#1851519 - -* Mon Jun 08 2020 Miro Hrončok - 3.15.2-1 -- Update to 3.15.2 (#1844689) - -* Mon Jun 01 2020 Charalampos Stratakis - 3.15.1-1 -- Update to 3.15.1 (#1838137) - -* Sat May 23 2020 Miro Hrončok - 3.15.0-2 -- Rebuilt for Python 3.9 - -* Wed May 13 2020 Tomas Hrnciar - 3.15.0-1 -- Update to 3.15.0 -- Stop recommending Python 3.4 - -* Thu Mar 19 2020 Tomas Hrnciar - 3.14.6-1 -- Update to 3.14.6 - -* Thu Feb 06 2020 Miro Hrončok - 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 - 3.13.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 3.13.2-4 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Fri Aug 16 2019 Miro Hrončok - 3.13.2-3 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 3.13.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 08 2019 Miro Hrončok - 3.13.2-1 -- Update to 3.13.2 (#1699032) - -* Tue Apr 30 2019 Miro Hrončok - 3.9.0-1 -- Update to 3.9.0 -- Obsolete detox -- License is MIT - -* Fri Feb 15 2019 Lumír Balhar - 3.5.3-3 -- Recommend Python 3.8 - -* Sat Feb 02 2019 Fedora Release Engineering - 3.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 22 2018 Artem Goncharov - 3.5.3-1 -- Upgrade to 3.5.3 version - -* Mon Nov 19 2018 Artem Goncharov - 3.4.0-1 -- Upgrade to 3.4.0 version (#1652657) - -* Thu Nov 01 2018 Matthias Runge - 3.0.0-6 -- remove and revert the change to recommend python 2.7 (rhbz#1645025) - -* Tue Aug 28 2018 Miro Hrončok - 3.0.0-4 -- Don't recommend Python 2.6, it doesn't work with tox 3 - -* Sat Jul 14 2018 Fedora Release Engineering - 3.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 3.0.0-2 -- Rebuilt for Python 3.7 - -* Mon Jul 02 2018 Matthias Runge - 3.0.0-1 -- upgrade to 3.0.0 - -* Sun Jun 17 2018 Miro Hrončok - 2.9.1-7 -- Rebuilt for Python 3.7 - -* Tue May 15 2018 Miro Hrončok - 2.9.1-6 -- Remove the python2 version once again -- Stop recommending python33 (it's retired) - -* Mon May 07 2018 Miro Hrončok - 2.9.1-5 -- Add python2 back, see #1575667 - -* Mon Apr 30 2018 Miro Hrončok - 2.9.1-4 -- Remove the python2 version - -* Thu Mar 15 2018 Miro Hrončok - 2.9.1-3 -- Switch to automatic dependency generator (also fixes #1556164) -- Recommend python37 - -* Fri Feb 09 2018 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 29 2018 Matthias Runge - 2.9.1-1 -- update to 2.9.1 - -* Thu Jul 27 2017 Fedora Release Engineering - 2.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Apr 25 2017 Matthias Runge - 2.7.0-1 -- upgrade to 2.7.0 - -* Sun Apr 09 2017 Miro Hrončok - 2.3.1-8 -- Recommend the devel subpackages of Pythons (so tox works with extension modules) - -* Tue Feb 14 2017 Miro Hrončok - 2.3.1-7 -- Recommend python36 - -* Sat Feb 11 2017 Fedora Release Engineering - 2.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 2.3.1-5 -- Rebuild for Python 3.6 - -* Mon Oct 10 2016 Miro Hrončok - 2.3.1-4 -- Recommend "all the Pythons" - -* Thu Aug 11 2016 Miro Hrončok - 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 - 2.3.1-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Mon Feb 29 2016 Matthias Runge - 2.3.1-1 -- update to 2.3.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 2.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Nov 12 2015 Kalev Lember - 2.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Tue Aug 25 2015 Matthias Runge - 2.1.1-2 -- add requirement: python-pluggy - -* Tue Aug 18 2015 Matthias Runge - 2.1.1-1 -- update to 2.1.1 - -* Thu Jun 18 2015 Fedora Release Engineering - 1.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Dec 16 2014 Matthias Runge - 1.8.1-1 -- update to 1.8.1 - -* Wed Aug 13 2014 Matthias Runge - 1.7.1-3 -- Fix ConfigError: ConfigError: substitution key 'posargs' not found - (rhbz#1127961, rhbz#1128562) - -* Wed Jul 30 2014 Matthias Runge - 1.7.1-2 -- require virtualenv >= 1.11.2 (rhbz#1122603) - -* Tue Jul 08 2014 Matthias Runge - 1.7.1-1 -- update to 1.7.1 (rhbz#111797) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Sep 24 2013 Matthias Runge - 1.6.1-1 -- update to 1.6.1 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.4.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 1.4.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Nov 14 2012 Matthias Runge - 1.4.2-7 -- add requires python-py, python-virtualenv (rhbz#876246) - -* Thu Oct 18 2012 Matthias Runge - 1.4.2-6 -- change license to GPLv2+ and MIT - -* Tue Oct 16 2012 Matthias Runge - 1.4.2-5 -- totally disable python3 support for now - -* Fri Oct 12 2012 Matthias Runge - 1.4.2-4 -- conditionalize checks, as internet connection required, not available on koji - -* Thu Oct 11 2012 Matthias Runge - 1.4.2-3 -- buildrequirement: virtualenv -- disable python3-tests because of missing build-requirement python3-virtualenv - -* Wed Oct 10 2012 Matthias Runge - 1.4.2-2 -- include tests - -* Tue Oct 09 2012 Matthias Runge - 1.4.2-1 -- initial packaging +%autochangelog From fa73dff1942a5c083fa5ef41573986259014a5d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 08:21:13 +0000 Subject: [PATCH 47/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 920a8761e6954bf6fca57e62569a13b18976df17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 25 Jan 2024 16:01:32 +0100 Subject: [PATCH 48/99] Remove old unneeded Obsoletes for python3-tox --- python-tox.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 27b07a2..f44ea56 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -95,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 From 867b65d1a1fc789975efb0f30b81dc5f6bc00fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 25 Jan 2024 17:15:51 +0100 Subject: [PATCH 49/99] CI: Update the list of Pythons [skip changelog] --- tests/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index a79f90b..ef3a95b 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -33,15 +33,12 @@ - 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,6 +54,9 @@ - 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 @@ -83,12 +83,12 @@ - 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.9-devel - pypy3.10-devel From e8c52fe3815baea2cc95bf9495a1ed2037da0f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 25 Jan 2024 16:28:30 +0100 Subject: [PATCH 50/99] Update to 4.12.1 --- fix-tests.patch | 38 +++++++++++++++++++------------------- python-tox.spec | 5 +++-- sources | 2 +- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index f2236bc..d256575 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From c23f636eef39220989fcfde7aed6a505aaca993c Mon Sep 17 00:00:00 2001 +From d12ada760ddff3cbd77a04577561d32b4d36560a Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,40 +10,40 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 9bdfbca..51c6980 100644 +index 7cb8de3..fe0b77d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,9 +72,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ - "build[virtualenv]>=0.10", + "build[virtualenv]>=1.0.3", - "covdefaults>=2.3", -- "detect-test-pollution>=1.1.1", +- "detect-test-pollution>=1.2", - "devpi-process>=1", - "diff-cover>=7.7", - "distlib>=0.3.7", + "diff-cover>=8.0.2", + "distlib>=0.3.8", "flaky>=3.7", @@ -82,7 +79,6 @@ optional-dependencies.testing = [ - "hatchling>=1.18", - "psutil>=5.9.5", - "pytest>=7.4", + "hatchling>=1.21", + "psutil>=5.9.7", + "pytest>=7.4.4", - "pytest-cov>=4.1", - "pytest-mock>=3.11.1", - "pytest-xdist>=3.3.1", + "pytest-mock>=3.12", + "pytest-xdist>=3.5", "re-assert>=1.1", -@@ -148,7 +144,6 @@ paths.source = [ +@@ -160,7 +156,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.mypy] - python_version = "3.11" + [tool.towncrier] + name = "tox" diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index d7243bd..0e14e5d 100644 +index 0563404..6cd08b8 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py -@@ -16,7 +16,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c +@@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c import pytest from _pytest.fixtures import SubRequest @@ -51,7 +51,7 @@ index d7243bd..0e14e5d 100644 from virtualenv.info import fs_supports_symlink import tox.run -@@ -276,9 +275,9 @@ class ToxProject: +@@ -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") @@ -81,7 +81,7 @@ index d7243bd..0e14e5d 100644 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 f9275fb..ddf8607 100644 +index 3b5bd19..442ac84 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] @@ -117,5 +117,5 @@ index f9275fb..ddf8607 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.40.1 +2.43.0 diff --git a/python-tox.spec b/python-tox.spec index f44ea56..0379587 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.11.1 +Version: 4.12.1 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -104,7 +104,7 @@ 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)>=.*/"\1",/g' \ +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' \ -e "s/'(time-machine)>=[^;']+/'\1/" \ -e 's/"(virtualenv)>=.*/"\1>=20",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ @@ -148,6 +148,7 @@ k="${k-}${k+ and }not test_call_as_exe" # 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 diff --git a/sources b/sources index 74a6438..65c030a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.11.1.tar.gz) = 8dc99f98a72ece1cae60e9a0d99fe44b66bd6d9fe6f2d45b0f4e7ab10a5e4a65049cced4b212fe8bfe34ded65b8e4b76d642e5c014d385d2d2cd7f87d8cf6816 +SHA512 (tox-4.12.1.tar.gz) = 217fbc2933999fcc5d080d97521cd01b7d9a35d4f1542cc58bcc2ff86d07884caa43fd42b09e5064cbad1334e4df9cd717c48c70041c9cf856b0beb22e1ea8a7 From 42727f7f23b75190d4645ead902bca052358f323 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Thu, 11 Apr 2024 02:34:58 +0200 Subject: [PATCH 51/99] Update to 4.14.2 - Resolves: rhbz#2264626 --- fix-tests.patch | 14 +++++++------- python-tox.spec | 2 +- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index d256575..e8767da 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From d12ada760ddff3cbd77a04577561d32b4d36560a Mon Sep 17 00:00:00 2001 +From 9e70838d0fe10576c8e991a2ac8cff09eab8a4b8 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,7 +10,7 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 7cb8de3..fe0b77d 100644 +index c34eed8..4604c52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,9 +72,6 @@ optional-dependencies.docs = [ @@ -31,7 +31,7 @@ index 7cb8de3..fe0b77d 100644 "pytest-mock>=3.12", "pytest-xdist>=3.5", "re-assert>=1.1", -@@ -160,7 +156,6 @@ paths.source = [ +@@ -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 @@ -40,13 +40,13 @@ index 7cb8de3..fe0b77d 100644 [tool.towncrier] name = "tox" diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index 0563404..6cd08b8 100644 +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 + from _pytest.fixtures import SubRequest # noqa: PLC2701 -from devpi_process import IndexServer from virtualenv.info import fs_supports_symlink @@ -81,7 +81,7 @@ index 0563404..6cd08b8 100644 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 3b5bd19..442ac84 100644 +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] @@ -117,5 +117,5 @@ index 3b5bd19..442ac84 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.43.0 +2.44.0 diff --git a/python-tox.spec b/python-tox.spec index 0379587..1d8623f 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.12.1 +Version: 4.14.2 Release: %autorelease Summary: Virtualenv-based automation of test activities diff --git a/sources b/sources index 65c030a..32d95b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.12.1.tar.gz) = 217fbc2933999fcc5d080d97521cd01b7d9a35d4f1542cc58bcc2ff86d07884caa43fd42b09e5064cbad1334e4df9cd717c48c70041c9cf856b0beb22e1ea8a7 +SHA512 (tox-4.14.2.tar.gz) = 45bbd3f8d00eee05158452295230321947ec16a8bfff43e84ea9825d514976526f3889709255ed042cfb7a7ebfed020707cfc2d25b69ce90c148f4472092350d From 3a13bc1a311b9a17298dd5ab6af7f89df5b2bf1b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 14:12:44 +0200 Subject: [PATCH 52/99] Bootstrap for Python 3.13 --- python-tox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-tox.spec b/python-tox.spec index 1d8623f..bcfd678 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 # Many tests are enabled by default %bcond tests 1 # However, some tests are disabled by default, becasue they require: From 53848e80a8295c64ed6564a245f6fb059958013f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 16:06:48 +0200 Subject: [PATCH 53/99] Rebuilt for Python 3.13 --- python-tox.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index bcfd678..1d8623f 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 # Many tests are enabled by default %bcond tests 1 # However, some tests are disabled by default, becasue they require: From 3b88e4a3d527b245e930f20204f03324a930148a Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 26 Feb 2024 21:22:06 +0100 Subject: [PATCH 54/99] Unskip working tests --- python-tox.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 1d8623f..7c6d7e5 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -144,10 +144,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 From 5d1630d56dfe6b6d0c1f24ad857a2fe13258d74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 27 Feb 2024 10:10:15 +0100 Subject: [PATCH 55/99] Fix CI confusion wrt tox %{release} We were seeing: No match for argument: tox = 4.12.1-1.fc41 Apparently, standard-test-source does not handle the dist-git history. Hence, when the SRPM is built in mocktest.sh, %autorelease is set to 1. However, the available tox from the CI scratchbuild might have a greater Release. We relax the BuildRequirement. We assume mock will install the right build anyway. The CI scratchbuild will either have a different (usually greater) Version when the PR upgrades or downgrades tox or a greater Release otherwise, thanks to %autorelease. --- python-tox.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index 7c6d7e5..dcbf474 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -52,7 +52,8 @@ BuildRequires: python3-pytest-xdist 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 From f3490b28560d7c8eacddad4c55a0850fa504282a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 27 Feb 2024 11:03:25 +0100 Subject: [PATCH 56/99] Remove no longer needed BuildRequires for python3.10 --- python-tox.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index dcbf474..521b201 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -47,9 +47,6 @@ 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 :( # This should technically be the same V-R, but the CI does not handle %%autorelease well From 8f8f2767084e8ae5bbe0eb8c8d8d67f2ba93a3e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 16:36:29 +0000 Subject: [PATCH 57/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b7f56e2c59fa65282bb23c75da65555f36e40dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 26 Jul 2024 16:57:16 +0200 Subject: [PATCH 58/99] Update to 4.16.0 - https://tox.wiki/en/latest/changelog.html#v4-16-0-2024-07-02 - Fixes: rhbz#2277427 --- fix-tests.patch | 48 +++++++++++++++++++++++++----------------------- python-tox.spec | 18 +++++++++++++++--- sources | 2 +- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index e8767da..c15957d 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,41 +1,43 @@ -From 9e70838d0fe10576c8e991a2ac8cff09eab8a4b8 Mon Sep 17 00:00:00 2001 +From cb04460a432fb27ed42bce6f81f20e22a7938fa4 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests --- - pyproject.toml | 5 ----- + pyproject.toml | 7 ------- src/tox/pytest.py | 16 +++------------- tests/test_provision.py | 17 ++--------------- - 3 files changed, 5 insertions(+), 33 deletions(-) + 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index c34eed8..4604c52 100644 +index 21bf402..5cd8470 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -72,9 +72,6 @@ optional-dependencies.docs = [ +@@ -73,9 +73,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ - "build[virtualenv]>=1.0.3", + "build[virtualenv]>=1.2.1", - "covdefaults>=2.3", - "detect-test-pollution>=1.2", - "devpi-process>=1", - "diff-cover>=8.0.2", + "diff-cover>=9.1", "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", + "flaky>=3.8.1", +@@ -83,7 +80,6 @@ optional-dependencies.testing = [ + "hatchling>=1.25", + "psutil>=6", + "pytest>=8.2.2", +- "pytest-cov>=5", + "pytest-mock>=3.14", + "pytest-xdist>=3.6.1", "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/*"] +@@ -186,9 +182,6 @@ report.omit = [ + "tests/type_check/*", + ] run.parallel = true --run.plugins = ["covdefaults"] +-run.plugins = [ +- "covdefaults", +-] [tool.towncrier] name = "tox" @@ -81,10 +83,10 @@ index d734def..5e6df35 100644 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 +index 2c3d4fc..06ddd48 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,21 +98,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] return result @@ -108,7 +110,7 @@ index 41eb630..1df7e76 100644 def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: -@@ -155,7 +143,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - +@@ -161,7 +149,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - @pytest.mark.integration() @@ -117,5 +119,5 @@ index 41eb630..1df7e76 100644 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 +2.45.2 diff --git a/python-tox.spec b/python-tox.spec index 521b201..c5ab297 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -19,7 +19,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.14.2 +Version: 4.16.0 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -102,8 +102,8 @@ 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' \ - -e "s/'(time-machine)>=[^;']+/'\1/" \ +sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|diff-cover|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 @@ -132,6 +132,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} diff --git a/sources b/sources index 32d95b2..3c6946b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.14.2.tar.gz) = 45bbd3f8d00eee05158452295230321947ec16a8bfff43e84ea9825d514976526f3889709255ed042cfb7a7ebfed020707cfc2d25b69ce90c148f4472092350d +SHA512 (tox-4.16.0.tar.gz) = b3d65c5b4f086f1f0474d6cb08d3d4bcdf81735376a94e97997ab5dee5c726e71e8b9a1117eda59f9afd61be0bff38a9533faf16e76b78b504ff6de0f2ddfde0 From daf03eccbb87f79611d038bd6df6f7e95c31b225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 26 Jul 2024 16:59:24 +0200 Subject: [PATCH 59/99] Do not Recommend python2.7 on Fedora 41+ - https://fedoraproject.org/wiki/Changes/RetirePython2.7 Also, make the CI test ready for the retirement. --- python-tox.spec | 6 ++++-- tests/tests.yml | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index c5ab297..0a5aa9c 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -79,7 +79,6 @@ 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 Recommends: python3.6 Recommends: python3.7 Recommends: python3.8 @@ -87,8 +86,11 @@ Recommends: python3.9 Recommends: python3.10 Recommends: pypy2-devel Recommends: pypy3-devel -Recommends: python2-devel Recommends: python3-devel +%if 0%{?fedora} && 0%{?fedora} < 41 +Recommends: python2.7 +Recommends: python2-devel +%endif # 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/ diff --git a/tests/tests.yml b/tests/tests.yml index ef3a95b..7addf64 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,9 +30,9 @@ - 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 ./venv.sh - smoke36: dir: python/smoke run: VERSION=3.6 ./venv.sh @@ -81,7 +81,6 @@ required_packages: - gcc - virtualenv - - python2.7 - python3.6 - python3.8 - python3.9 @@ -89,7 +88,6 @@ - python3.11-devel - python3.12-devel - python3.13-devel - - python2-devel - pypy3.9-devel - pypy3.10-devel - python3-tox From 90d4eb4cc68e67a1778fc7f35688449e1ef8748d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 21 Aug 2024 18:19:42 +0200 Subject: [PATCH 60/99] Allow to use the bootstrap bcond to disable tests This makes it possible to bootstrap the package in EPEL 10 without flipping the bcond in the spec. [skip changelog] --- python-tox.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 0a5aa9c..f519d46 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,5 +1,6 @@ -# Many tests are enabled by default -%bcond tests 1 +%bcond bootstrap 0 +# 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 From fc850ade5e05b578db0ff5bd25d8613007b72813 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 1 Oct 2024 03:34:39 +0200 Subject: [PATCH 61/99] Update to 4.20.0 - Fixes: rhbz#2302960 --- fix-tests.patch | 35 ++++++++++++++++++----------------- python-tox.spec | 2 +- sources | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index c15957d..c91d74c 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From cb04460a432fb27ed42bce6f81f20e22a7938fa4 Mon Sep 17 00:00:00 2001 +From f427195a0e23346ed11b21bba5b22b291881a894 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -6,32 +6,32 @@ Subject: [PATCH] fix tests --- pyproject.toml | 7 ------- src/tox/pytest.py | 16 +++------------- - tests/test_provision.py | 17 ++--------------- - 3 files changed, 5 insertions(+), 35 deletions(-) + tests/test_provision.py | 18 ++---------------- + 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 21bf402..5cd8470 100644 +index d064329..e33c770 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,9 +73,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ - "build[virtualenv]>=1.2.1", + "build[virtualenv]>=1.2.2", - "covdefaults>=2.3", - "detect-test-pollution>=1.2", - "devpi-process>=1", - "diff-cover>=9.1", + "diff-cover>=9.1.1", "distlib>=0.3.8", "flaky>=3.8.1", @@ -83,7 +80,6 @@ optional-dependencies.testing = [ "hatchling>=1.25", "psutil>=6", - "pytest>=8.2.2", + "pytest>=8.3.2", - "pytest-cov>=5", "pytest-mock>=3.14", "pytest-xdist>=3.6.1", "re-assert>=1.1", -@@ -186,9 +182,6 @@ report.omit = [ +@@ -191,9 +187,6 @@ report.omit = [ "tests/type_check/*", ] run.parallel = true @@ -42,7 +42,7 @@ index 21bf402..5cd8470 100644 [tool.towncrier] name = "tox" diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index d734def..5e6df35 100644 +index 54503e3..e676ac1 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 @@ -80,13 +80,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 2c3d4fc..06ddd48 100644 +index 5b2b652..7657c2e 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py -@@ -98,21 +98,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 @@ -99,25 +99,26 @@ index 2c3d4fc..06ddd48 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: -@@ -161,7 +149,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}) -- -2.45.2 +2.46.2 diff --git a/python-tox.spec b/python-tox.spec index f519d46..ca3cb01 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.16.0 +Version: 4.20.0 Release: %autorelease Summary: Virtualenv-based automation of test activities diff --git a/sources b/sources index 3c6946b..a618d5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.16.0.tar.gz) = b3d65c5b4f086f1f0474d6cb08d3d4bcdf81735376a94e97997ab5dee5c726e71e8b9a1117eda59f9afd61be0bff38a9533faf16e76b78b504ff6de0f2ddfde0 +SHA512 (tox-4.20.0.tar.gz) = c4b9a03a62c7d1993a8b027cd2f8f22fc033fa802176f20b0daeda84d528c5e8618ae9781f04c3d8820d9f49c5786d56b96dd596e95e489ac372631d61425616 From 0351d13c2f445ea304431b0b3ab0757409ed9e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 1 Oct 2024 11:13:39 +0200 Subject: [PATCH 62/99] Update to 4.21.0 - Fixes: rhbz#2315830 --- fix-tests.patch | 18 +++++++++--------- python-tox.spec | 2 +- sources | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index c91d74c..32a5f3b 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From f427195a0e23346ed11b21bba5b22b291881a894 Mon Sep 17 00:00:00 2001 +From af734d392fa9fbb6fca3ea7c9fdbeff0297e89df Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,28 +10,28 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index d064329..e33c770 100644 +index 4f9836d..bae6776 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -73,9 +73,6 @@ optional-dependencies.docs = [ +@@ -74,9 +74,6 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ "build[virtualenv]>=1.2.2", - "covdefaults>=2.3", - "detect-test-pollution>=1.2", -- "devpi-process>=1", - "diff-cover>=9.1.1", +- "devpi-process>=1.0.2", + "diff-cover>=9.2", "distlib>=0.3.8", "flaky>=3.8.1", -@@ -83,7 +80,6 @@ optional-dependencies.testing = [ +@@ -84,7 +81,6 @@ optional-dependencies.testing = [ "hatchling>=1.25", "psutil>=6", - "pytest>=8.3.2", + "pytest>=8.3.3", - "pytest-cov>=5", "pytest-mock>=3.14", "pytest-xdist>=3.6.1", "re-assert>=1.1", -@@ -191,9 +187,6 @@ report.omit = [ +@@ -192,9 +188,6 @@ report.omit = [ "tests/type_check/*", ] run.parallel = true @@ -120,5 +120,5 @@ index 5b2b652..7657c2e 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.46.2 +2.46.0 diff --git a/python-tox.spec b/python-tox.spec index ca3cb01..fdad42b 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.20.0 +Version: 4.21.0 Release: %autorelease Summary: Virtualenv-based automation of test activities diff --git a/sources b/sources index a618d5e..d60edd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.20.0.tar.gz) = c4b9a03a62c7d1993a8b027cd2f8f22fc033fa802176f20b0daeda84d528c5e8618ae9781f04c3d8820d9f49c5786d56b96dd596e95e489ac372631d61425616 +SHA512 (tox-4.21.0.tar.gz) = e4a5d56ea2b2865a5a114cb77bf0e25d0504f9b652cf086d803170ba3ef46731a55ec0a4c591e562cd31b13d408d97618dcf21f60da28faf1d7ce6a955e1fc71 From 1cc6c4bdef58646d620bab7383ac0f3577af2117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 5 Oct 2024 21:28:05 +0200 Subject: [PATCH 63/99] Update to 4.21.2 - Fixes: rhbz#2316220 --- python-tox.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index fdad42b..e244aa1 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.21.0 +Version: 4.21.2 Release: %autorelease Summary: Virtualenv-based automation of test activities diff --git a/sources b/sources index d60edd4..3cb37a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.21.0.tar.gz) = e4a5d56ea2b2865a5a114cb77bf0e25d0504f9b652cf086d803170ba3ef46731a55ec0a4c591e562cd31b13d408d97618dcf21f60da28faf1d7ce6a955e1fc71 +SHA512 (tox-4.21.2.tar.gz) = a2a363ecaa88ac459e147471c1dca7152e21f77f38253b484a15fa908ea8b0e758761e8c2c475bb6bd374a636cb10004c7c2fb6c61fe3718b2b1c09569d0f08d From 9c36dcf721b12c746927e51f6b426f995e454f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 14 Oct 2024 14:38:26 +0200 Subject: [PATCH 64/99] Stop recommending Pythons not supported by the latest virtualenv Also, stop running the CI for them. This is meant for Fedora 42+ only. --- python-tox.spec | 7 ------- tests/tests.yml | 16 ---------------- 2 files changed, 23 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index e244aa1..7e70b2d 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -80,18 +80,11 @@ 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: python3.6 -Recommends: python3.7 Recommends: python3.8 Recommends: python3.9 Recommends: python3.10 -Recommends: pypy2-devel Recommends: pypy3-devel Recommends: python3-devel -%if 0%{?fedora} && 0%{?fedora} < 41 -Recommends: python2.7 -Recommends: python2-devel -%endif # 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/ diff --git a/tests/tests.yml b/tests/tests.yml index 7addf64..3cf38ef 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,15 +30,6 @@ - all_supplementing_pythons: dir: tests run: ./all_supplementing_pythons.py - - smoke27_optional: - dir: python/smoke - run: VERSION=2.7 INSTALL_OR_SKIP=true METHOD=virtualenv ./venv.sh - - smoke36: - dir: python/smoke - run: VERSION=3.6 ./venv.sh - - smoke37_optional: - dir: python/smoke - run: VERSION=3.7 INSTALL_OR_SKIP=true ./venv.sh - smoke38: dir: python/smoke run: VERSION=3.8 ./venv.sh @@ -57,12 +48,6 @@ - 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_optional: - dir: python/smoke - 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 @@ -81,7 +66,6 @@ required_packages: - gcc - virtualenv - - python3.6 - python3.8 - python3.9 - python3.10-devel From 6338097dbb03baed06705b4b3163b24c9105c523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 29 Oct 2024 17:35:56 +0100 Subject: [PATCH 65/99] Drop unneeded test dependency on diff-cover --- fix-tests.patch | 24 ++++++++++++------------ python-tox.spec | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index 32a5f3b..b901b9d 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,29 +1,29 @@ -From af734d392fa9fbb6fca3ea7c9fdbeff0297e89df Mon Sep 17 00:00:00 2001 +From 2c5dce5c027de2662d81944f1ba129d8a860b0a7 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests --- - pyproject.toml | 7 ------- + pyproject.toml | 8 -------- src/tox/pytest.py | 16 +++------------- tests/test_provision.py | 18 ++---------------- - 3 files changed, 5 insertions(+), 36 deletions(-) + 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 4f9836d..bae6776 100644 +index 50142c5..66f8b5a 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -74,9 +74,6 @@ optional-dependencies.docs = [ +@@ -74,17 +74,12 @@ optional-dependencies.docs = [ ] optional-dependencies.testing = [ "build[virtualenv]>=1.2.2", - "covdefaults>=2.3", - "detect-test-pollution>=1.2", - "devpi-process>=1.0.2", - "diff-cover>=9.2", +- "diff-cover>=9.2", "distlib>=0.3.8", "flaky>=3.8.1", -@@ -84,7 +81,6 @@ optional-dependencies.testing = [ + "hatch-vcs>=0.4", "hatchling>=1.25", "psutil>=6", "pytest>=8.3.3", @@ -31,7 +31,7 @@ index 4f9836d..bae6776 100644 "pytest-mock>=3.14", "pytest-xdist>=3.6.1", "re-assert>=1.1", -@@ -192,9 +188,6 @@ report.omit = [ +@@ -192,9 +187,6 @@ report.omit = [ "tests/type_check/*", ] run.parallel = true @@ -42,7 +42,7 @@ index 4f9836d..bae6776 100644 [tool.towncrier] name = "tox" diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index 54503e3..e676ac1 100644 +index 13072fd..80bf266 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 @@ -53,7 +53,7 @@ index 54503e3..e676ac1 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") @@ -66,7 +66,7 @@ index 54503e3..e676ac1 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)) @@ -120,5 +120,5 @@ index 5b2b652..7657c2e 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.46.0 +2.46.2 diff --git a/python-tox.spec b/python-tox.spec index 7e70b2d..d6a9671 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -98,7 +98,7 @@ 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\]|setuptools|flaky)>=.*/"\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/"(virtualenv)>=.*/"\1>=20",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ From 719b4b0f8478f508d201aa72ffbc7e2fea8513e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 29 Oct 2024 18:23:58 +0100 Subject: [PATCH 66/99] CI: Add Python 3.14 --- tests/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index 3cf38ef..d179969 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -48,6 +48,9 @@ - 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 @@ -72,6 +75,7 @@ - python3.11-devel - python3.12-devel - python3.13-devel + - python3.14-devel - pypy3.9-devel - pypy3.10-devel - python3-tox From 9a5726b90a85f5a8b8892923dba54bcf685cde31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Nov 2024 19:12:34 +0100 Subject: [PATCH 67/99] Update to 4.23.2 - Fixes: rhbz#2318843 --- fix-tests.patch | 32 ++++++++++++++++---------------- python-tox.spec | 7 ++++--- sources | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index b901b9d..332089a 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From 2c5dce5c027de2662d81944f1ba129d8a860b0a7 Mon Sep 17 00:00:00 2001 +From 1ade3df7eaefad792a2a519c0f3cc3a8f28a5829 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 Subject: [PATCH] fix tests @@ -10,12 +10,22 @@ Subject: [PATCH] fix tests 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 50142c5..66f8b5a 100644 +index 74219b1..6cd2da8 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -74,17 +74,12 @@ optional-dependencies.docs = [ +@@ -167,9 +167,6 @@ report.omit = [ + "tests/type_check/*", ] - optional-dependencies.testing = [ + 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", @@ -31,18 +41,8 @@ index 50142c5..66f8b5a 100644 "pytest-mock>=3.14", "pytest-xdist>=3.6.1", "re-assert>=1.1", -@@ -192,9 +187,6 @@ report.omit = [ - "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 13072fd..80bf266 100644 +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 @@ -120,5 +120,5 @@ index 5b2b652..7657c2e 100644 ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) -- -2.46.2 +2.47.0 diff --git a/python-tox.spec b/python-tox.spec index d6a9671..ca7ac85 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.21.2 +Version: 4.23.2 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -37,7 +37,8 @@ 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 @@ -106,7 +107,7 @@ sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|pyproject-api|pytest|pyte %generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" -%pyproject_buildrequires -r %{?with_tests:-x testing} +%pyproject_buildrequires -r %{?with_tests:-g test} %build diff --git a/sources b/sources index 3cb37a9..96691d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.21.2.tar.gz) = a2a363ecaa88ac459e147471c1dca7152e21f77f38253b484a15fa908ea8b0e758761e8c2c475bb6bd374a636cb10004c7c2fb6c61fe3718b2b1c09569d0f08d +SHA512 (tox-4.23.2.tar.gz) = 5008964ebed3c94a6ad5f0985150c7bf73fd3996b91171b16323d195bf0288102aac0dc38848bd4c63e5c5678ab1a82c170579139eda97132a4555eb11d381a0 From f85007ad88e7210b7555e407aa6c15530d94a119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 11 Nov 2024 17:58:44 +0100 Subject: [PATCH 68/99] CI: Test tox provision with end-of-life Python versions https://tox.wiki/en/4.23.0/faq.html#testing-end-of-life-python-versions [skip changelog] --- tests/tests.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index d179969..5822cbf 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,6 +30,12 @@ - all_supplementing_pythons: dir: tests run: ./all_supplementing_pythons.py + - smoke27_optional: + dir: python/smoke + 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 TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh - smoke38: dir: python/smoke run: VERSION=3.8 ./venv.sh @@ -69,6 +75,7 @@ required_packages: - gcc - virtualenv + - python3.6 - python3.8 - python3.9 - python3.10-devel From f7758c7fda99fa86a8af546ac0579162362e1cb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 20:12:58 +0000 Subject: [PATCH 69/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 374d223f0aad7301485926c8425e1ffa27b85209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 29 Jan 2025 16:18:26 +0100 Subject: [PATCH 70/99] Conditionalize the Recommended Python versions based on Fedora version See https://fedoraproject.org/wiki/Changes/RetirePython3.8 Eventually, we will get rid of this section and only use Supplements. Also update the CI config to make 3.8 optional. [skip changelog] --- python-tox.spec | 4 ++++ tests/tests.yml | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index ca7ac85..4f35d51 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -81,10 +81,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.) +%if 0%{?fedora} +%if 0%{?fedora} < 42 Recommends: python3.8 +%endif Recommends: python3.9 Recommends: python3.10 Recommends: pypy3-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/ diff --git a/tests/tests.yml b/tests/tests.yml index 5822cbf..c655dda 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -36,9 +36,9 @@ - smoke36: dir: python/smoke run: VERSION=3.6 TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh - - smoke38: + - smoke38_optional: dir: python/smoke - run: VERSION=3.8 ./venv.sh + run: VERSION=3.8 INSTALL_OR_SKIP=true ./venv.sh - smoke39: dir: python/smoke run: VERSION=3.9 ./venv.sh @@ -76,7 +76,6 @@ - gcc - virtualenv - python3.6 - - python3.8 - python3.9 - python3.10-devel - python3.11-devel From 0c1e618f44afc6bf41a7729ecfc80b5d1a9e71f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 29 Jan 2025 16:16:10 +0100 Subject: [PATCH 71/99] Update to 4.24.1 - Fixes: rhbz#2339185 --- fix-tests.patch | 99 ++++++++++++++++++++++++++++++++++--------------- python-tox.spec | 3 +- sources | 2 +- 3 files changed, 73 insertions(+), 31 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index 332089a..7dd7a1f 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,19 +1,48 @@ -From 1ade3df7eaefad792a2a519c0f3cc3a8f28a5829 Mon Sep 17 00:00:00 2001 +From 156ff454c8df051b2cb3a6b5283810c51c1d5853 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +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: Miro Hrončok --- - pyproject.toml | 8 -------- - src/tox/pytest.py | 16 +++------------- - tests/test_provision.py | 18 ++---------------- - 3 files changed, 5 insertions(+), 37 deletions(-) + pyproject.toml | 11 +---------- + src/tox/pytest.py | 16 +++------------- + tests/test_provision.py | 18 ++---------------- + .../package/test_python_package_util.py | 10 ++++++++-- + 4 files changed, 14 insertions(+), 41 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 74219b1..6cd2da8 100644 +index 16f2e44..156d1af 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -167,9 +167,6 @@ report.omit = [ +@@ -82,22 +82,16 @@ dev = [ + ] + test = [ + "build[virtualenv]>=1.2.2.post1", +- "covdefaults>=2.3", +- "detect-test-pollution>=1.2", +- "devpi-process>=1.0.2", +- "diff-cover>=9.2", + "distlib>=0.3.9", + "flaky>=3.8.1", + "hatch-vcs>=0.4", + "hatchling>=1.26.3", + "psutil>=6.1", + "pytest>=8.3.3", +- "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.1", + "time-machine>=2.15; implementation_name!='pypy'", + "wheel>=0.45", + ] +@@ -223,9 +217,6 @@ report.omit = [ "tests/type_check/*", ] run.parallel = true @@ -23,26 +52,8 @@ index 74219b1..6cd2da8 100644 [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 +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 @@ -83,7 +94,7 @@ index ca42a5b..183e2f4 100644 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 +index 2030cb9..f706d6c 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] @@ -119,6 +130,36 @@ index 5b2b652..7657c2e 100644 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.47.0 +2.47.1 diff --git a/python-tox.spec b/python-tox.spec index 4f35d51..a59d8cf 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.23.2 +Version: 4.24.1 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -32,6 +32,7 @@ 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 diff --git a/sources b/sources index 96691d9..0d42bbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.23.2.tar.gz) = 5008964ebed3c94a6ad5f0985150c7bf73fd3996b91171b16323d195bf0288102aac0dc38848bd4c63e5c5678ab1a82c170579139eda97132a4555eb11d381a0 +SHA512 (tox-4.24.1.tar.gz) = 8d7a3cd9c6140463dd2d2e1df7845c676f750ca23c0a9d528ee4fc7923bcadea94cfc0e7a1d70bd436d867be5f2edddd1576569777f2c15a0e11768cd932b6dd From 07d47763fe60b75d2f8ac2d81d59a8f3c8e9f782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 18 Mar 2025 13:02:59 +0100 Subject: [PATCH 72/99] Python 3.14.0a6+ test fix - Fixes: rhbz#2353145 --- 3500.patch | 37 +++++++++++++++++++++++++++++++++++++ python-tox.spec | 3 +++ 2 files changed, 40 insertions(+) create mode 100644 3500.patch diff --git a/3500.patch b/3500.patch new file mode 100644 index 0000000..d22abc7 --- /dev/null +++ b/3500.patch @@ -0,0 +1,37 @@ +From e35abbef48a4cda2e376a7ff668961378f3c86cb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Tue, 18 Mar 2025 12:54:57 +0100 +Subject: [PATCH] Tests: Adjust expected exception message for Python 3.14.0a6 + + E AssertionError: Regex pattern did not match. + E Regex: '3 cannot cast to typing.Union\\[str, int\\]' + E Input: '3 cannot cast to str | int' + +Change caused likely by https://github.com/python/cpython/commit/dc6d66f44c0a25b69dfec7e4ffc4a6fa5e4feada +--- + docs/changelog/3500.bugfix.rst | 2 ++ + tests/config/loader/test_str_convert.py | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + create mode 100644 docs/changelog/3500.bugfix.rst + +diff --git a/docs/changelog/3500.bugfix.rst b/docs/changelog/3500.bugfix.rst +new file mode 100644 +index 000000000..9df1cf05d +--- /dev/null ++++ b/docs/changelog/3500.bugfix.rst +@@ -0,0 +1,2 @@ ++Make tox tests pass with Python 3.14.0a6 ++- by :user:`hroncok` +diff --git a/tests/config/loader/test_str_convert.py b/tests/config/loader/test_str_convert.py +index 8540e2105..b06929f48 100644 +--- a/tests/config/loader/test_str_convert.py ++++ b/tests/config/loader/test_str_convert.py +@@ -77,7 +77,7 @@ def test_str_convert_ok_py39(raw: str, value: Any, of_type: type[Any]) -> None: + [ + ("a", TypeVar, TypeError, r"a cannot cast to .*typing.TypeVar.*"), + ("3", Literal["1", "2"], ValueError, r"3 must be one of \('1', '2'\)"), +- ("3", Union[str, int], TypeError, r"3 cannot cast to typing.Union\[str, int\]"), ++ ("3", Union[str, int], TypeError, r"3 cannot cast to (typing.Union\[str, int\]|str \| int)"), + ("", Command, ValueError, r"attempting to parse '' into a command failed"), + ], + ) diff --git a/python-tox.spec b/python-tox.spec index a59d8cf..9954204 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -35,6 +35,9 @@ Source: %{pypi_source tox} # Adjust setuptools-version specific ifs to check for setuptools version rather than Python version. Patch: fix-tests.patch +# Python 3.14.0a6+ test fix +Patch: https://github.com/tox-dev/tox/pull/3500.patch + BuildArch: noarch BuildRequires: python3-devel From 0464e297ad0f80dff54322474e5df175b61c376d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 28 Mar 2025 10:10:35 +0100 Subject: [PATCH 73/99] Update to 4.25.0 Fixes: rhbz#2350693 --- 3500.patch | 37 ------------------------------------- fix-tests.patch | 23 ++++++++++++----------- python-tox.spec | 5 +---- sources | 2 +- 4 files changed, 14 insertions(+), 53 deletions(-) delete mode 100644 3500.patch diff --git a/3500.patch b/3500.patch deleted file mode 100644 index d22abc7..0000000 --- a/3500.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e35abbef48a4cda2e376a7ff668961378f3c86cb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 18 Mar 2025 12:54:57 +0100 -Subject: [PATCH] Tests: Adjust expected exception message for Python 3.14.0a6 - - E AssertionError: Regex pattern did not match. - E Regex: '3 cannot cast to typing.Union\\[str, int\\]' - E Input: '3 cannot cast to str | int' - -Change caused likely by https://github.com/python/cpython/commit/dc6d66f44c0a25b69dfec7e4ffc4a6fa5e4feada ---- - docs/changelog/3500.bugfix.rst | 2 ++ - tests/config/loader/test_str_convert.py | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - create mode 100644 docs/changelog/3500.bugfix.rst - -diff --git a/docs/changelog/3500.bugfix.rst b/docs/changelog/3500.bugfix.rst -new file mode 100644 -index 000000000..9df1cf05d ---- /dev/null -+++ b/docs/changelog/3500.bugfix.rst -@@ -0,0 +1,2 @@ -+Make tox tests pass with Python 3.14.0a6 -+- by :user:`hroncok` -diff --git a/tests/config/loader/test_str_convert.py b/tests/config/loader/test_str_convert.py -index 8540e2105..b06929f48 100644 ---- a/tests/config/loader/test_str_convert.py -+++ b/tests/config/loader/test_str_convert.py -@@ -77,7 +77,7 @@ def test_str_convert_ok_py39(raw: str, value: Any, of_type: type[Any]) -> None: - [ - ("a", TypeVar, TypeError, r"a cannot cast to .*typing.TypeVar.*"), - ("3", Literal["1", "2"], ValueError, r"3 must be one of \('1', '2'\)"), -- ("3", Union[str, int], TypeError, r"3 cannot cast to typing.Union\[str, int\]"), -+ ("3", Union[str, int], TypeError, r"3 cannot cast to (typing.Union\[str, int\]|str \| int)"), - ("", Command, ValueError, r"attempting to parse '' into a command failed"), - ], - ) diff --git a/fix-tests.patch b/fix-tests.patch index 7dd7a1f..a6e5f9b 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,11 +1,12 @@ -From 156ff454c8df051b2cb3a6b5283810c51c1d5853 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -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?= +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 Co-Authored-By: Miro Hrončok --- pyproject.toml | 11 +---------- @@ -15,7 +16,7 @@ Co-Authored-By: Miro Hrončok 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 diff --git a/python-tox.spec b/python-tox.spec index 9954204..4dc498f 100644 --- a/python-tox.spec +++ b/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 @@ -35,9 +35,6 @@ Source: %{pypi_source tox} # Adjust setuptools-version specific ifs to check for setuptools version rather than Python version. Patch: fix-tests.patch -# Python 3.14.0a6+ test fix -Patch: https://github.com/tox-dev/tox/pull/3500.patch - BuildArch: noarch BuildRequires: python3-devel diff --git a/sources b/sources index 0d42bbf..513ea2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.24.1.tar.gz) = 8d7a3cd9c6140463dd2d2e1df7845c676f750ca23c0a9d528ee4fc7923bcadea94cfc0e7a1d70bd436d867be5f2edddd1576569777f2c15a0e11768cd932b6dd +SHA512 (tox-4.25.0.tar.gz) = 3560b667af03ca41c1bd8fa9eaa90f8c988b7f946498f3bc2d0a4dfa3a481d8ada27acb6201bde284a2bcfe14b86ee409a3ce8e875531423862d1af88e6248fb From eeb73bfe136832c5f5f565fd4f87a40cc62ed819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 28 Mar 2025 11:42:02 +0100 Subject: [PATCH 74/99] CI: Test with pypy3.11, make pypy3.9 optional, as it was retired on Fedora 42+ --- tests/tests.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index c655dda..4ecedf5 100644 --- a/tests/tests.yml +++ b/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 From 453dfdb9aa57ab4fd8f97b87ce594c3750c63e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Mar 2025 14:21:15 +0100 Subject: [PATCH 75/99] CI: Make the tests pass on EPEL 10, install or skip missing Pythons [skip changelog] --- tests/tests.yml | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 4ecedf5..0244e53 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,42 +30,42 @@ - all_supplementing_pythons: dir: tests run: ./all_supplementing_pythons.py - - smoke27_optional: + - smoke27: dir: python/smoke 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 TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh - - smoke38_optional: + run: VERSION=3.6 INSTALL_OR_SKIP=true TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh + - smoke38: dir: python/smoke run: VERSION=3.8 INSTALL_OR_SKIP=true ./venv.sh - smoke39: dir: python/smoke - run: VERSION=3.9 ./venv.sh + run: VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh - smoke310: dir: python/smoke - run: VERSION=3.10 ./venv.sh + run: VERSION=3.10 INSTALL_OR_SKIP=true ./venv.sh - smoke311: dir: python/smoke - run: VERSION=3.11 ./venv.sh + run: VERSION=3.11 INSTALL_OR_SKIP=true ./venv.sh - smoke312: dir: python/smoke run: VERSION=3.12 ./venv.sh - smoke313: dir: python/smoke - run: VERSION=3.13 ./venv.sh + run: VERSION=3.13 INSTALL_OR_SKIP=true ./venv.sh - smoke314: dir: python/smoke - run: VERSION=3.14 ./venv.sh - - smoke_pypy39_optional: + run: VERSION=3.14 INSTALL_OR_SKIP=true ./venv.sh + - smoke_pypy39: dir: python/smoke 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 + run: PYTHON=pypy3.10 VERSION=3.10 INSTALL_OR_SKIP=true ./venv.sh - smoke_pypy311: dir: python/smoke - run: PYTHON=pypy3.11 VERSION=3.11 ./venv.sh + run: PYTHON=pypy3.11 VERSION=3.11 INSTALL_OR_SKIP=true ./venv.sh - pyproject_pytest: dir: pyproject-rpm-macros/tests run: ./mocktest.sh python-pytest @@ -78,15 +78,8 @@ required_packages: - gcc - virtualenv - - python3.6 - - python3.9 - - python3.10-devel - - python3.11-devel + - python3-devel - python3.12-devel - - python3.13-devel - - python3.14-devel - - pypy3.10-devel - - pypy3.11-devel - python3-tox - python3-dnf - mock From 104f6b73e2b0c733b7c0eb808001ac9555079f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Mar 2025 17:01:26 +0100 Subject: [PATCH 76/99] Setup rpmlint filters [skip changelog] --- rpmlint.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 rpmlint.toml diff --git a/rpmlint.toml b/rpmlint.toml new file mode 100644 index 0000000..7b84503 --- /dev/null +++ b/rpmlint.toml @@ -0,0 +1,3 @@ +Filters = [ + 'spelling-error .* en_US [Vv]irtualenv ', +] From 17cf20500b3cc37824c14906ac8616292e31de3f Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 12 May 2025 18:03:59 +0200 Subject: [PATCH 77/99] Support Python 3.14.0b1 --- 3524.patch | 40 ++++++++++++++++++++++++++++++++++++++++ python-tox.spec | 3 +++ 2 files changed, 43 insertions(+) create mode 100644 3524.patch diff --git a/3524.patch b/3524.patch new file mode 100644 index 0000000..48046a4 --- /dev/null +++ b/3524.patch @@ -0,0 +1,40 @@ +From 3c5d56bf8bb8405d0eceef912ba4cad7d077448c Mon Sep 17 00:00:00 2001 +From: Florian Bruhin +Date: Thu, 8 May 2025 10:47:22 +0200 +Subject: [PATCH] Fix custom HelpFormatter for Python 3.14 + +https://github.com/python/cpython/pull/132323 passes prefix_chars= +(and other arguments) to the formatter_class, but the custom HelpFormatter only +accepted prog=. + +Accept any keyword arguments and pass them on to the parent class. + +Fixes #3523 +--- + docs/changelog/3523.bugfix.rst | 1 + + src/tox/config/cli/parser.py | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 docs/changelog/3523.bugfix.rst + +diff --git a/docs/changelog/3523.bugfix.rst b/docs/changelog/3523.bugfix.rst +new file mode 100644 +index 000000000..3052d877e +--- /dev/null ++++ b/docs/changelog/3523.bugfix.rst +@@ -0,0 +1 @@ ++Fix ``TypeError`` for ``HelpFormatter`` with Python 3.14 +diff --git a/src/tox/config/cli/parser.py b/src/tox/config/cli/parser.py +index 87629ae49..904ff7aad 100644 +--- a/src/tox/config/cli/parser.py ++++ b/src/tox/config/cli/parser.py +@@ -95,8 +95,8 @@ def parse_args( # type: ignore[override] # avoid defining all overloads + class HelpFormatter(ArgumentDefaultsHelpFormatter): + """A help formatter that provides the default value and the source it comes from.""" + +- def __init__(self, prog: str) -> None: +- super().__init__(prog, max_help_position=30, width=240) ++ def __init__(self, prog: str, **kwargs: Any) -> None: ++ super().__init__(prog, max_help_position=30, width=240, **kwargs) + + def _get_help_string(self, action: Action) -> str | None: + text: str = super()._get_help_string(action) or "" diff --git a/python-tox.spec b/python-tox.spec index 4dc498f..41c73e7 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -28,6 +28,9 @@ License: MIT URL: https://tox.readthedocs.io/ Source: %{pypi_source tox} +# Support Python 3.14.0b1 +Patch: https://github.com/tox-dev/tox/pull/3524.patch + # Remove dependency on devpi-process. # Remove dependency on detect-test-pollution. # Remove coverage-related dependencies. From 6b3221eebd45c4bf36e1c49b3b98a2be7832c114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 May 2025 18:27:24 +0200 Subject: [PATCH 78/99] Fix tests with virtualenv 20.31+ --- 3528.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ fix-tests.patch | 19 +++++++------- python-tox.spec | 9 +++++++ 3 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 3528.patch diff --git a/3528.patch b/3528.patch new file mode 100644 index 0000000..cbd5904 --- /dev/null +++ b/3528.patch @@ -0,0 +1,66 @@ +From 32a00aae6fe9d43d8fc5c6e85ce691e1ebfb5323 Mon Sep 17 00:00:00 2001 +From: Robsdedude +Date: Sun, 11 May 2025 22:13:38 +0200 +Subject: [PATCH 1/2] Fix using deprecated virtualenv option `--wheel` + +--- + pyproject.toml | 2 +- + src/tox/pytest.py | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 9c1116c23..9b52c2f36 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -60,7 +60,7 @@ dependencies = [ + "pyproject-api>=1.8", + "tomli>=2.2.1; python_version<'3.11'", + "typing-extensions>=4.12.2; python_version<'3.11'", +- "virtualenv>=20.29.1", ++ "virtualenv>=20.31", + ] + optional-dependencies.test = [ + "devpi-process>=1.0.2", +diff --git a/src/tox/pytest.py b/src/tox/pytest.py +index 72f410bf5..bca2ad848 100644 +--- a/src/tox/pytest.py ++++ b/src/tox/pytest.py +@@ -281,7 +281,8 @@ def our_setup_state(value: Sequence[str]) -> State: + m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1") + m.setenv("VIRTUALENV_SYMLINKS", "1") + m.setenv("VIRTUALENV_PIP", "embed") +- m.setenv("VIRTUALENV_WHEEL", "embed") ++ if sys.version_info[:2] < (3, 9): ++ m.setenv("VIRTUALENV_WHEEL", "embed") + m.setenv("VIRTUALENV_SETUPTOOLS", "embed") + try: + tox_run(args) + +From 4d68d2af93aae8208c79b55ff0dfacd4b78a1866 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= +Date: Mon, 12 May 2025 09:39:48 -0700 +Subject: [PATCH 2/2] Fix test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Bernát Gábor +--- + tests/session/cmd/test_sequential.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/session/cmd/test_sequential.py b/tests/session/cmd/test_sequential.py +index 1f4a24624..87771be03 100644 +--- a/tests/session/cmd/test_sequential.py ++++ b/tests/session/cmd/test_sequential.py +@@ -114,7 +114,9 @@ def test_result_json_sequential( + py_test = get_cmd_exit_run_id(log_report, "py", "test") + assert py_test == [(1, "commands[0]"), (0, "commands[1]")] + packaging_installed = log_report["testenvs"]["py"].pop("installed_packages") +- expected_pkg = {"pip", "setuptools", "wheel", "a"} ++ expected_pkg = {"pip", "setuptools", "a"} ++ if sys.version_info[0:2] == (3, 8): ++ expected_pkg.add("wheel") + assert {i[: i.find("==")] if "@" not in i else "a" for i in packaging_installed} == expected_pkg + install_package = log_report["testenvs"]["py"].pop("installpkg") + assert re.match(r"^[a-fA-F0-9]{64}$", install_package.pop("sha256")) diff --git a/fix-tests.patch b/fix-tests.patch index a6e5f9b..d76215f 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From b8024813cb3e477a4ada44c5835e9f62ecda79bd Mon Sep 17 00:00:00 2001 +From 924b03e0446561bbfca9679a44642a1a96dd8f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 28 Mar 2025 09:44:24 +0100 Subject: [PATCH] Fix tests @@ -16,7 +16,7 @@ Co-Authored-By: Miro Hrončok 4 files changed, 14 insertions(+), 41 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 9c1116c..e499874 100644 +index 9b52c2f..335012b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -82,22 +82,16 @@ dev = [ @@ -54,7 +54,7 @@ index 9c1116c..e499874 100644 [tool.towncrier] name = "tox" diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index 72f410b..48cf9bc 100644 +index bca2ad8..973e714 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 @@ -65,20 +65,21 @@ index 72f410b..48cf9bc 100644 from virtualenv.info import fs_supports_symlink import tox.run -@@ -280,9 +279,9 @@ class ToxProject: +@@ -280,10 +279,10 @@ 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") + if sys.version_info[:2] < (3, 9): +- m.setenv("VIRTUALENV_WHEEL", "embed") +- m.setenv("VIRTUALENV_SETUPTOOLS", "embed") ++ 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 +@@ -476,15 +475,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None monkeypatch.setenv("PIP_TIMEOUT", str(2)) @@ -162,5 +163,5 @@ index efb5b12..8a57426 100644 for left, right in zip_longest(result, exp): assert isinstance(right, Requirement) -- -2.48.1 +2.49.0 diff --git a/python-tox.spec b/python-tox.spec index 41c73e7..fe30974 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -31,6 +31,9 @@ Source: %{pypi_source tox} # Support Python 3.14.0b1 Patch: https://github.com/tox-dev/tox/pull/3524.patch +# Fix using deprecated virtualenv option --wheel +Patch: https://github.com/tox-dev/tox/pull/3528.patch + # Remove dependency on devpi-process. # Remove dependency on detect-test-pollution. # Remove coverage-related dependencies. @@ -130,6 +133,12 @@ export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" %if %{with tests} %check +# Upstream requires virtualenv >= 20.31 for tests, and no longer sets VIRTUALENV_WHEEL. +# To support environments with older virtualenv, we set it manually: +%if v"%(%{python3} -c 'import importlib.metadata as im; print(im.version("virtualenv"))' 2>/dev/null || echo 0)" < v"20.31" +export VIRTUALENV_WHEEL=bundle +%endif + # Skipped tests use internal virtualenv functionality to # download wheels which does not work with "bundled" version of wheel in # the Fedora's virtualenv patch. From 2d52eab0d1a7155fa5e3a013067812bcd4a90f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 May 2025 23:41:12 +0200 Subject: [PATCH 79/99] Run more tests with setuptools 70.1+ But keep test_result_json_sequential skipped with bundled wheel. [skip changelog] --- python-tox.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index fe30974..ce6f68e 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -152,11 +152,16 @@ 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 +# The tests fail with setuptools < 70.1 +%if v"%(%{python3} -c 'import importlib.metadata as im; print(im.version("setuptools"))' 2>/dev/null || echo 0)" < v"70.1" 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" +%else +# this test fails with virtualenv < 20.31 with bundled wheel +test -z $VIRTUALENV_WHEEL || k="${k-}${k+ and }not test_result_json_sequential" +%endif # The following tests either need internet connection or installed tox # so we only run them on the CI. From afb013056bc6e48ff2fa79d81f31269c0e8e4a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 May 2025 23:41:58 +0200 Subject: [PATCH 80/99] Don't skip some tests twice We already skip those regardless of %bcond ci_tests. [skip changelog] --- python-tox.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index ce6f68e..573a503 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -166,9 +166,6 @@ test -z $VIRTUALENV_WHEEL || k="${k-}${k+ and }not test_result_json_sequential" # 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" From fa857a331849276def97482f3b15085a0ae6dc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 13 May 2025 19:41:15 +0200 Subject: [PATCH 81/99] Without wheel, test_result_json_sequential fetches it from the internet [skip changelog] --- python-tox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-tox.spec b/python-tox.spec index 573a503..d6d9854 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -171,6 +171,7 @@ 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" +test -z $VIRTUALENV_WHEEL && k="${k-}${k+ and }not test_result_json_sequential" %endif %pytest -v -n auto -k "${k-}" --run-integration From 62ab817d289f766d18b5ad93de9b9856c3273aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 13 May 2025 19:40:53 +0200 Subject: [PATCH 82/99] Update to 4.26.0 - Requires virtualenv 20.29+ - Supports freethreading Python - Fixes: rhbz#2365939 This drops support for Python 3.8. I don't know if that means running 3.8 venvs, or just running on 3.8, but I dropped all the 3.8 bits, as this update is targeted to Fedora 42+ only anyway. --- 3524.patch | 40 ------------------------------ 3528.patch | 66 ------------------------------------------------- python-tox.spec | 13 ++-------- sources | 2 +- tests/tests.yml | 9 ++++--- 5 files changed, 9 insertions(+), 121 deletions(-) delete mode 100644 3524.patch delete mode 100644 3528.patch diff --git a/3524.patch b/3524.patch deleted file mode 100644 index 48046a4..0000000 --- a/3524.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3c5d56bf8bb8405d0eceef912ba4cad7d077448c Mon Sep 17 00:00:00 2001 -From: Florian Bruhin -Date: Thu, 8 May 2025 10:47:22 +0200 -Subject: [PATCH] Fix custom HelpFormatter for Python 3.14 - -https://github.com/python/cpython/pull/132323 passes prefix_chars= -(and other arguments) to the formatter_class, but the custom HelpFormatter only -accepted prog=. - -Accept any keyword arguments and pass them on to the parent class. - -Fixes #3523 ---- - docs/changelog/3523.bugfix.rst | 1 + - src/tox/config/cli/parser.py | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - create mode 100644 docs/changelog/3523.bugfix.rst - -diff --git a/docs/changelog/3523.bugfix.rst b/docs/changelog/3523.bugfix.rst -new file mode 100644 -index 000000000..3052d877e ---- /dev/null -+++ b/docs/changelog/3523.bugfix.rst -@@ -0,0 +1 @@ -+Fix ``TypeError`` for ``HelpFormatter`` with Python 3.14 -diff --git a/src/tox/config/cli/parser.py b/src/tox/config/cli/parser.py -index 87629ae49..904ff7aad 100644 ---- a/src/tox/config/cli/parser.py -+++ b/src/tox/config/cli/parser.py -@@ -95,8 +95,8 @@ def parse_args( # type: ignore[override] # avoid defining all overloads - class HelpFormatter(ArgumentDefaultsHelpFormatter): - """A help formatter that provides the default value and the source it comes from.""" - -- def __init__(self, prog: str) -> None: -- super().__init__(prog, max_help_position=30, width=240) -+ def __init__(self, prog: str, **kwargs: Any) -> None: -+ super().__init__(prog, max_help_position=30, width=240, **kwargs) - - def _get_help_string(self, action: Action) -> str | None: - text: str = super()._get_help_string(action) or "" diff --git a/3528.patch b/3528.patch deleted file mode 100644 index cbd5904..0000000 --- a/3528.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 32a00aae6fe9d43d8fc5c6e85ce691e1ebfb5323 Mon Sep 17 00:00:00 2001 -From: Robsdedude -Date: Sun, 11 May 2025 22:13:38 +0200 -Subject: [PATCH 1/2] Fix using deprecated virtualenv option `--wheel` - ---- - pyproject.toml | 2 +- - src/tox/pytest.py | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 9c1116c23..9b52c2f36 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -60,7 +60,7 @@ dependencies = [ - "pyproject-api>=1.8", - "tomli>=2.2.1; python_version<'3.11'", - "typing-extensions>=4.12.2; python_version<'3.11'", -- "virtualenv>=20.29.1", -+ "virtualenv>=20.31", - ] - optional-dependencies.test = [ - "devpi-process>=1.0.2", -diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index 72f410bf5..bca2ad848 100644 ---- a/src/tox/pytest.py -+++ b/src/tox/pytest.py -@@ -281,7 +281,8 @@ def our_setup_state(value: Sequence[str]) -> State: - m.setenv("VIRTUALENV_SYMLINK_APP_DATA", "1") - m.setenv("VIRTUALENV_SYMLINKS", "1") - m.setenv("VIRTUALENV_PIP", "embed") -- m.setenv("VIRTUALENV_WHEEL", "embed") -+ if sys.version_info[:2] < (3, 9): -+ m.setenv("VIRTUALENV_WHEEL", "embed") - m.setenv("VIRTUALENV_SETUPTOOLS", "embed") - try: - tox_run(args) - -From 4d68d2af93aae8208c79b55ff0dfacd4b78a1866 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= -Date: Mon, 12 May 2025 09:39:48 -0700 -Subject: [PATCH 2/2] Fix test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Bernát Gábor ---- - tests/session/cmd/test_sequential.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/session/cmd/test_sequential.py b/tests/session/cmd/test_sequential.py -index 1f4a24624..87771be03 100644 ---- a/tests/session/cmd/test_sequential.py -+++ b/tests/session/cmd/test_sequential.py -@@ -114,7 +114,9 @@ def test_result_json_sequential( - py_test = get_cmd_exit_run_id(log_report, "py", "test") - assert py_test == [(1, "commands[0]"), (0, "commands[1]")] - packaging_installed = log_report["testenvs"]["py"].pop("installed_packages") -- expected_pkg = {"pip", "setuptools", "wheel", "a"} -+ expected_pkg = {"pip", "setuptools", "a"} -+ if sys.version_info[0:2] == (3, 8): -+ expected_pkg.add("wheel") - assert {i[: i.find("==")] if "@" not in i else "a" for i in packaging_installed} == expected_pkg - install_package = log_report["testenvs"]["py"].pop("installpkg") - assert re.match(r"^[a-fA-F0-9]{64}$", install_package.pop("sha256")) diff --git a/python-tox.spec b/python-tox.spec index d6d9854..022afbc 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.25.0 +Version: 4.26.0 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -28,12 +28,6 @@ License: MIT URL: https://tox.readthedocs.io/ Source: %{pypi_source tox} -# Support Python 3.14.0b1 -Patch: https://github.com/tox-dev/tox/pull/3524.patch - -# Fix using deprecated virtualenv option --wheel -Patch: https://github.com/tox-dev/tox/pull/3528.patch - # Remove dependency on devpi-process. # Remove dependency on detect-test-pollution. # Remove coverage-related dependencies. @@ -89,9 +83,6 @@ Summary: %{summary} # It recommends all Python versions it supports. (This is an exception to # the rule that Fedora packages may not require the alternative interpreters.) %if 0%{?fedora} -%if 0%{?fedora} < 42 -Recommends: python3.8 -%endif Recommends: python3.9 Recommends: python3.10 Recommends: pypy3-devel @@ -112,7 +103,7 @@ Recommends: python3-devel # 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/"(virtualenv)>=.*/"\1>=20.29",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ pyproject.toml diff --git a/sources b/sources index 513ea2c..9428218 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.25.0.tar.gz) = 3560b667af03ca41c1bd8fa9eaa90f8c988b7f946498f3bc2d0a4dfa3a481d8ada27acb6201bde284a2bcfe14b86ee409a3ce8e875531423862d1af88e6248fb +SHA512 (tox-4.26.0.tar.gz) = ad2e311cd63c45a079b8c230a2feb364270b7a8bcf44b626385f8e442c6683ae841b3f34417b504f927608685a254fef3767d832fb5cfcc324c9cbf6ff7ea997 diff --git a/tests/tests.yml b/tests/tests.yml index 0244e53..d9f74a1 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -36,9 +36,6 @@ - smoke36: dir: python/smoke run: VERSION=3.6 INSTALL_OR_SKIP=true TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh - - smoke38: - dir: python/smoke - run: VERSION=3.8 INSTALL_OR_SKIP=true ./venv.sh - smoke39: dir: python/smoke run: VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh @@ -54,9 +51,15 @@ - smoke313: dir: python/smoke run: VERSION=3.13 INSTALL_OR_SKIP=true ./venv.sh + - smoke313t: + dir: python/smoke + run: VERSION=3.13t INSTALL_OR_SKIP=true ./venv.sh - smoke314: dir: python/smoke run: VERSION=3.14 INSTALL_OR_SKIP=true ./venv.sh + - smoke314t: + dir: python/smoke + run: VERSION=3.14t INSTALL_OR_SKIP=true ./venv.sh - smoke_pypy39: dir: python/smoke run: PYTHON=pypy3.9 VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh From 873d91a17303014a11e3af2b74b728711fffab44 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 00:40:09 +0200 Subject: [PATCH 83/99] Bootstrap for Python 3.14 --- python-tox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-tox.spec b/python-tox.spec index 022afbc..c7c3db9 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %bcond bootstrap 0 # Many tests are enabled by default, unless bootstrapping %bcond tests %{without bootstrap} From 728b50e0590de0d1cefbd85e123b6af361a45349 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 18:22:04 +0200 Subject: [PATCH 84/99] Rebuilt for Python 3.14 --- python-tox.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-tox.spec b/python-tox.spec index c7c3db9..022afbc 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %bcond bootstrap 0 # Many tests are enabled by default, unless bootstrapping %bcond tests %{without bootstrap} From 36ce30e49c54e6c6dd791bdcd4b6a4cd97b7378b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 10:49:59 +0000 Subject: [PATCH 85/99] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 49e309bd9199feb9bc18f73572f22c91ea5b829e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:02:28 +0200 Subject: [PATCH 86/99] Rebuilt for Python 3.14.0rc2 bytecode From 1a0b1cd795cf291c7c2b393318cc93226581b3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Mon, 28 Jul 2025 16:57:07 +0200 Subject: [PATCH 87/99] Drop STI and use tmt instead Resolve: rhbz#2383050 --- .fmf/version | 1 + plan.fmf | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/tests.yml | 91 ---------------------------------------------- 3 files changed, 98 insertions(+), 91 deletions(-) create mode 100644 .fmf/version create mode 100644 plan.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..827567e --- /dev/null +++ b/plan.fmf @@ -0,0 +1,97 @@ +execute: + how: tmt + +discover: + - name: rpms_pyproject-rpm-macros + how: shell + url: https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git + tests: + - name: pyproject_pytest + path: /tests + test: ./mocktest.sh python-pytest + - name: pyproject_pluggy + path: /tests + test: ./mocktest.sh python-pluggy + - name: pyproject_openqa_client + path: /tests + test: ./mocktest.sh python-openqa_client + - name: same_repo + how: shell + dist-git-source: true + dist-git-download-only: true + tests: + - name: all_supplementing_pythons + path: /tests + test: ./all_supplementing_pythons.py + - name: mock_with_tests + # Needs cwd to contain downloaded sources, path to mocktes.sh depends on tmt tree structure + test: | + cd $TMT_SOURCE_DIR && + $TMT_TREE/../discover/rpms_pyproject-rpm-macros/tests/tests/mocktest.sh python-tox --enable-network --with ci_tests + - name: tests_python + how: shell + url: https://src.fedoraproject.org/tests/python.git + tests: + - name: smoke27 + path: /smoke + test: VERSION=2.7 INSTALL_OR_SKIP=true METHOD=virtualenv TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh + - name: smoke36 + path: /smoke + test: VERSION=3.6 INSTALL_OR_SKIP=true TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh + - name: smoke39 + path: /smoke + test: VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke310 + path: /smoke + test: VERSION=3.10 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke311 + path: /smoke + test: VERSION=3.11 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke312 + path: /smoke + test: VERSION=3.12 ./venv.sh + - name: smoke313 + path: /smoke + test: VERSION=3.13 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke313t + path: /smoke + test: VERSION=3.13t INSTALL_OR_SKIP=true ./venv.sh + - name: smoke314 + path: /smoke + test: VERSION=3.14 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke314t + path: /smoke + test: VERSION=3.14t INSTALL_OR_SKIP=true ./venv.sh + - name: smoke_pypy39 + path: /smoke + test: PYTHON=pypy3.9 VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke_pypy310 + path: /smoke + test: PYTHON=pypy3.10 VERSION=3.10 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke_pypy311 + path: /smoke + test: PYTHON=pypy3.11 VERSION=3.11 INSTALL_OR_SKIP=true ./venv.sh + +prepare: + - name: Install dependencies + how: install + package: + - gcc + - virtualenv + - python3-devel + - python3.12-devel + - python3-tox + - python3-dnf + - mock + - rpmdevtools + - rpm-build + - python3-pyyaml + - rpm + - dnf + - name: Update packages + how: shell + script: dnf upgrade -y + - name: rpm_qa + order: 100 + how: shell + script: rpm -qa | sort | tee $TMT_PLAN_DATA/rpmqa.txt diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d9f74a1..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,91 +0,0 @@ ---- -- 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 - - smoke27: - dir: python/smoke - 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 INSTALL_OR_SKIP=true TOX_REQUIRES="virtualenv<20.22.0" ./venv.sh - - smoke39: - dir: python/smoke - run: VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh - - smoke310: - dir: python/smoke - run: VERSION=3.10 INSTALL_OR_SKIP=true ./venv.sh - - smoke311: - dir: python/smoke - run: VERSION=3.11 INSTALL_OR_SKIP=true ./venv.sh - - smoke312: - dir: python/smoke - run: VERSION=3.12 ./venv.sh - - smoke313: - dir: python/smoke - run: VERSION=3.13 INSTALL_OR_SKIP=true ./venv.sh - - smoke313t: - dir: python/smoke - run: VERSION=3.13t INSTALL_OR_SKIP=true ./venv.sh - - smoke314: - dir: python/smoke - run: VERSION=3.14 INSTALL_OR_SKIP=true ./venv.sh - - smoke314t: - dir: python/smoke - run: VERSION=3.14t INSTALL_OR_SKIP=true ./venv.sh - - smoke_pypy39: - dir: python/smoke - 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 INSTALL_OR_SKIP=true ./venv.sh - - smoke_pypy311: - dir: python/smoke - run: PYTHON=pypy3.11 VERSION=3.11 INSTALL_OR_SKIP=true ./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-devel - - python3.12-devel - - python3-tox - - python3-dnf - - mock - - rpmdevtools - - rpm-build - - python3-pyyaml From a0c7d6d2fbe89c77775185444cd2549f0763cedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Thu, 14 Aug 2025 16:45:13 +0200 Subject: [PATCH 88/99] Change all_supplementing_pythons to work with tmt If there are no special fmf features used, fmf is a plain yaml. Which is case here so there is no need to use 'fmf' to parse plan.fmf --- plan.fmf | 3 +-- tests/all_supplementing_pythons.py | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plan.fmf b/plan.fmf index 827567e..c1a605f 100644 --- a/plan.fmf +++ b/plan.fmf @@ -21,8 +21,7 @@ discover: dist-git-download-only: true tests: - name: all_supplementing_pythons - path: /tests - test: ./all_supplementing_pythons.py + test: ./tests/all_supplementing_pythons.py - name: mock_with_tests # Needs cwd to contain downloaded sources, path to mocktes.sh depends on tmt tree structure test: | diff --git a/tests/all_supplementing_pythons.py b/tests/all_supplementing_pythons.py index 223bdf1..a473ae2 100755 --- a/tests/all_supplementing_pythons.py +++ b/tests/all_supplementing_pythons.py @@ -8,7 +8,7 @@ See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproje 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 + 2) ensures there is a venv.sh test for each of them in plan.fmf That way, when we change tox (update, patch, etc.), we will always test it with all Pythons that supplement it. @@ -34,16 +34,18 @@ def parse_python_test_arg(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) +with open('plan.fmf') as f: + plan_fmf = 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 discover_section in plan_fmf['discover']: + if discover_section['name'] != 'tests_python': + continue + for test in discover_section['tests']: + test_cmd = test['test'] + if test_cmd.endswith('./venv.sh'): + tested_pythons.add(parse_python_test_arg(test_cmd)) +print('Tested Pythons found in plan.fmf:', file=sys.stderr) for python in sorted(tested_pythons): print(' ', python, file=sys.stderr) From ddf7ecd3d86343d04a0d4cda3691817d1cd93f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 4 Sep 2025 12:36:53 +0200 Subject: [PATCH 89/99] Fix build in ELN [skip changelog] --- python-tox.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/python-tox.spec b/python-tox.spec index 022afbc..c3df30c 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -107,6 +107,14 @@ sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|pyproject-api|pytest|pyte -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ pyproject.toml +%if 0%{?rhel} +# There is no build[virtualenv] packaged in ELN +# https://github.com/fedora-eln/eln/issues/309 +# We flatten the test depndency to build and virtualenv (already listed in runtime deps) +sed -i 's/"build\[virtualenv\]"/"build"/' pyproject.toml +%endif + + %generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" %pyproject_buildrequires -r %{?with_tests:-g test} From a8537e2385547229093a2328aa5b0295eca6cbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 3 Sep 2025 23:17:13 +0200 Subject: [PATCH 90/99] Update to 4.30.1 - Fixes: rhbz#2382185 pluggy 1.5 seems to be actually needed for https://github.com/tox-dev/tox/pull/3560 --- fix-tests.patch | 64 ++++++++++++++++++++++++++----------------------- python-tox.spec | 7 ++++-- sources | 2 +- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index d76215f..fd56022 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From 924b03e0446561bbfca9679a44642a1a96dd8f10 Mon Sep 17 00:00:00 2001 +From 1e9b70829b06f6e972b23ee909db56366a48f025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 28 Mar 2025 09:44:24 +0100 Subject: [PATCH] Fix tests @@ -9,41 +9,45 @@ Content-Transfer-Encoding: 8bit Co-Authored-By: Lumir Balhar Co-Authored-By: Miro Hrončok --- - pyproject.toml | 11 +---------- + pyproject.toml | 10 +--------- src/tox/pytest.py | 16 +++------------- tests/test_provision.py | 18 ++---------------- .../package/test_python_package_util.py | 10 ++++++++-- - 4 files changed, 14 insertions(+), 41 deletions(-) + 4 files changed, 14 insertions(+), 40 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 9b52c2f..335012b 100644 +index a7323bf..ed9b315 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -82,22 +82,16 @@ dev = [ +@@ -77,11 +77,6 @@ dev = [ ] test = [ "build[virtualenv]>=1.2.2.post1", - "covdefaults>=2.3", +- "coverage>=7.9.2", - "detect-test-pollution>=1.2", - "devpi-process>=1.0.2", -- "diff-cover>=9.2", - "distlib>=0.3.9", +- "diff-cover>=9.6", + "distlib>=0.4", "flaky>=3.8.1", - "hatch-vcs>=0.4", - "hatchling>=1.27", - "psutil>=6.1.1", - "pytest>=8.3.4", -- "pytest-cov>=5", - "pytest-mock>=3.14", - "pytest-xdist>=3.6.1", + "hatch-vcs>=0.5", +@@ -89,7 +84,6 @@ test = [ + "pdm-backend", + "psutil>=7", + "pytest>=8.4.1", +- "pytest-cov>=6.2.1", + "pytest-mock>=3.14.1", + "pytest-xdist>=3.8", "re-assert>=1.1", -- "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.1", +@@ -203,6 +197,7 @@ filterwarnings = [ + "error", + "ignore:unclosed database in None +@@ -480,15 +479,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None monkeypatch.setenv("PIP_TIMEOUT", str(2)) @@ -96,10 +100,10 @@ index bca2ad8..973e714 100644 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 2030cb9..f706d6c 100644 +index 0cf4de5..9505bf1 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] +@@ -101,22 +101,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] return result @@ -124,7 +128,7 @@ index 2030cb9..f706d6c 100644 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) - +@@ -164,7 +151,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - @pytest.mark.integration @@ -133,7 +137,7 @@ index 2030cb9..f706d6c 100644 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 +index 3802147..7f64d90 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: @@ -151,8 +155,8 @@ index efb5b12..8a57426 100644 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"), + Requirement("platformdirs>=4.3.8"), + Requirement("colorama>=0.4.6"), - *(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}"'), @@ -163,5 +167,5 @@ index efb5b12..8a57426 100644 for left, right in zip_longest(result, exp): assert isinstance(right, Requirement) -- -2.49.0 +2.51.0 diff --git a/python-tox.spec b/python-tox.spec index c3df30c..6ba4870 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.26.0 +Version: 4.30.1 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -33,6 +33,7 @@ Source: %{pypi_source tox} # 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. +# Ignore ResourceWarning: subprocess ... is still running (happens arbitrarily, possibly due to pytest-xdist usage) Patch: fix-tests.patch BuildArch: noarch @@ -101,10 +102,11 @@ 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|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|pluggy|distlib|cachetools|build\[virtualenv\]|setuptools|flaky)>=.*/"\1",/g' \ +sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|distlib|cachetools|build\[virtualenv\]|setuptools|flaky|hatch-vcs)>=.*/"\1",/g' \ -e 's/"(time-machine)>=[^;"]+/"\1/' \ -e 's/"(virtualenv)>=.*/"\1>=20.29",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ + -e 's/"(pluggy)>=.*/"\1>=1.5",/g' \ pyproject.toml %if 0%{?rhel} @@ -170,6 +172,7 @@ 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" +k="${k-}${k+ and }not test_pyproject_installpkg_pep517_envs" test -z $VIRTUALENV_WHEEL && k="${k-}${k+ and }not test_result_json_sequential" %endif diff --git a/sources b/sources index 9428218..326f159 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.26.0.tar.gz) = ad2e311cd63c45a079b8c230a2feb364270b7a8bcf44b626385f8e442c6683ae841b3f34417b504f927608685a254fef3767d832fb5cfcc324c9cbf6ff7ea997 +SHA512 (tox-4.30.1.tar.gz) = 55fd7a07d697faedde4fa3ed586b56cc6bba4c9ab73620ee9f6a33dddff674af0bb5d58897b3bd844aefa5b8cae0b1c159407245f9c4457c4fa77201b2cbbb0b From 661fadce9e77a895a5beaab1866cb379feebc966 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:38:08 +0200 Subject: [PATCH 91/99] Rebuilt for Python 3.14.0rc3 bytecode From 6e8b540f1ff7c58545111cf834099469b238b836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 8 Sep 2025 09:49:24 +0200 Subject: [PATCH 92/99] Revert "Fix build in ELN" This reverts commit ddf7ecd3d86343d04a0d4cda3691817d1cd93f3f. No longer needed due to https://src.fedoraproject.org/rpms/python-build/c/4a39a0b151 [skip changelog] --- python-tox.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 6ba4870..c23d447 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -109,14 +109,6 @@ sed -ri -e 's/"(packaging|filelock|platformdirs|psutil|pyproject-api|pytest|pyte -e 's/"(pluggy)>=.*/"\1>=1.5",/g' \ pyproject.toml -%if 0%{?rhel} -# There is no build[virtualenv] packaged in ELN -# https://github.com/fedora-eln/eln/issues/309 -# We flatten the test depndency to build and virtualenv (already listed in runtime deps) -sed -i 's/"build\[virtualenv\]"/"build"/' pyproject.toml -%endif - - %generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" %pyproject_buildrequires -r %{?with_tests:-g test} From 4685d09abfeea9f84c9fcdc7d7a588dce7289263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 6 Oct 2025 23:25:05 +0200 Subject: [PATCH 93/99] Update to 4.30.3 - Fixes: rhbz#2393223 --- fix-tests.patch | 49 ++++++++++++++++++++++--------------------------- python-tox.spec | 2 +- sources | 2 +- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index fd56022..c24144f 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From 1e9b70829b06f6e972b23ee909db56366a48f025 Mon Sep 17 00:00:00 2001 +From 276688b3d884787663a1832990025c3402770961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 28 Mar 2025 09:44:24 +0100 Subject: [PATCH] Fix tests @@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit Co-Authored-By: Lumir Balhar Co-Authored-By: Miro Hrončok --- - pyproject.toml | 10 +--------- - src/tox/pytest.py | 16 +++------------- - tests/test_provision.py | 18 ++---------------- - .../package/test_python_package_util.py | 10 ++++++++-- - 4 files changed, 14 insertions(+), 40 deletions(-) + pyproject.toml | 10 +--------- + src/tox/pytest.py | 16 +++------------- + tests/test_provision.py | 11 ++++------- + .../package/test_python_package_util.py | 10 ++++++++-- + 4 files changed, 16 insertions(+), 31 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a7323bf..ed9b315 100644 @@ -100,35 +100,30 @@ index bfdc7e6..9a02df3 100644 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 0cf4de5..9505bf1 100644 +index 2cde4f6..0baba46 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py -@@ -101,22 +101,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] - return result +@@ -124,15 +124,13 @@ def _use_pypi_index(pypi_index: Index, monkeypatch: MonkeyPatch) -> None: --@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(): +-def _pypi_index_mirrored(local_pypi_indexes: tuple[Index, Index], monkeypatch: MonkeyPatch) -> None: +- pypi_index_mirrored, _ = local_pypi_indexes +- _use_pypi_index(pypi_index_mirrored, monkeypatch) ++def _pypi_index_mirrored() -> None: + pytest.skip("needs devpi-process") + + @pytest.fixture +-def _pypi_index_self(local_pypi_indexes: tuple[Index, Index], monkeypatch: MonkeyPatch) -> None: +- _, pypi_index_self = local_pypi_indexes +- _use_pypi_index(pypi_index_self, monkeypatch) ++def _pypi_index_self() -> None: ++ 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" -@@ -164,7 +151,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - +@@ -181,7 +179,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - @pytest.mark.integration diff --git a/python-tox.spec b/python-tox.spec index c23d447..71a7dd7 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.30.1 +Version: 4.30.3 Release: %autorelease Summary: Virtualenv-based automation of test activities diff --git a/sources b/sources index 326f159..a5ffa2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.30.1.tar.gz) = 55fd7a07d697faedde4fa3ed586b56cc6bba4c9ab73620ee9f6a33dddff674af0bb5d58897b3bd844aefa5b8cae0b1c159407245f9c4457c4fa77201b2cbbb0b +SHA512 (tox-4.30.3.tar.gz) = c4ef909b7e369844042f26ae4c492ec4c78cd0efe11af80f36159304166cd6e77b75b8191de0e78870f414c921230402bccdfda5ceeb56e4194abc66f076f720 From f8840a782cedc92289952fe09f9c5c66b0642812 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 23 Oct 2025 15:57:50 +0200 Subject: [PATCH 94/99] CI: Run tests with Python 3.15 [skip changelog] --- plan.fmf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plan.fmf b/plan.fmf index c1a605f..c10b63e 100644 --- a/plan.fmf +++ b/plan.fmf @@ -61,6 +61,12 @@ discover: - name: smoke314t path: /smoke test: VERSION=3.14t INSTALL_OR_SKIP=true ./venv.sh + - name: smoke315 + path: /smoke + test: VERSION=3.15 INSTALL_OR_SKIP=true ./venv.sh + - name: smoke315t + path: /smoke + test: VERSION=3.15t INSTALL_OR_SKIP=true ./venv.sh - name: smoke_pypy39 path: /smoke test: PYTHON=pypy3.9 VERSION=3.9 INSTALL_OR_SKIP=true ./venv.sh From b9bd279702d7e978d60bd1e766c769bdb95fa0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 6 Nov 2025 11:58:23 +0100 Subject: [PATCH 95/99] Adjust the sed in %prep to unpin all test deps [skip changelog] --- python-tox.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 71a7dd7..afc7ab4 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -102,11 +102,13 @@ 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|pyproject-api|pytest|pytest-mock|pytest-xdist|wheel|distlib|cachetools|build\[virtualenv\]|setuptools|flaky|hatch-vcs)>=.*/"\1",/g' \ - -e 's/"(time-machine)>=[^;"]+/"\1/' \ +# First, carefully adjust the pins of build and runtime dependencies, +# then remove all the >= specifiers from tests deps, whatever they are. +sed -ri -e 's/"(packaging|filelock|platformdirs|pyproject-api|cachetools|hatch-vcs)>=.*/"\1",/g' \ -e 's/"(virtualenv)>=.*/"\1>=20.29",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ -e 's/"(pluggy)>=.*/"\1>=1.5",/g' \ + -e '/^test = \[/,/^\]/ { s/>=[^;"]+// }' \ pyproject.toml %generate_buildrequires From 91ed59fa8e8cc40487b88e761d6f21a052ba2583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 6 Nov 2025 11:29:52 +0100 Subject: [PATCH 96/99] Update to 4.32.0 - Fixes: rhbz#2406240 --- fix-tests.patch | 59 +++++++++++++++++++++++-------------------------- python-tox.spec | 2 +- sources | 2 +- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index c24144f..7caaa2d 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,4 +1,4 @@ -From 276688b3d884787663a1832990025c3402770961 Mon Sep 17 00:00:00 2001 +From 42a461b71597e85e7902571348786aa4ab848cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 28 Mar 2025 09:44:24 +0100 Subject: [PATCH] Fix tests @@ -9,37 +9,37 @@ Content-Transfer-Encoding: 8bit Co-Authored-By: Lumir Balhar Co-Authored-By: Miro Hrončok --- - pyproject.toml | 10 +--------- - src/tox/pytest.py | 16 +++------------- - tests/test_provision.py | 11 ++++------- - .../package/test_python_package_util.py | 10 ++++++++-- - 4 files changed, 16 insertions(+), 31 deletions(-) + pyproject.toml | 10 +--------- + src/tox/pytest.py | 14 ++------------ + tests/test_provision.py | 11 ++++------- + .../package/test_python_package_util.py | 10 ++++++++-- + 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index a7323bf..ed9b315 100644 +index 6920d19..53326bc 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -77,11 +77,6 @@ dev = [ +@@ -76,11 +76,6 @@ dev = [ ] test = [ - "build[virtualenv]>=1.2.2.post1", + "build[virtualenv]>=1.3", - "covdefaults>=2.3", -- "coverage>=7.9.2", +- "coverage>=7.10.7", - "detect-test-pollution>=1.2", - "devpi-process>=1.0.2", -- "diff-cover>=9.6", +- "diff-cover>=9.7.1", "distlib>=0.4", "flaky>=3.8.1", "hatch-vcs>=0.5", -@@ -89,7 +84,6 @@ test = [ - "pdm-backend", - "psutil>=7", - "pytest>=8.4.1", -- "pytest-cov>=6.2.1", - "pytest-mock>=3.14.1", +@@ -88,7 +83,6 @@ test = [ + "pdm-backend>=2.4.5", + "psutil>=7.1", + "pytest>=8.4.2", +- "pytest-cov>=7", + "pytest-mock>=3.15.1", "pytest-xdist>=3.8", "re-assert>=1.1", -@@ -203,6 +197,7 @@ filterwarnings = [ +@@ -201,6 +195,7 @@ filterwarnings = [ "error", "ignore:unclosed database in None +@@ -479,15 +478,6 @@ def enable_pypi_server(monkeypatch: pytest.MonkeyPatch, url: str | None) -> None monkeypatch.setenv("PIP_TIMEOUT", str(2)) @@ -100,10 +97,10 @@ index bfdc7e6..9a02df3 100644 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 2cde4f6..0baba46 100644 +index d1b6b2d..022e340 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py -@@ -124,15 +124,13 @@ def _use_pypi_index(pypi_index: Index, monkeypatch: MonkeyPatch) -> None: +@@ -126,15 +126,13 @@ def _use_pypi_index(pypi_index: Index, monkeypatch: MonkeyPatch) -> None: @pytest.fixture @@ -123,7 +120,7 @@ index 2cde4f6..0baba46 100644 def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: -@@ -181,7 +179,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - +@@ -183,7 +181,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - @pytest.mark.integration @@ -162,5 +159,5 @@ index 3802147..7f64d90 100644 for left, right in zip_longest(result, exp): assert isinstance(right, Requirement) -- -2.51.0 +2.51.1 diff --git a/python-tox.spec b/python-tox.spec index afc7ab4..ead1f71 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.30.3 +Version: 4.32.0 Release: %autorelease Summary: Virtualenv-based automation of test activities diff --git a/sources b/sources index a5ffa2f..29364be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.30.3.tar.gz) = c4ef909b7e369844042f26ae4c492ec4c78cd0efe11af80f36159304166cd6e77b75b8191de0e78870f414c921230402bccdfda5ceeb56e4194abc66f076f720 +SHA512 (tox-4.32.0.tar.gz) = eabe1ef037f3b44947dd13e11528cd702762d6b38cf87ae7675643d7f09b2b3ddd9761a395713e95f286ffc44d77495998f68ed2f0491910f64308fb15f726ff From bfcb4db415572ca4100bfd84aae98a09d4ba09d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 10 Nov 2025 11:19:50 +0100 Subject: [PATCH 97/99] Move test dependencies removal from fix-tests.patch to a sed That way, the patch is easier applied for future rebases. pyproject.toml after %prep is identical to what it was before this commit. [skip changelog] --- fix-tests.patch | 22 +--------------------- python-tox.spec | 9 +++++---- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/fix-tests.patch b/fix-tests.patch index 7caaa2d..83da6ad 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit Co-Authored-By: Lumir Balhar Co-Authored-By: Miro Hrončok --- - pyproject.toml | 10 +--------- + pyproject.toml | 4 +--- src/tox/pytest.py | 14 ++------------ tests/test_provision.py | 11 ++++------- .../package/test_python_package_util.py | 10 ++++++++-- @@ -19,26 +19,6 @@ diff --git a/pyproject.toml b/pyproject.toml index 6920d19..53326bc 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -76,11 +76,6 @@ dev = [ - ] - test = [ - "build[virtualenv]>=1.3", -- "covdefaults>=2.3", -- "coverage>=7.10.7", -- "detect-test-pollution>=1.2", -- "devpi-process>=1.0.2", -- "diff-cover>=9.7.1", - "distlib>=0.4", - "flaky>=3.8.1", - "hatch-vcs>=0.5", -@@ -88,7 +83,6 @@ test = [ - "pdm-backend>=2.4.5", - "psutil>=7.1", - "pytest>=8.4.2", -- "pytest-cov>=7", - "pytest-mock>=3.15.1", - "pytest-xdist>=3.8", - "re-assert>=1.1", @@ -201,6 +195,7 @@ filterwarnings = [ "error", "ignore:unclosed database in = specifiers from tests deps, whatever they are. +# then remove all the >= specifiers from tests deps, whatever they are, +# finally, remove undesired test dependencies. sed -ri -e 's/"(packaging|filelock|platformdirs|pyproject-api|cachetools|hatch-vcs)>=.*/"\1",/g' \ -e 's/"(virtualenv)>=.*/"\1>=20.29",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ -e 's/"(pluggy)>=.*/"\1>=1.5",/g' \ -e '/^test = \[/,/^\]/ { s/>=[^;"]+// }' \ + -e '/^test = \[/,/^\]/ { /"(covdefaults|coverage|detect-test-pollution|devpi-process|diff-cover|pytest-cov)[;"]/d }' \ pyproject.toml %generate_buildrequires From de396d650bf66f5941e8e70b16250ac5cde03049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 5 Jan 2026 16:18:46 +0100 Subject: [PATCH 98/99] CI: Fix all_supplementing_pythons wrt. freethreading Pythons [skip changelog] --- tests/all_supplementing_pythons.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/all_supplementing_pythons.py b/tests/all_supplementing_pythons.py index a473ae2..6c2dadd 100755 --- a/tests/all_supplementing_pythons.py +++ b/tests/all_supplementing_pythons.py @@ -66,10 +66,13 @@ for nvra in supplementing_pkgs: # We use this hack to treat -devel and -libs packages as if they were not such +# We also convert the freethreading packages to the exectuable name def normalize_name(pkgname): for suffix in '-devel', '-libs': if pkgname.endswith(suffix): - return pkgname.removesuffix(suffix) + pkgname = pkgname.removesuffix(suffix) + if pkgname.endswith('-freethreading'): + pkgname = pkgname.removesuffix('-freethreading') + 't' return pkgname From eb2fd83e5a29ac61636bf810ff09f7517fb32b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 5 Jan 2026 15:30:31 +0100 Subject: [PATCH 99/99] Update to 4.33.0 - Fixes: rhbz#2426906 --- python-tox.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index 2416cbb..a5f044f 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.32.0 +Version: 4.33.0 Release: %autorelease Summary: Virtualenv-based automation of test activities diff --git a/sources b/sources index 29364be..88f12ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.32.0.tar.gz) = eabe1ef037f3b44947dd13e11528cd702762d6b38cf87ae7675643d7f09b2b3ddd9761a395713e95f286ffc44d77495998f68ed2f0491910f64308fb15f726ff +SHA512 (tox-4.33.0.tar.gz) = e46a19ea92a556dc45a592a8d9567b863e072bd2ca8bc7866a3e4992f737fb29ff263a88cfd3cfaa9edaf4d097dd232d710ff9ac072bb16a98adcffea8fe3b70