Update to 4.16.0
- https://tox.wiki/en/latest/changelog.html#v4-16-0-2024-07-02 - Fixes: rhbz#2277427
This commit is contained in:
parent
8f8f276708
commit
b7f56e2c59
3 changed files with 41 additions and 27 deletions
|
|
@ -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 <lbalhar@redhat.com>
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (tox-4.14.2.tar.gz) = 45bbd3f8d00eee05158452295230321947ec16a8bfff43e84ea9825d514976526f3889709255ed042cfb7a7ebfed020707cfc2d25b69ce90c148f4472092350d
|
||||
SHA512 (tox-4.16.0.tar.gz) = b3d65c5b4f086f1f0474d6cb08d3d4bcdf81735376a94e97997ab5dee5c726e71e8b9a1117eda59f9afd61be0bff38a9533faf16e76b78b504ff6de0f2ddfde0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue