diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 9f85cb9..ce6f69b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,10 @@ -/tox-*.tar.gz -/tox-*/ +/tox-1.4.2.zip +/tox-1.6.1.tar.gz +/tox-1.7.1.tar.gz +/tox-1.8.1.tar.gz +/tox-2.1.1.tar.gz +/tox-2.3.1.tar.gz +/tox-2.7.0.tar.gz +/tox-2.9.1.tar.gz +/tox-3.0.0.tar.gz +/tox-3.4.0.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 04a1bad..0000000 --- a/changelog +++ /dev/null @@ -1,341 +0,0 @@ -* 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/fix-tests.patch b/fix-tests.patch deleted file mode 100644 index 83da6ad..0000000 --- a/fix-tests.patch +++ /dev/null @@ -1,143 +0,0 @@ -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 -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 | 4 +--- - 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 6920d19..53326bc 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -201,6 +195,7 @@ filterwarnings = [ - "error", - "ignore:unclosed database in None - monkeypatch.setenv("PIP_TIMEOUT", str(2)) - - --@pytest.fixture(scope="session") --def pypi_server(tmp_path_factory: pytest.TempPathFactory) -> Iterator[IndexServer]: -- # takes around 2.5s -- path = tmp_path_factory.mktemp("pypi") -- with IndexServer(path) as server: -- server.create_index("empty", "volatile=False") -- yield server -- -- - @pytest.fixture(scope="session") - def _invalid_index_fake_port() -> int: - with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as socket_handler: -diff --git a/tests/test_provision.py b/tests/test_provision.py -index d1b6b2d..022e340 100644 ---- a/tests/test_provision.py -+++ b/tests/test_provision.py -@@ -126,15 +126,13 @@ def _use_pypi_index(pypi_index: Index, monkeypatch: MonkeyPatch) -> None: - - - @pytest.fixture --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: -@@ -183,7 +181,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - - - - @pytest.mark.integration --@pytest.mark.usefixtures("_pypi_index_self") - def test_provision_platform_check(tox_project: ToxProjectCreator) -> None: - ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" - proj = tox_project({"tox.ini": ini}) -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 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: - - 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>=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}"'), - 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.51.1 - diff --git a/plan.fmf b/plan.fmf deleted file mode 100644 index c10b63e..0000000 --- a/plan.fmf +++ /dev/null @@ -1,102 +0,0 @@ -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 - 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: | - 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: 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 - - 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/py39.patch b/py39.patch new file mode 100644 index 0000000..5bdbd7c --- /dev/null +++ b/py39.patch @@ -0,0 +1,13 @@ +diff --git a/src/tox/constants.py b/src/tox/constants.py +index bd21562..3b5e57f 100644 +--- a/src/tox/constants.py ++++ b/src/tox/constants.py +@@ -28,7 +28,7 @@ def _construct_default_factors(cpython_versions, pypy_versions, other_interprete + class PYTHON: + PY_FACTORS_RE = re.compile("^(?!py$)(py|pypy|jython)([2-9][0-9]?)?$") + PY_FACTORS_MAP = {"py": "python", "pypy": "pypy", "jython": "jython"} +- CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)] ++ CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)] + PYPY_VERSION_TUPLES = [(2, 7), (3, 5)] + OTHER_PYTHON_INTERPRETERS = ["jython"] + DEFAULT_FACTORS = _construct_default_factors( diff --git a/python-tox.spec b/python-tox.spec index a5f044f..61b5443 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,63 +1,20 @@ -%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 -# To run them, do the following: -# 1) Build --without ci_tests (the default) and optionally --without tests -# (e.g. fedpkg mockbuild --without tests) -# 2) Install the built package -# (e.g. mock install ./results_python-tox/.../tox-...rpm) -# 3) Build again --with ci_tests (and internet connection) -# (e.g. fedpkg mockbuild --no-clean-all --enable-network --with ci_tests) -# The Fedora CI tests do this. -%bcond ci_tests 0 +%global srcname tox -# Unset -s on python shebang - ensure that extensions installed with pip -# to user locations are seen and properly loaded -# Fixes https://bugzilla.redhat.com/2057015 -%undefine _py3_shebang_s - -Name: python-tox -Version: 4.33.0 -Release: %autorelease +Name: python-%{srcname} +Version: 3.4.0 +Release: 2%{?dist} Summary: Virtualenv-based automation of test activities - License: MIT -URL: https://tox.readthedocs.io/ -Source: %{pypi_source tox} +URL: https://tox.readthedocs.io +Source0: %{pypi_source} -# Remove usage of devpi-process. -# Remove coverage options. -# 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 +# Run py39 env with Python 3.9 +# https://bugzilla.redhat.com/show_bug.cgi?id=1798929 +Patch1: py39.patch BuildArch: noarch -BuildRequires: python3-devel -# for dependency-groups support: -BuildRequires: pyproject-rpm-macros >= 1.16 - -%if %{with tests} -BuildRequires: /usr/bin/gcc -BuildRequires: /usr/bin/git -BuildRequires: /usr/bin/pip -BuildRequires: /usr/bin/pytest -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 -%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 -BuildRequires: tox = %{version} -%endif -%endif - -%global _description %{expand: +%description Tox as is a generic virtualenv management and test command line tool you can use for: @@ -66,118 +23,193 @@ can use for: - running your tests in each of the environments, configuring your test tool of choice - acting as a frontend to Continuous Integration servers, greatly reducing - boilerplate and merging CI and shell-based testing.} - -%description %_description + boilerplate and merging CI and shell-based testing. -%package -n tox +%package -n python3-%{srcname} Summary: %{summary} +%{?python_provide:%python_provide python3-%{srcname}} +Provides: %{srcname} = %{version}-%{release} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm -# Recommend "all the Pythons" -# Why? Tox exists to enable developers to test libraries against various Python -# versions, with just "dnf install tox" and a config file. -# See: https://developer.fedoraproject.org/tech/languages/python/python-installation.html#using-virtualenv -# Tox itself runs on the system python3 (i.e. %%{python3_version}, -# 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} -Recommends: python3.9 -Recommends: python3.10 -Recommends: pypy3-devel -%endif +Recommends: python36 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/ -%py_provides python3-tox +%?python_enable_dependency_generator -%description -n tox %_description +%description -n python3-%{srcname} +Tox as is a generic virtualenv management and test command line tool you +can use for: + - checking your package installs correctly with different Python versions + and interpreters + - running your tests in each of the environments, configuring your test tool + of choice + - acting as a frontend to Continuous Integration servers, greatly reducing + boilerplate and merging CI and shell-based testing. %prep -%autosetup -p1 -n tox-%{version} - -# Upstream updates dependencies too aggressively -# see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356 -# First, carefully adjust the pins of build and runtime dependencies, -# 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 -export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" -%pyproject_buildrequires -r %{?with_tests:-g test} +%autosetup -p1 -n %{srcname}-%{version} +# remove bundled egg-info +rm -rf %{srcname}.egg-info %build -export SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" -%pyproject_wheel +%py3_build %install -%pyproject_install -%pyproject_save_files tox - - -%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. -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 -# 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. -%if %{without ci_tests} -k="${k-}${k+ and }not test_build_wheel_external" -k="${k-}${k+ and }not keyboard_interrupt" -k="${k-}${k+ and }not test_call_as_module" -k="${k-}${k+ and }not test_call_as_exe" -k="${k-}${k+ and }not test_run_installpkg_targz" -k="${k-}${k+ and }not test_pyproject_installpkg_pep517_envs" -test -z $VIRTUALENV_WHEEL && k="${k-}${k+ and }not test_result_json_sequential" -%endif - -%pytest -v -n auto -k "${k-}" --run-integration -%endif - - -%files -n tox -f %{pyproject_files} -%{_bindir}/tox +%py3_install +%files -n python3-%{srcname} +%{_bindir}/%{srcname} +%{_bindir}/%{srcname}-quickstart +%{python3_sitelib}/%{srcname} +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %changelog -%autochangelog +* Tue Jan 19 2021 Miro Hrončok - 3.4.0-2 +- Fix invocation with Python 3.9 (#1798929) + +* Tue Feb 25 2020 Gris Ge - 3.4.0-1 +- Port to EPEL8 + +* 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/rpmlint.toml b/rpmlint.toml deleted file mode 100644 index 7b84503..0000000 --- a/rpmlint.toml +++ /dev/null @@ -1,3 +0,0 @@ -Filters = [ - 'spelling-error .* en_US [Vv]irtualenv ', -] diff --git a/sources b/sources index 88f12ab..0c7f9ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.33.0.tar.gz) = e46a19ea92a556dc45a592a8d9567b863e072bd2ca8bc7866a3e4992f737fb29ff263a88cfd3cfaa9edaf4d097dd232d710ff9ac072bb16a98adcffea8fe3b70 +SHA512 (tox-3.4.0.tar.gz) = c14364dffac50bece66f15545325d7912459e49979b37b48ff399610517a43a10a4c005f4ca5ec9481fb4140803a18be64f94838610e07d1e7a4b3e5df2a7d87 diff --git a/tests/all_supplementing_pythons.py b/tests/all_supplementing_pythons.py deleted file mode 100755 index 6c2dadd..0000000 --- a/tests/all_supplementing_pythons.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/python3 -""" -Several packages with various Python interpreters *Supplement* tox. -*Supplements* is a reverse dependency to *Recommends*. - -See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/ - -This script: - - 1) figures out all packages in the enabled repositories supplementing tox - 2) ensures there is a venv.sh test for each of them in plan.fmf - -That way, when we change tox (update, patch, etc.), -we will always test it with all Pythons that supplement it. -""" - -import shlex -import subprocess -import sys -import yaml - - -def parse_python_test_arg(command): - tokens = shlex.split(command) - for token in tokens: - if token.startswith('PYTHON='): - return token.removeprefix('PYTHON=') - # only check VERSION if PYTHON was not found - for token in tokens: - if token.startswith('VERSION='): - return 'python' + token.removeprefix('VERSION=') - raise RuntimeError(f'Could not determine the Python version from `{command}`') - - -# First, construct a set of various Pythons we test, e.g. {python3.10, python3.7, pypy3.6, ...} -tested_pythons = set() -with open('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 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) - - -# Get all packages that supplement tox, -# no repo explicitly specified means we use the enabled repos on the CI system which should be what we want -repoquery_result = subprocess.check_output(['dnf-3', 'repoquery', '--whatsupplements', 'tox'], text=True) -supplementing_pkgs = set(repoquery_result.splitlines()) - - -# It gets quite tricky, since packages like "pypy" can supplement tox, we get a set of provides for all of them -supplementing_pkgs_provides = {} -for nvra in supplementing_pkgs: - repoquery_result = subprocess.check_output(['dnf-3', '-q', 'repoquery', '--provides', nvra], text=True) - provides = set(repoquery_result.splitlines()) - unversioned_provides = {provide.split(' ')[0] for provide in provides} - supplementing_pkgs_provides[nvra.rsplit('-', 2)[0]] = unversioned_provides - - -# We use this hack to treat -devel and -libs packages as if they were not such -# We also convert the freethreading packages to the exectuable name -def normalize_name(pkgname): - for suffix in '-devel', '-libs': - if pkgname.endswith(suffix): - pkgname = pkgname.removesuffix(suffix) - if pkgname.endswith('-freethreading'): - pkgname = pkgname.removesuffix('-freethreading') + 't' - return pkgname - - -# Now, for each package that supplements tox, we check if there is a tested Python that *is* it -exit_code = 0 -for pkg, provides in supplementing_pkgs_provides.items(): - if normalize_name(pkg) in tested_pythons: - print(f'{pkg} is tested', file=sys.stderr) - continue - for provide in provides: - if normalize_name(provide) in tested_pythons: - print(f'{pkg} is tested (via {provide})', file=sys.stderr) - break - else: - print(f'{pkg} is NOT tested', file=sys.stderr) - exit_code = 1 - -sys.exit(exit_code) diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..0ff54a7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,21 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/tests/python.git" + dest: "python" + tests: + - smoke36: + dir: python/smoke + run: VERSION=3.6 ./venv.sh + - smoke38: + dir: python/smoke + run: VERSION=3.8 ./venv.sh + required_packages: + - gcc + - python36-devel + - python38-devel + - python3-tox