Update to 4.20.0

- Fixes: rhbz#2302960
This commit is contained in:
Charalampos Stratakis 2024-10-01 03:34:39 +02:00
commit fc850ade5e
3 changed files with 20 additions and 19 deletions

View file

@ -1,4 +1,4 @@
From cb04460a432fb27ed42bce6f81f20e22a7938fa4 Mon Sep 17 00:00:00 2001
From f427195a0e23346ed11b21bba5b22b291881a894 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
@ -6,32 +6,32 @@ Subject: [PATCH] fix tests
---
pyproject.toml | 7 -------
src/tox/pytest.py | 16 +++-------------
tests/test_provision.py | 17 ++---------------
3 files changed, 5 insertions(+), 35 deletions(-)
tests/test_provision.py | 18 ++----------------
3 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 21bf402..5cd8470 100644
index d064329..e33c770 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -73,9 +73,6 @@ optional-dependencies.docs = [
]
optional-dependencies.testing = [
"build[virtualenv]>=1.2.1",
"build[virtualenv]>=1.2.2",
- "covdefaults>=2.3",
- "detect-test-pollution>=1.2",
- "devpi-process>=1",
"diff-cover>=9.1",
"diff-cover>=9.1.1",
"distlib>=0.3.8",
"flaky>=3.8.1",
@@ -83,7 +80,6 @@ optional-dependencies.testing = [
"hatchling>=1.25",
"psutil>=6",
"pytest>=8.2.2",
"pytest>=8.3.2",
- "pytest-cov>=5",
"pytest-mock>=3.14",
"pytest-xdist>=3.6.1",
"re-assert>=1.1",
@@ -186,9 +182,6 @@ report.omit = [
@@ -191,9 +187,6 @@ report.omit = [
"tests/type_check/*",
]
run.parallel = true
@ -42,7 +42,7 @@ index 21bf402..5cd8470 100644
[tool.towncrier]
name = "tox"
diff --git a/src/tox/pytest.py b/src/tox/pytest.py
index d734def..5e6df35 100644
index 54503e3..e676ac1 100644
--- a/src/tox/pytest.py
+++ b/src/tox/pytest.py
@@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c
@ -80,13 +80,13 @@ index d734def..5e6df35 100644
-
-
@pytest.fixture(scope="session")
def _invalid_index_fake_port() -> int: # noqa: PT005
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 2c3d4fc..06ddd48 100644
index 5b2b652..7657c2e 100644
--- a/tests/test_provision.py
+++ b/tests/test_provision.py
@@ -98,21 +98,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
@@ -98,22 +98,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
return result
@ -99,25 +99,26 @@ index 2c3d4fc..06ddd48 100644
- return self_index
-
-
@pytest.fixture()
@pytest.fixture
-def _pypi_index_self(pypi_index_self: Index, monkeypatch: MonkeyPatch) -> None:
- pypi_index_self.use()
- monkeypatch.setenv("PIP_INDEX_URL", pypi_index_self.url)
- monkeypatch.setenv("PIP_RETRIES", str(2))
- monkeypatch.setenv("PIP_TIMEOUT", str(5))
-
+def _pypi_index_self():
+ pytest.skip("needs devpi-process")
def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None:
@@ -161,7 +149,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
ini = "[tox]\nrequires = pkg-does-not-exist\n setuptools==1\nskipsdist=true\n"
@@ -161,7 +148,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
@pytest.mark.integration()
@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})
--
2.45.2
2.46.2

View file

@ -20,7 +20,7 @@
%undefine _py3_shebang_s
Name: python-tox
Version: 4.16.0
Version: 4.20.0
Release: %autorelease
Summary: Virtualenv-based automation of test activities

View file

@ -1 +1 @@
SHA512 (tox-4.16.0.tar.gz) = b3d65c5b4f086f1f0474d6cb08d3d4bcdf81735376a94e97997ab5dee5c726e71e8b9a1117eda59f9afd61be0bff38a9533faf16e76b78b504ff6de0f2ddfde0
SHA512 (tox-4.20.0.tar.gz) = c4b9a03a62c7d1993a8b027cd2f8f22fc033fa802176f20b0daeda84d528c5e8618ae9781f04c3d8820d9f49c5786d56b96dd596e95e489ac372631d61425616