!22 Remove buildrequires python3-contextlib

From: @cherry530 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

0001-modified-path-to-fix-testcase.patch

@@ -1,25 +0,0 @@
-From b960d8d90235218a3e1f66a2e59420087e27c14a Mon Sep 17 00:00:00 2001
-Subject: [PATCH] cmdline
-
----
- tests/integration/test_cmdline_integration.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/integration/test_cmdline_integration.py b/tests/integration/test_cmdline_integration.py
-index 8d92a2e..e99831f 100644
---- a/tests/integration/test_cmdline_integration.py
-+++ b/tests/integration/test_cmdline_integration.py
-@@ -5,6 +5,7 @@ from pytest_shutil import cmdline
- 
- def test_chdir():
-     here = os.getcwd()
-+    bindir=os.path.realpath('/bin')
-     with cmdline.chdir('/bin'):
--        assert os.getcwd() == '/bin'
--    assert os.getcwd() == here
-\ No newline at end of file
-+        assert os.getcwd() == bindir
-+    assert os.getcwd() == here
--- 
-2.23.0
-

python-pytest-shutil.spec

@@ -1,16 +1,17 @@
 Name:           python-pytest-shutil
-Version:        1.2.6
-Release:        9
+Version:        1.7.0
+Release:        3
 Summary:        A goodie-bag of unix shell and environment tools for py.test
 License:        MIT
 URL:            https://pypi.python.org/pypi/pytest-shutil
-Source0:        https://files.pythonhosted.org/packages/f4/6c/c536c7bf1bd1d6a385eef074f581d513b4a5525b2bd5cc763f4870d66516/pytest-shutil-%{version}.tar.gz
-Patch0000:      0001-modified-path-to-fix-testcase.patch 
+Source0:        https://files.pythonhosted.org/packages/f7/fa/c1f7bfb61674f69fb2694bda0ef475a6b8b915a5c36105648dd58a6f200a/pytest-shutil-%{version}.tar.gz
+
+Patch0:         remove-require-contextlib2-on-python3.patch
 
 BuildArch:      noarch
 
-BuildRequires:  python3-contextlib2 python3-devel python3-execnet python3-mock
-BuildRequires:  python3-path python3-pytest python3-setuptools_git python3-six
+BuildRequires:  python3-devel python3-execnet python3-mock python3-wheel
+BuildRequires:  python3-path python3-pytest python3-pip python3-setuptools_git python3-termcolor
 
 %description
 This library is a goodie-bag of Unix shell and environment management tools for automated tests.
@@ -26,6 +27,9 @@ This library is a goodie-bag of Unix shell and environment management tools for
 %prep
 %autosetup -n pytest-shutil-%{version} -p1
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1702355
+sed -i -e 's|path.py|path|' setup.py
+
 %build
 %py3_build
 
@@ -33,13 +37,31 @@ This library is a goodie-bag of Unix shell and environment management tools for
 %py3_install
 
 %check
-%{__python3} setup.py test
+# Disable test_pretty_formatter test that fails in osc build but it works when run manually.
+# It should be something related to the shell and termcolor
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+pytest -k "not test_pretty_formatter"
 
 %files -n python3-pytest-shutil
 %doc README.md CHANGES.md
 %{python3_sitelib}/*
 
 %changelog
+* Mon Jul 31 2023 xu_ping <707078654@qq.com> - 1.7.0-3
+- remove buildrequires python3-contextlib2.
+
+* Fri May 05 2023 yaoxin <yao_xin001@hoperun.com> - 1.7.0-2
+- Fix compilation errors due to python-termcolor update to 2.3.0
+
+* Thu Jun 30 2022 caodongxia <caodongxia@h-partners.com> - 1.7.0-1
+- Update to 1.7.0
+
+* Mon Apr 25 2022 caodongxia<caodongxia@h-partners.com> - 1.2.6-11
+- add buildRequires to resolve compilation failure
+
+* Fri Mar 4 2022 zhaoshuang<zhaoshuang@uniontech.com> - 1.2.6-10
+- modify buildrequires to resolve build issue
+
 * Thu Sep 10 2020 Ge Wang<wangge20@huawei.com> - 1.2.6-9
 - Modify Source0 Url
 

remove-require-contextlib2-on-python3.patch

@@ -0,0 +1,22 @@
+From 2d6709e2fc7fba1e0d61e8dad03fa68bf19a9b0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Sun, 18 Aug 2019 10:46:37 +0200
+Subject: [PATCH] pytest-shutil: Only require contextlib2 on Python 2
+ 
+---
+ pytest-shutil/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ 
+diff --git a/pytest-shutil/setup.py b/pytest-shutil/setup.py
+index 70cc354..57f710d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,7 @@
+ 
+ install_requires = ['six',
+                     'execnet',
+-                    'contextlib2',
++                    'contextlib2;python_version<"3"',
+                     'pytest',
+                     'path.py',
+                     'mock',