forked from pool/python-tox
Matej Cepl
5fbce3fe15
- Refresh mark-network-tests.patch for 4.11.1. - Rewrite optional_devpi_process.patch for 4.11.1. - Add explicit numpy built-time dependency, as the one pulled by pytest-randomly was broken. - Fix rpmlint warning: package was obsoleting itself. - Update to 4.11.1. - Please check the .changes file for a more complete changelog. OBS-URL: https://build.opensuse.org/request/show/1109638 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=109
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
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
|
|
|