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 2023-05-12 20:39:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tox (Old) and /work/SRC/openSUSE:Factory/.python-tox.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-tox" Fri May 12 20:39:01 2023 rev:47 rq:1086768 version:4.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tox/python-tox.changes 2023-04-21 20:17:14.714391948 +0200 +++ /work/SRC/openSUSE:Factory/.python-tox.new.1533/python-tox.changes 2023-05-12 20:41:35.931289060 +0200 @@ -1,0 +2,12 @@ +Fri May 5 14:30:53 UTC 2023 - Matej Cepl <mc...@suse.com> + +- Update to 4.5.1: + The amount of changes is so huge, that user is kindly referred + to the packaged changelog. +- Add mark-network-tests.patch to skip test which require network + access +- Add optional_devpi_process.patch to make the package not depend + on devpi_process (which is rather expensive to build). +- Add _constraints. + +------------------------------------------------------------------- Old: ---- tox-3.26.0.tar.gz New: ---- _constraints mark-network-tests.patch optional_devpi_process.patch tox-4.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tox.spec ++++++ --- /var/tmp/diff_new_pack.UGAOnL/_old 2023-05-12 20:41:36.383291543 +0200 +++ /var/tmp/diff_new_pack.UGAOnL/_new 2023-05-12 20:41:36.387291565 +0200 @@ -15,35 +15,62 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %{?sle15_python_module_pythons} +%if %{defined sle15_python_module_pythons} +%bcond_without devpi_process +%else +%bcond_with devpi_process +%endif Name: python-tox -Version: 3.26.0 +Version: 4.5.1 Release: 0 Summary: Virtualenv-based automation of test activities License: MIT URL: https://github.com/tox-dev/tox +# Source: https://github.com/tox-dev/tox/archive/refs/tags/%%{version}.tar.gz#/tox-%%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/t/tox/tox-%{version}.tar.gz -BuildRequires: %{python_module backports.entry_points_selectable >= 1.0.4} -BuildRequires: %{python_module filelock >= 3.0.0} -BuildRequires: %{python_module packaging >= 14} +# PATCH-FIX-OPENSUSE optional_devpi_process.patch bsc#[0-9]+ mc...@suse.com +# Make use devpi_process optional +Patch0: optional_devpi_process.patch +# PATCH-FEATURE-UPSTREAM mark-network-tests.patch bsc#[0-9]+ mc...@suse.com +# to skip test which require network access +Patch1: mark-network-tests.patch +BuildRequires: %{python_module build >= 0.10.0} +BuildRequires: %{python_module cachetools >= 5.3} +BuildRequires: %{python_module chardet >= 5.1} +BuildRequires: %{python_module colorama >= 0.4.6} +BuildRequires: %{python_module filelock >= 3.11.0} +BuildRequires: %{python_module hatch >= 0.3} +BuildRequires: %{python_module hatch_vcs} +BuildRequires: %{python_module hatchling >= 1.14} +BuildRequires: %{python_module packaging >= 23.1} BuildRequires: %{python_module pip} -BuildRequires: %{python_module pluggy >= 0.12.0} +BuildRequires: %{python_module platformdirs >= 3.2} +BuildRequires: %{python_module pluggy >= 1.0.0} BuildRequires: %{python_module poetry-core} BuildRequires: %{python_module py >= 1.4.17} +BuildRequires: %{python_module pyproject-api >= 1.5.1} BuildRequires: %{python_module pytoml >= 0.1} +BuildRequires: %{python_module re-assert} BuildRequires: %{python_module setuptools >= 41.0.1} BuildRequires: %{python_module setuptools_scm >= 2.0.0} BuildRequires: %{python_module six >= 1.14.0} +BuildRequires: %{python_module time-machine} BuildRequires: %{python_module toml >= 0.9.4} BuildRequires: %{python_module tomli >= 2.0.1} -BuildRequires: %{python_module virtualenv >= 20.0.8} +BuildRequires: %{python_module virtualenv >= 20.21.0} BuildRequires: %{python_module wheel >= 0.29.0} +%if %{with devpi_process} +BuildRequires: %{python_module devpi-process} +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip BuildRequires: (python3-importlib-metadata >= 0.12 if python3-base < 3.8) BuildRequires: (python36-importlib-metadata >= 0.12 if python36-base) Requires: python-backports.entry_points_selectable >= 1.0.4 +Requires: python-build >= 0.10.0 Requires: python-filelock >= 3.0.0 Requires: python-packaging >= 14 Requires: python-pip @@ -90,6 +117,10 @@ %prep %setup -q -n tox-%{version} +%if %{without devpi_process} +%patch0 -p1 +%endif +%autopatch -p1 -m 1 %build export LANG=en_US.UTF8 @@ -99,7 +130,6 @@ export LANG=en_US.UTF8 %pyproject_install %python_clone -a %{buildroot}%{_bindir}/tox -%python_clone -a %{buildroot}%{_bindir}/tox-quickstart %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -115,6 +145,10 @@ donttest+=" or test_toxuone_env" donttest+=" or test_isolated_build_backend_missing_hook" donttest+=" or test_parallel_live or (test_parallel and not test_parallel_)" +# gh#tox-dev/tox#3011 +donttest+=" or test_replace_env_var_circular_flip_flop" +# +donttest+=" or test_call_as_exe or test_skip_pkg_install" %{python_expand # tests expect an active virtualenv with a clean python name as sys.executable virtualenv-%{$python_bin_suffix} --system-site-packages testenv-%{$python_bin_suffix} @@ -125,16 +159,15 @@ } %post -%python_install_alternative tox tox-quickstart +%python_install_alternative tox %postun %python_uninstall_alternative tox %files %{python_files} %license LICENSE -%doc README.md docs/changelog.rst CONTRIBUTORS CONTRIBUTING.rst +%doc README.md %python_alternative %{_bindir}/tox -%python_alternative %{_bindir}/tox-quickstart %{python_sitelib}/tox-%{version}*-info %{python_sitelib}/tox ++++++ _constraints ++++++ <constraints> <hardware> <physicalmemory> <size unit="G">10</size> </physicalmemory> <disk> <size unit="G">24</size> </disk> </hardware> </constraints> ++++++ mark-network-tests.patch ++++++ --- pyproject.toml | 3 +++ tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py | 1 + 2 files changed, 4 insertions(+) --- a/pyproject.toml +++ b/pyproject.toml @@ -162,6 +162,9 @@ ignore = [ [tool.pytest.ini_options] testpaths = ["tests"] addopts = "--tb=auto -ra --showlocals --no-success-flaky-report" +markers = [ + "network: tests requiring network connection", +] [tool.towncrier] name = "tox" --- 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 @@ -74,6 +74,7 @@ def test_install_pkg_via(tox_project: To @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] ++++++ optional_devpi_process.patch ++++++ --- src/tox/pytest.py | 6 +++++- tests/test_provision.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) --- a/src/tox/pytest.py +++ b/src/tox/pytest.py @@ -26,7 +26,10 @@ from _pytest.logging import LogCaptureFi from _pytest.monkeypatch import MonkeyPatch from _pytest.python import Function from _pytest.tmpdir import TempPathFactory -from devpi_process import IndexServer +try: + from devpi_process import IndexServer +except ImportError: + IndexServer = None from pytest_mock import MockerFixture from virtualenv.info import fs_supports_symlink @@ -473,6 +476,7 @@ def enable_pypi_server(monkeypatch: Monk @pytest.fixture(scope="session") +@pytest.mark.skipif(IndexServer is None, reason="requires devpi_process") def pypi_server(tmp_path_factory: TempPathFactory) -> Iterator[IndexServer]: # takes around 2.5s path = tmp_path_factory.mktemp("pypi") --- a/tests/test_provision.py +++ b/tests/test_provision.py @@ -12,7 +12,11 @@ from unittest import mock from zipfile import ZipFile import pytest -from devpi_process import Index, IndexServer +try: + from devpi_process import Index, IndexServer +except ImportError: + Index = None + IndexServer = None from filelock import FileLock from packaging.requirements import Requirement ++++++ tox-3.26.0.tar.gz -> tox-4.5.1.tar.gz ++++++ ++++ 46812 lines of diff (skipped)
