forked from pool/python-tox
Accepting request 1161549 from home:dancermak:branches:devel:languages:python
New upstream release 4.14.2 OBS-URL: https://build.opensuse.org/request/show/1161549 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=119
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
Index: tox-4.11.1/src/tox/pytest.py
|
||||
===================================================================
|
||||
--- tox-4.11.1.orig/src/tox/pytest.py
|
||||
+++ tox-4.11.1/src/tox/pytest.py
|
||||
@@ -16,7 +16,10 @@ from typing import TYPE_CHECKING, Any, C
|
||||
|
||||
import pytest
|
||||
from _pytest.fixtures import SubRequest
|
||||
-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
|
||||
Index: tox-4.11.1/tests/test_provision.py
|
||||
===================================================================
|
||||
--- tox-4.11.1.orig/tests/test_provision.py
|
||||
+++ tox-4.11.1/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
|
||||
|
Reference in New Issue
Block a user