- Update to 5.7.0:

* Various fixes to build with updated kernel/etc.
- Remove merged patch pr_1665.patch and pr_1364.patch
- Update patch skip-obs.patch
- Remove skip-test-missing-warnings.patch as it can be fixed by
  properly calling the tests

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=115

python-psutil.spec

@@ -22,18 +22,16 @@
 %else
 %bcond_with     test
 %endif
+%bcond_without python2
 Name:           python-psutil
-Version:        5.6.7
+Version:        5.7.0
 Release:        0
 Summary:        A process utilities module for Python
 License:        BSD-3-Clause
 URL:            https://github.com/giampaolo/psutil
 Source:         https://files.pythonhosted.org/packages/source/p/psutil/psutil-%{version}.tar.gz
-Patch0:         pr_1364.patch
-Patch1:         skip-test-missing-warnings.patch
-Patch2:         skip-flaky-i586.patch
-Patch3:         skip-obs.patch
-Patch4:         pr_1665.patch
+Patch0:         skip-flaky-i586.patch
+Patch1:         skip-obs.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -43,9 +41,11 @@ Requires:       procps
 %if %{with test}
 BuildRequires:  net-tools
 BuildRequires:  procps
+%if %{with python2}
 BuildRequires:  python-ipaddress
 BuildRequires:  python-mock
 %endif
+%endif
 %ifpython2
 Requires:       python-ipaddress
 %endif
@@ -56,11 +56,7 @@ A graphical interface that lets you easily analyze and introspect unaltered runn
 
 %prep
 %setup -q -n psutil-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%autopatch -p1
 
 # Remove shebangs
 sed -i "1s/#!.*//" psutil/{__init__.py,_compat.py,_psbsd.py,_pslinux.py,_psosx.py,_psposix.py,_pssunos.py,_pswindows.py}
@@ -74,7 +70,6 @@ sed -i "1s/#!.*//" psutil/{__init__.py,_compat.py,_psbsd.py,_pslinux.py,_psosx.p
 %{python_expand mkdir -p %{buildroot}%{_docdir}/%{$python_prefix}-psutil
 cp -r scripts %{buildroot}%{_docdir}/%{$python_prefix}-psutil/
 find %{buildroot}%{_docdir}/%{$python_prefix}-psutil/scripts/ -type f -name "*.py" -exec sed -i "s|#!%{_bindir}/env python|#!%__$python|" {} \;
-rm -r %{buildroot}%{$python_sitearch}/psutil/tests/
 %fdupes %{buildroot}%{_docdir}/%{$python_prefix}-psutil/
 %fdupes %{buildroot}%{$python_sitearch}
 }
@@ -86,12 +81,7 @@ export PSUTIL_TESTING=1
 export TRAVIS=1
 
 # Note test_fetch_all is a bit flaky, occasionally failing
-%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
-cp -r scripts %{buildroot}%{$python_sitearch}/
-cp -r psutil/tests %{buildroot}%{$python_sitearch}/psutil
-$python -W default %{buildroot}%{$python_sitearch}/psutil/tests/__main__.py
-rm -r %{buildroot}%{$python_sitearch}/scripts %{buildroot}%{$python_sitearch}/psutil/tests
-}
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -Wa psutil/tests/runner.py
 %endif
 
 %files %{python_files}