python/tox: update to 4.14.2

Marcel Telka

2024-03-24 5e351eeec8ce5de11c241b8fe0e162db55393055

python/tox: update to 4.14.2

 components/python/tox/Makefile

@@ -19,11 +19,11 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =        tox
HUMAN_VERSION =            4.14.1
HUMAN_VERSION =            4.14.2
COMPONENT_SUMMARY =        tox - tox is a generic virtualenv management and test command line tool
COMPONENT_PROJECT_URL =        http://tox.readthedocs.org
COMPONENT_ARCHIVE_HASH =    \
    sha256:f0ad758c3bbf7e237059c929d3595479363c3cdd5a06ac3e49d1dd020ffbee45
    sha256:0defb44f6dafd911b61788325741cc6b2e12ea71f987ac025ad4d649f1f1a104
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE


 components/python/tox/patches/01-test-no-devpi_process.patch

@@ -1,7 +1,7 @@
We do not have devpi_process available (yet)

--- tox-4.14.1/pyproject.toml.orig
+++ tox-4.14.1/pyproject.toml
--- tox-4.14.2/pyproject.toml.orig
+++ tox-4.14.2/pyproject.toml
@@ -74,7 +74,6 @@
   "build[virtualenv]>=1.0.3",
   "covdefaults>=2.3",
@@ -10,8 +10,8 @@
   "diff-cover>=8.0.2",
   "distlib>=0.3.8",
   "flaky>=3.7",
--- tox-4.14.1/src/tox/pytest.py.orig
+++ tox-4.14.1/src/tox/pytest.py
--- tox-4.14.2/src/tox/pytest.py.orig
+++ tox-4.14.2/src/tox/pytest.py
@@ -17,7 +17,6 @@
 
 import pytest
@@ -36,8 +36,8 @@
 def _invalid_index_fake_port() -> int:  # noqa: PT005
     with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as socket_handler:
         socket_handler.bind(("", 0))
--- tox-4.14.1/tests/test_provision.py.orig
+++ tox-4.14.1/tests/test_provision.py
--- tox-4.14.2/tests/test_provision.py.orig
+++ tox-4.14.2/tests/test_provision.py
@@ -16,8 +16,6 @@
 from packaging.requirements import Requirement
 
@@ -71,7 +71,7 @@
 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")
@@ -122,110 +103,9 @@
@@ -122,96 +103,6 @@
 
 
 @pytest.mark.integration()
@@ -168,11 +168,10 @@
 def test_provision_plugin_runner_in_provision(tox_project: ToxProjectCreator, tmp_path: Path) -> None:
     """Ensure that provision environment can be explicitly configured."""
     log = tmp_path / "out.log"
     proj = tox_project({"tox.ini": "[tox]\nrequires=somepkg123xyz\n[testenv:.tox]\nrunner=example"})
     with pytest.raises(KeyError, match="example"):
@@ -220,17 +111,6 @@
         proj.run("r", "-e", "py", "--result-json", str(log))
