Matej Cepl
13c8c75f90
- Support external tox.pytest usage via "test" extra in #3422 - Changes from 4.23.1 - Docs: adjusting EOL Python version testing remarks in #3417 - Fix example docs in #3421 - Changes from 4.23.0 - replace tool.pyproject and tool.tox.pyproject with tool.tox in config… in #3411 - Add NETRC to the default_pass_env list in #3410 - Changes from 4.22.0 - Fix the fix environment definition in #3407 - Expose type checking dependencies into an extra in #3404 - Add dependency-groups support (PEP-735) in #3409 - Changes from 4.21.2 - Update sdist rules to include tox.toml (#3389) in #3390 - Changes from 4.21.1 - Fix TOML configuration errors in #3388 - Changes from 4.21.0 - Update Loader docs in #3352 - True TOML config support in #3353 - Changes from 4.20.0 - Separate list dependencies to a separate installer class in #3347 - Changes from 4.19.0 - Add pypy-major.minor environment name support in #3346 - Changes from 4.18.1 - Fixup the spec string for sys.executable in #3327 - Fix issue link in changelog in #3332 - Properly document the tox_env_teardown hook in #3333 - Add 3.13 to CI and bump deps in #3339 - Changes from 4.18.0 - Fix #3278 - Boost temporary directories cleanup in tests in #3323 - Fix absolute base python paths conflicting in #3325 - Fix #3318 - Suppress spinner in parallel runs in CI in #3321 - Changes from 4.17.1 - Fix user guide system overview so nodes don't overlap. in #3307 - Table with list of default env vars per OS in #3291 - Add GraalPy and test both GraalPy and Jython env identifiers in #3312 - Add on platform constat to core in #3315 - Changes from 4.17.0 - Fix user guide system overview so nodes don't overlap. in #3307 - Table with list of default env vars per OS in #3291 - Add GraalPy and test both GraalPy and Jython env identifiers in #3312 - Add on platform constat to core in #3315 - Changes from 4.16.0 - Fix two small documentation issues in #3297 - Fix tests after new setuptools in #3299 - Add windir to the default list of pass_env variables on Windows in #3303 - Changes from 4.15.1 - fix skip with package = wheel in #3269 - Fixed typo in user guide. in #3277 - Fix broad build privileges @ GHA release workflow in #3281 - Allow ConfigSet.add_config to receive parameterized generics for of_type. in #3288 - Fix section substitution with setenv in #3289 - Changes from 4.15.0 - Remove duplicated and misleading configuration section in #3251 - Fix dropped leading characters c from constraints' packages in #3250 - Fix type-checking in #3260 - Update installation.rst in #3257 - Allow appending to deps with the command line in #3259 - Support multiple override appends in #3261 - Add bang to invert exit code in #3271 - fix(parser): Fix --discover parsed incorrectly from env in #3274 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=127
56 lines
1.8 KiB
Diff
56 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(-)
|
|
|
|
diff --git a/src/tox/pytest.py b/src/tox/pytest.py
|
|
index d734defd..f9e5ae10 100644
|
|
--- a/src/tox/pytest.py
|
|
+++ b/src/tox/pytest.py
|
|
@@ -17,7 +17,10 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c
|
|
|
|
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
|
|
@@ -507,6 +510,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
|
|
|
|
|
|
diff --git a/tests/test_provision.py b/tests/test_provision.py
|
|
index 41eb630e..88cefb76 100644
|
|
--- a/tests/test_provision.py
|
|
+++ b/tests/test_provision.py
|
|
@@ -16,7 +16,10 @@ from filelock import FileLock
|
|
from packaging.requirements import Requirement
|
|
|
|
if TYPE_CHECKING:
|
|
- 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
|
|
|
|
--
|
|
2.44.0
|
|
|