Steve Kowalik
42047f7696
## Features:
* Support installing extras from the current project in dependency groups.
* Add support for conditional set_env using PEP-496 environment markers.
* Add __TOX_ENVIRONMENT_VARIABLE_ORIGINAL_CI, which passes through the CI
variable if present.
* A new tox life cycle event is now exposed for use via Plugins API.
* Pass ssh-agent variables SSH_AGENT_PID and SSH_AUTH_SOCK in pass_env by
default.
* Added constraints to allow specifying constraints files for all
dependencies.
* Allow disabling tox plugins via the TOX_DISABLED_EXTERNAL_PLUGINS
environment variable.
## Bugfixes:
* Fix wheel corruption errors when the build backend updates the file in
place.
* Expand braced range syntax in all internal sections of tox.ini
(e.g. deps, testenv).
* Fix None appearing as the config filename in error output when the user's
default config file is corrupt.
* Previously, when tox ran in an automatically provisioned environment, it
could hang waiting for a PEP 517 build backend if used in conjunction
with the --installpkg option.
* Prevent tox from hanging upon exit due to orphaned build threads and
subprocesses when the --installpkg option is used with sdist.
* Makes the error message more clear when pyproject.toml file cannot be
loaded or is missing expected keys.
* The tox_extend_envs() hook recently added turned out to not work well
with tox run. It was fixed internally, not to exhaust the underlying
iterator on the first use.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=135
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 48abffc7beea8884717bcb631f921a1b7f58bb6d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@suse.com>
|
|
Date: Mon, 25 Mar 2024 20:15:19 +0100
|
|
Subject: [PATCH 1/2] Make use of devpi_process optional
|
|
|
|
Also skip tests using the enable_pip_pypi_access_fixture, as these tests require
|
|
the devpi server and can break without it
|
|
---
|
|
src/tox/pytest.py | 6 +++++-
|
|
tests/test_provision.py | 5 ++++-
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
Index: tox-4.34.1/src/tox/pytest.py
|
|
===================================================================
|
|
--- tox-4.34.1.orig/src/tox/pytest.py
|
|
+++ tox-4.34.1/src/tox/pytest.py
|
|
@@ -17,7 +17,10 @@ from typing import TYPE_CHECKING, Any, P
|
|
|
|
import pytest
|
|
from _pytest.fixtures import SubRequest # noqa: PLC2701
|
|
-from devpi_process import IndexServer
|
|
+try:
|
|
+ from devpi_process import IndexServer
|
|
+except ImportError:
|
|
+ IndexServer = None
|
|
from virtualenv.info import fs_supports_symlink
|
|
|
|
import tox.run
|
|
@@ -514,6 +517,7 @@ def enable_pip_pypi_access_fixture(
|
|
"""Set a fake pip index url, tests that want to use a pypi server should create and overwrite this."""
|
|
_, previous_url = disable_pip_pypi_access
|
|
enable_pypi_server(monkeypatch, previous_url)
|
|
+ pytest.skip()
|
|
return previous_url
|
|
|
|
|
|
Index: tox-4.34.1/tests/test_provision.py
|
|
===================================================================
|
|
--- tox-4.34.1.orig/tests/test_provision.py
|
|
+++ tox-4.34.1/tests/test_provision.py
|
|
@@ -19,7 +19,10 @@ if TYPE_CHECKING:
|
|
from collections.abc import Callable, Iterator, Sequence
|
|
|
|
from build import DistributionType
|
|
- from devpi_process import Index, IndexServer
|
|
+ try:
|
|
+ from devpi_process import Index, IndexServer
|
|
+ except ImportError:
|
|
+ Index, IndexServer = None, None
|
|
|
|
from tox.pytest import MonkeyPatch, TempPathFactory, ToxProjectCreator
|
|
|