Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-tox for openSUSE:Factory checked in at 2024-03-26 19:26:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tox (Old) and /work/SRC/openSUSE:Factory/.python-tox.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tox" Tue Mar 26 19:26:27 2024 rev:55 rq:1161560 version:4.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tox/python-tox.changes 2024-03-05 18:52:29.085014031 +0100 +++ /work/SRC/openSUSE:Factory/.python-tox.new.1905/python-tox.changes 2024-03-26 19:30:05.603188957 +0100 @@ -1,0 +2,76 @@ +Mon Mar 25 19:22:38 UTC 2024 - Dan Čermák <dcermak@suse.com> + +- Rebase patches: + * optional_devpi_process.patch as 0001-Make-use-of-devpi_process-optional.patch + (additionally add a skip of tests that would require the devpi process) + * mark-network-tests.patch as 0002-skip-test-which-require-network-access.patch + +- Bump dependencies according to upstream +- Remove unused dependency pytest-randomly + +- New upstream release 4.14.2: + +v4.14.2 (2024-03-22) +-------------------- + +Bugfixes - 4.14.2 +~~~~~~~~~~~~~~~~~ +- Add provision arguments to ToxParser to fix crash when provisioning new tox environment without list-dependencies by :user:`seyidaniels` (:issue:`3190`) + +Improved Documentation - 4.14.2 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- Removed unused line from the 'fresh_subprocess' documentation. (:issue:`3241`) + +v4.14.1 (2024-03-06) +-------------------- + +Bugfixes - 4.14.1 +~~~~~~~~~~~~~~~~~ +- Fix crash with fresh subprocess, if the build backend is setuptools automatically enable fresh subprocesses for + build backend calls - by :user:`gaborbernat`. (:issue:`3235`) + +v4.14.0 (2024-03-05) +-------------------- + +Features - 4.14.0 +~~~~~~~~~~~~~~~~~ +- Support enabling fresh subprocess for packaging build backends via :ref:`fresh_subprocess` - by :user:`gaborbernat`. (:issue:`3227`) +- Allow plugins attaching additional information to ``--version`` via ``tox_append_version_info`` method in the plugin + module - by :user:`gaborbernat`. (:issue:`3234`) + +v4.13.0 (2024-02-16) +-------------------- + +Features - 4.13.0 +~~~~~~~~~~~~~~~~~ +- Extract virtual environment packaging code to its own base class not tied to ``virtualenv`` - by :user:`gaborbernat`. (:issue:`3221`) + +Improved Documentation - 4.13.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- Documented usage of ``pytest`` with ``tox run-parallel`` - by :user:`faph`. (:issue:`3187`) +- Configuration: state in config directive sections their ini file sections - by :user:`0cjs`. (:issue:`3194`) +- Development: summarize important points experienced developers need to know - by :user:`0cjs`. (:issue:`3197`) + +v4.12.1 (2024-01-16) +-------------------- + +Bugfixes - 4.12.1 +~~~~~~~~~~~~~~~~~ +- Fixed bug where running with --installpkg and multiple envs could not clean up between tests (:issue:`3165`) + +v4.12.0 (2024-01-11) +-------------------- + +Features - 4.12.0 +~~~~~~~~~~~~~~~~~ +- Always pass ``FORCE_COLOR`` and ``NO_COLOR`` to the environment (:issue:`3171`) + +Bugfixes - 4.12.0 +~~~~~~~~~~~~~~~~~ +- ``--parallel-no-spinner`` flag now implies ``--parallel`` (:issue:`3158`) + +Improved Documentation - 4.12.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- -Fix ``open an issue`` link in development.rst (:issue:`3179`) + +------------------------------------------------------------------- Old: ---- mark-network-tests.patch optional_devpi_process.patch tox-4.11.4.tar.gz New: ---- 0001-Make-use-of-devpi_process-optional.patch 0002-skip-test-which-require-network-access.patch tox-4.14.2.tar.gz BETA DEBUG BEGIN: Old: (additionally add a skip of tests that would require the devpi process) * mark-network-tests.patch as 0002-skip-test-which-require-network-access.patch Old:- Rebase patches: * optional_devpi_process.patch as 0001-Make-use-of-devpi_process-optional.patch (additionally add a skip of tests that would require the devpi process) BETA DEBUG END: BETA DEBUG BEGIN: New:- Rebase patches: * optional_devpi_process.patch as 0001-Make-use-of-devpi_process-optional.patch (additionally add a skip of tests that would require the devpi process) New: (additionally add a skip of tests that would require the devpi process) * mark-network-tests.patch as 0002-skip-test-which-require-network-access.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tox.spec ++++++ --- /var/tmp/diff_new_pack.p3h4o6/_old 2024-03-26 19:30:06.131208386 +0100 +++ /var/tmp/diff_new_pack.p3h4o6/_new 2024-03-26 19:30:06.131208386 +0100 @@ -23,30 +23,26 @@ %bcond_with devpi_process %endif Name: python-tox -Version: 4.11.4 +Version: 4.14.2 Release: 0 Summary: Virtualenv-based automation of test activities License: MIT URL: https://github.com/tox-dev/tox Source: https://files.pythonhosted.org/packages/source/t/tox/tox-%{version}.tar.gz -# PATCH-FIX-OPENSUSE optional_devpi_process.patch bsc#[0-9]+ mcepl@suse.com -# Make use devpi_process optional -Patch0: optional_devpi_process.patch -# PATCH-FEATURE-UPSTREAM mark-network-tests.patch bsc#[0-9]+ mcepl@suse.com -# to skip test which require network access -Patch1: mark-network-tests.patch +Patch0: 0001-Make-use-of-devpi_process-optional.patch +Patch1: 0002-skip-test-which-require-network-access.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module build >= 0.10.0} -BuildRequires: %{python_module cachetools >= 5.3.1} +BuildRequires: %{python_module cachetools >= 5.3.2} BuildRequires: %{python_module chardet >= 5.2} BuildRequires: %{python_module colorama >= 0.4.6} -BuildRequires: %{python_module filelock >= 3.12.3} +BuildRequires: %{python_module filelock >= 3.13.1} BuildRequires: %{python_module hatch >= 0.3} -BuildRequires: %{python_module hatch_vcs >= 0.3} -BuildRequires: %{python_module hatchling >= 1.18} -BuildRequires: %{python_module packaging >= 23.1} +BuildRequires: %{python_module hatch_vcs >= 0.4} +BuildRequires: %{python_module hatchling >= 1.21} +BuildRequires: %{python_module packaging >= 23.2} BuildRequires: %{python_module pip} -BuildRequires: %{python_module platformdirs >= 3.10} +BuildRequires: %{python_module platformdirs >= 4.1} BuildRequires: %{python_module pluggy >= 1.3} BuildRequires: %{python_module poetry-core} BuildRequires: %{python_module pyproject-api >= 1.6.1} @@ -54,27 +50,27 @@ BuildRequires: %{python_module re-assert} BuildRequires: %{python_module setuptools >= 41.0.1} BuildRequires: %{python_module setuptools_scm >= 2.0.0} -BuildRequires: %{python_module time-machine >= 2.12} +BuildRequires: %{python_module time-machine >= 2.13} BuildRequires: %{python_module tomli >= 2.0.1} BuildRequires: %{python_module virtualenv >= 20.24.3} -BuildRequires: %{python_module wheel >= 0.41.2} +BuildRequires: %{python_module wheel >= 0.42} %if %{with devpi_process} BuildRequires: %{python_module devpi-process > 1} %endif -BuildRequires: %{python_module importlib-metadata >= 6.8} +%dnl BuildRequires: %{python_module importlib-metadata >= 6.8} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip -Requires: python-cachetools >= 5.3.1 +Requires: python-cachetools >= 5.3.2 Requires: python-chardet >= 5.2 Requires: python-colorama >= 0.4.6 -Requires: python-filelock >= 3.12.3 -Requires: python-packaging >= 23.1 -Requires: python-platformdirs >= 3.10 +Requires: python-filelock >= 3.13.1 +Requires: python-packaging >= 23.2 +Requires: python-platformdirs >= 4.1 Requires: python-pluggy >= 1.3 Requires: python-pyproject-api >= 1.6.1 Requires: python-virtualenv >= 20.24.3 -Requires: (python-importlib-metadata >= 0.12 if python3-base < 3.8) +%dnl Requires: (python-importlib-metadata >= 0.12 if python3-base < 3.8) Requires: (python-tomli >= 2.0.1 if python3-base < 3.11) Requires(post): update-alternatives Requires(postun): update-alternatives @@ -88,10 +84,9 @@ BuildRequires: %{python_module freezegun >= 0.3.11} BuildRequires: %{python_module numpy >= 1.25} BuildRequires: %{python_module psutil >= 5.9.5} -BuildRequires: %{python_module pytest >= 7.4} +BuildRequires: %{python_module pytest >= 7.4.4} BuildRequires: %{python_module pytest-cov >= 4.1} -BuildRequires: %{python_module pytest-mock >= 3.11.1} -BuildRequires: %{python_module pytest-randomly >= 3.0.0} +BuildRequires: %{python_module pytest-mock >= 3.12} BuildRequires: %{python_module pytest-xdist >= 3.3.1} # /SECTION %if "%{python_flavor}" == "python3" || "%{?python_provides}" == "python3" ++++++ 0001-Make-use-of-devpi_process-optional.patch ++++++ From 48abffc7beea8884717bcb631f921a1b7f58bb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@suse.com> Date: Mon, 25 Mar 2024 20:15:19 +0100 Subject: [PATCH 1/2] Make use of devpi_process optional Also skip tests using the enable_pip_pypi_access_fixture, as these tests require the devpi server and can break without it --- src/tox/pytest.py | 6 +++++- tests/test_provision.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tox/pytest.py b/src/tox/pytest.py index d734defd..f9e5ae10 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py @@ -17,7 +17,10 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c import pytest from _pytest.fixtures import SubRequest # noqa: PLC2701 -from devpi_process import IndexServer +try: + from devpi_process import IndexServer +except ImportError: + IndexServer = None from virtualenv.info import fs_supports_symlink import tox.run @@ -507,6 +510,7 @@ def enable_pip_pypi_access_fixture( """Set a fake pip index url, tests that want to use a pypi server should create and overwrite this.""" _, previous_url = disable_pip_pypi_access enable_pypi_server(monkeypatch, previous_url) + pytest.skip() return previous_url diff --git a/tests/test_provision.py b/tests/test_provision.py index 41eb630e..88cefb76 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py @@ -16,7 +16,10 @@ from filelock import FileLock from packaging.requirements import Requirement if TYPE_CHECKING: - from devpi_process import Index, IndexServer + try: + from devpi_process import Index, IndexServer + except ImportError: + Index, IndexServer = None, None from tox.pytest import MonkeyPatch, TempPathFactory, ToxProjectCreator -- 2.44.0 ++++++ 0002-skip-test-which-require-network-access.patch ++++++ From 3ccb15d7bea97db132ed4cdea4d9ef25d18311a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@suse.com> Date: Mon, 25 Mar 2024 20:11:16 +0100 Subject: [PATCH 2/2] skip test which require network access --- pyproject.toml | 3 +++ .../python/virtual_env/package/test_package_cmd_builder.py | 1 + 2 files changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 5e9b104a..b81c63ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -147,6 +147,9 @@ count = true [tool.pytest.ini_options] testpaths = ["tests"] addopts = "--tb=auto -ra --showlocals --no-success-flaky-report" +markers = [ + "network: tests requiring network connection", +] [tool.coverage] html.show_contexts = true diff --git a/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py b/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py index d29fe257..fb49a984 100644 --- a/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py +++ b/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py @@ -87,6 +87,7 @@ def test_install_pkg_via(tox_project: ToxProjectCreator, mode: str, pkg_with_ext @pytest.mark.usefixtures("enable_pip_pypi_access") +@pytest.mark.network def test_build_wheel_external(tox_project: ToxProjectCreator, demo_pkg_inline: Path) -> None: ini = """ [testenv] -- 2.44.0 ++++++ tox-4.11.4.tar.gz -> tox-4.14.2.tar.gz ++++++ ++++ 3514 lines of diff (skipped)