Update to 4.30.3
- Fixes: rhbz#2393223
This commit is contained in:
parent
6e8b540f1f
commit
4685d09abf
3 changed files with 24 additions and 29 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From 1e9b70829b06f6e972b23ee909db56366a48f025 Mon Sep 17 00:00:00 2001
|
||||
From 276688b3d884787663a1832990025c3402770961 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
|
||||
Date: Fri, 28 Mar 2025 09:44:24 +0100
|
||||
Subject: [PATCH] Fix tests
|
||||
|
|
@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit
|
|||
Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
|
||||
Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
|
||||
---
|
||||
pyproject.toml | 10 +---------
|
||||
src/tox/pytest.py | 16 +++-------------
|
||||
tests/test_provision.py | 18 ++----------------
|
||||
.../package/test_python_package_util.py | 10 ++++++++--
|
||||
4 files changed, 14 insertions(+), 40 deletions(-)
|
||||
pyproject.toml | 10 +---------
|
||||
src/tox/pytest.py | 16 +++-------------
|
||||
tests/test_provision.py | 11 ++++-------
|
||||
.../package/test_python_package_util.py | 10 ++++++++--
|
||||
4 files changed, 16 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index a7323bf..ed9b315 100644
|
||||
|
|
@ -100,35 +100,30 @@ index bfdc7e6..9a02df3 100644
|
|||
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 0cf4de5..9505bf1 100644
|
||||
index 2cde4f6..0baba46 100644
|
||||
--- a/tests/test_provision.py
|
||||
+++ b/tests/test_provision.py
|
||||
@@ -101,22 +101,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path]
|
||||
return result
|
||||
@@ -124,15 +124,13 @@ def _use_pypi_index(pypi_index: Index, monkeypatch: MonkeyPatch) -> None:
|
||||
|
||||
|
||||
-@pytest.fixture(scope="session")
|
||||
-def pypi_index_self(pypi_server: IndexServer, tox_wheels: list[Path], demo_pkg_inline_wheel: Path) -> Index:
|
||||
- with elapsed("start devpi and create index"): # takes around 1s
|
||||
- self_index = pypi_server.create_index("self", "volatile=False")
|
||||
- with elapsed("upload tox and its wheels to devpi"): # takes around 3.2s on build
|
||||
- self_index.upload(*tox_wheels, demo_pkg_inline_wheel)
|
||||
- return self_index
|
||||
-
|
||||
-
|
||||
@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():
|
||||
-def _pypi_index_mirrored(local_pypi_indexes: tuple[Index, Index], monkeypatch: MonkeyPatch) -> None:
|
||||
- pypi_index_mirrored, _ = local_pypi_indexes
|
||||
- _use_pypi_index(pypi_index_mirrored, monkeypatch)
|
||||
+def _pypi_index_mirrored() -> None:
|
||||
+ pytest.skip("needs devpi-process")
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
-def _pypi_index_self(local_pypi_indexes: tuple[Index, Index], monkeypatch: MonkeyPatch) -> None:
|
||||
- _, pypi_index_self = local_pypi_indexes
|
||||
- _use_pypi_index(pypi_index_self, monkeypatch)
|
||||
+def _pypi_index_self() -> None:
|
||||
+ pytest.skip("needs devpi-process")
|
||||
|
||||
|
||||
def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None:
|
||||
ini = "[tox]\nrequires = pkg-does-not-exist\n setuptools==1\nskipsdist=true\n"
|
||||
@@ -164,7 +151,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
|
||||
@@ -181,7 +179,6 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -
|
||||
|
||||
|
||||
@pytest.mark.integration
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
%undefine _py3_shebang_s
|
||||
|
||||
Name: python-tox
|
||||
Version: 4.30.1
|
||||
Version: 4.30.3
|
||||
Release: %autorelease
|
||||
Summary: Virtualenv-based automation of test activities
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (tox-4.30.1.tar.gz) = 55fd7a07d697faedde4fa3ed586b56cc6bba4c9ab73620ee9f6a33dddff674af0bb5d58897b3bd844aefa5b8cae0b1c159407245f9c4457c4fa77201b2cbbb0b
|
||||
SHA512 (tox-4.30.3.tar.gz) = c4ef909b7e369844042f26ae4c492ec4c78cd0efe11af80f36159304166cd6e77b75b8191de0e78870f414c921230402bccdfda5ceeb56e4194abc66f076f720
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue