Ondřej Súkup
93876f418b
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-shutil?expand=0&rev=8
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
Index: pytest-shutil-1.7.0/pytest_shutil/workspace.py
|
|
===================================================================
|
|
--- pytest-shutil-1.7.0.orig/pytest_shutil/workspace.py
|
|
+++ pytest-shutil-1.7.0/pytest_shutil/workspace.py
|
|
@@ -8,9 +8,14 @@ import logging
|
|
import subprocess
|
|
|
|
try:
|
|
- from path import Path
|
|
+ from pathlib import Path
|
|
+ Path.isdir = Path.is_dir
|
|
+ Path.makedirs = Path.mkdir
|
|
except ImportError:
|
|
- from path import path as Path
|
|
+ try:
|
|
+ from path import Path
|
|
+ except ImportError:
|
|
+ from path import path as Path
|
|
|
|
import pytest
|
|
from six import string_types
|
|
Index: pytest-shutil-1.7.0/setup.py
|
|
===================================================================
|
|
--- pytest-shutil-1.7.0.orig/setup.py
|
|
+++ pytest-shutil-1.7.0/setup.py
|
|
@@ -24,9 +24,9 @@ classifiers = [
|
|
|
|
install_requires = ['six',
|
|
'execnet',
|
|
- 'contextlib2',
|
|
+ 'contextlib2;python_version<"3"',
|
|
'pytest',
|
|
- 'path.py',
|
|
+ 'path.py;python_version<"3"',
|
|
'mock',
|
|
'termcolor'
|
|
]
|
|
Index: pytest-shutil-1.7.0/tests/integration/test_run_integration.py
|
|
===================================================================
|
|
--- pytest-shutil-1.7.0.orig/tests/integration/test_run_integration.py
|
|
+++ pytest-shutil-1.7.0/tests/integration/test_run_integration.py
|
|
@@ -192,7 +192,7 @@ def test_run_in_subprocess_uses_passed_p
|
|
def test_run_in_subprocess_cd():
|
|
with workspace.Workspace() as ws:
|
|
with no_cov():
|
|
- cwd = run.run_in_subprocess(os.getcwd, cd=ws.workspace)()
|
|
+ cwd = run.run_in_subprocess(os.getcwd, cd=str(ws.workspace))()
|
|
assert os.path.realpath(cwd) == os.path.realpath(ws.workspace)
|
|
|
|
|