From 7b1b883a2f1258f2571f4dfbb2e739ed9c264b1edf0159150280bb0ab186c451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Sat, 28 Dec 2019 18:20:37 +0000
Subject: [PATCH] osc copypac from project:devel:languages:python:pytest
 package:python-pytest-shutil revision:6, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-shutil?expand=0&rev=9
---
 fix_pathlib.patch            | 50 ------------------------------------
 python-pytest-shutil.changes |  6 -----
 python-pytest-shutil.spec    |  7 +++--
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 fix_pathlib.patch

diff --git a/fix_pathlib.patch b/fix_pathlib.patch
deleted file mode 100644
index 6bb99ca..0000000
--- a/fix_pathlib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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)
- 
- 
diff --git a/python-pytest-shutil.changes b/python-pytest-shutil.changes
index 06108ee..8db1594 100644
--- a/python-pytest-shutil.changes
+++ b/python-pytest-shutil.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Sat Dec 28 17:36:29 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
-
-- fix dependency on python-path.py
-- add fix_pathlib.patch
-
 -------------------------------------------------------------------
 Mon Jun  3 09:07:17 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-pytest-shutil.spec b/python-pytest-shutil.spec
index bb0e3b6..4823278 100644
--- a/python-pytest-shutil.spec
+++ b/python-pytest-shutil.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pytest-shutil
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,6 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/manahl/pytest-plugins
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-shutil/pytest-shutil-%{version}.tar.gz
-Patch0:         fix_pathlib.patch
 BuildRequires:  %{python_module execnet}
 BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module path.py}
@@ -39,12 +38,12 @@ BuildRequires:  python-contextlib2
 BuildRequires:  python-rpm-macros
 Requires:       python-execnet
 Requires:       python-mock
+Requires:       python-path.py
 Requires:       python-pytest
 Requires:       python-six
 Requires:       python-termcolor
 %ifpython2
 Requires:       python-contextlib2
-Requires:       python-path.py
 %endif
 BuildArch:      noarch
 
@@ -56,7 +55,7 @@ tools for automated tests.
 
 %prep
 %setup -q -n pytest-shutil-%{version}
-%patch0 -p1
+sed -i '/contextlib2/d' setup.py
 
 %build
 %python_build