Accepting request 1041723 from home:bnavigator:branches:devel:languages:python

- Require unittest2 only for python2: make this suitable for
  the 15.4_py39 target in devel:languages:python:backports.
- Merge skip-obs.patch into skip_failing_tests.patch and add
  test_linux.py::test_cpu_affinity because it depends on the
  obs vm-type or worker CPU.

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

python-psutil.spec

@@ -30,7 +30,6 @@ 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
-Patch1:         skip-obs.patch
 # PATCH-FIX-UPSTREAM skip_failing_tests.patch gh#giampaolo/psutil#1635 mcepl@suse.com
 # skip tests failing because of incomplete emulation of the environment in osc build
 Patch2:         skip_failing_tests.patch
@@ -46,12 +45,10 @@ Requires:       procps
 %if %{with test}
 BuildRequires:  net-tools
 BuildRequires:  procps
-%if 0%{?suse_version} < 1550
-BuildRequires:  %{python_module unittest2}
-%endif
 %if %{with python2}
 BuildRequires:  python-ipaddress
 BuildRequires:  python-mock
+BuildRequires:  python-unittest2
 %endif
 %endif
 %ifpython2