-
-
 
 
-@pytest.mark.integration()
-@pytest.mark.usefixtures("_pypi_index_self")
-@pytest.mark.parametrize("relative_path", [True, False], ids=["relative", "absolute"])
@@ -182,3 +181,18 @@
-    conf_path = str(Path(project.path.name) / "tox.ini") if relative_path else str(project.path / "tox.ini")
-    result = project.run("c", "--conf", conf_path, "-e", "py", from_cwd=tmp_path)
-    result.assert_success()
-
-
 @pytest.mark.parametrize("subcommand", ["r", "p", "de", "l", "d", "c", "q", "e", "le"])
 def test_provision_default_arguments_exists(tox_project: ToxProjectCreator, subcommand: str) -> None:
     ini = r"""
--- tox-4.14.2/PKG-INFO.orig
+++ tox-4.14.2/PKG-INFO
@@ -54,7 +54,6 @@
 Requires-Dist: build[virtualenv]>=1.0.3; extra == 'testing'
 Requires-Dist: covdefaults>=2.3; extra == 'testing'
 Requires-Dist: detect-test-pollution>=1.2; extra == 'testing'
-Requires-Dist: devpi-process>=1; extra == 'testing'
 Requires-Dist: diff-cover>=8.0.2; extra == 'testing'
 Requires-Dist: distlib>=0.3.8; extra == 'testing'
 Requires-Dist: flaky>=3.7; extra == 'testing'

 components/python/tox/patches/03-tox-cov-proto.patch

@@ -1,7 +1,7 @@
We test in proto area not in site-packages.

--- tox-4.14.1/tox.ini.orig
+++ tox-4.14.1/tox.ini
--- tox-4.14.2/tox.ini.orig
+++ tox-4.14.2/tox.ini
@@ -28,7 +28,7 @@
     COVERAGE_PROCESS_START = {toxinidir}{/}pyproject.toml
 commands =

 components/python/tox/patches/04-test-tox-path.patch

@@ -1,5 +1,5 @@
--- tox-4.14.1/tests/test_call_modes.py.orig
+++ tox-4.14.1/tests/test_call_modes.py
--- tox-4.14.2/tests/test_call_modes.py.orig
+++ tox-4.14.2/tests/test_call_modes.py
@@ -14,4 +14,4 @@
 
 

 components/python/tox/patches/05-tox-current-env.patch

@@ -1,5 +1,5 @@
--- tox-4.14.1/tests/test_version.py.orig
+++ tox-4.14.1/tests/test_version.py
--- tox-4.14.2/tests/test_version.py.orig
+++ tox-4.14.2/tests/test_version.py
@@ -11,11 +11,14 @@
 
     from tox.pytest import ToxProjectCreator
@@ -15,8 +15,8 @@
 def test_version_without_plugin(tox_project: ToxProjectCreator) -> None:
     outcome = tox_project({"tox.ini": ""}).run("--version")
     outcome.assert_success()
--- tox-4.14.1/tests/config/cli/test_cli_env_var.py.orig
+++ tox-4.14.1/tests/config/cli/test_cli_env_var.py
--- tox-4.14.2/tests/config/cli/test_cli_env_var.py.orig
+++ tox-4.14.2/tests/config/cli/test_cli_env_var.py
@@ -67,6 +67,9 @@
         "labels": [],
         "skip_env": "",
@@ -37,8 +37,8 @@
     }
     assert options.parsed.verbosity == 4
     assert options.cmd_handlers == core_handlers
--- tox-4.14.1/tests/config/cli/test_cli_ini.py.orig
+++ tox-4.14.1/tests/config/cli/test_cli_ini.py
--- tox-4.14.2/tests/config/cli/test_cli_ini.py.orig
+++ tox-4.14.2/tests/config/cli/test_cli_ini.py
@@ -56,6 +56,9 @@
         "exit_and_dump_after": 0,
         "skip_env": "",

 components/python/tox/patches/06-no-diff-cover.patch

@@ -1,7 +1,7 @@
We cannot compare against origin/main branch because we build from sdist, not git.

--- tox-4.14.1/tox.ini.orig
+++ tox-4.14.1/tox.ini
--- tox-4.14.2/tox.ini.orig
+++ tox-4.14.2/tox.ini
@@ -34,7 +34,6 @@
       --cov-report xml:{toxworkdir}{/}coverage.{envname}.xml \
       -n={env:PYTEST_XDIST_AUTO_NUM_WORKERS:auto} \
@@ -10,8 +10,8 @@
 
 [testenv:fix]
 description = format the code base to adhere to our styles, and complain about what we cannot do automatically
--- tox-4.14.1/pyproject.toml.orig
+++ tox-4.14.1/pyproject.toml
--- tox-4.14.2/pyproject.toml.orig
+++ tox-4.14.2/pyproject.toml
@@ -74,7 +74,6 @@
   "build[virtualenv]>=1.0.3",
   "covdefaults>=2.3",
@@ -20,3 +20,13 @@
   "distlib>=0.3.8",
   "flaky>=3.7",
   "hatch-vcs>=0.4",
--- tox-4.14.2/PKG-INFO.orig
+++ tox-4.14.2/PKG-INFO
@@ -54,7 +54,6 @@
 Requires-Dist: build[virtualenv]>=1.0.3; extra == 'testing'
 Requires-Dist: covdefaults>=2.3; extra == 'testing'
 Requires-Dist: detect-test-pollution>=1.2; extra == 'testing'
-Requires-Dist: diff-cover>=8.0.2; extra == 'testing'
 Requires-Dist: distlib>=0.3.8; extra == 'testing'
 Requires-Dist: flaky>=3.7; extra == 'testing'
 Requires-Dist: hatch-vcs>=0.4; extra == 'testing'

 components/python/tox/test/results-all.master

@@ -5,7 +5,7 @@
cachedir: .tox/py$(PYV)/.pytest_cache
rootdir: $(@D)
configfile: pyproject.toml
X workers [1697 items]
X workers [1706 items]

scheduling tests via LoadScheduling

@@ -1314,6 +1314,15 @@
tests/session/test_session_common.py::test_cli_env_str[val3-<env_list>] PASSED
tests/test_call_modes.py::test_call_as_exe PASSED
tests/test_call_modes.py::test_call_as_module PASSED
tests/test_provision.py::test_provision_default_arguments_exists[c] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[d] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[de] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[e] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[l] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[le] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[p] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[q] PASSED
tests/test_provision.py::test_provision_default_arguments_exists[r] PASSED
tests/test_provision.py::test_provision_plugin_runner_in_provision PASSED
tests/test_provision.py::test_provision_requires_nok PASSED
tests/test_report.py::test_setup_report[0-off] PASSED
@@ -1722,13 +1731,13 @@
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
- generated xml file: $(@D)/.tox/junit.py$(PYV).xml -

173 files skipped due to complete coverage.
174 files skipped due to complete coverage.
Coverage HTML written to dir $(@D)/.tox/py$(PYV)/tmp/htmlcov
Coverage XML written to file $(@D)/.tox/coverage.py$(PYV).xml

Required test coverage of 88.0% reached. Total coverage: 98.71%
Required test coverage of 88.0% reached. Total coverage: 98.76%
============================= slowest 5 durations ==============================
=========================== short test summary info ============================
======== 1696 passed, 1 skipped, 7 warnings ========
======== 1705 passed, 1 skipped, 7 warnings ========
  py$(PYV): OK
  congratulations :)