- Add patch to skip more tests that won't work in OBS:

* skip-obs.patch

- Update to 5.6.3:
  * 1494: [AIX] added support for Process.environ(). (patch by Arnon Yaari)
  * 1276: [AIX] can't get whole cmdline(). (patch by Arnon Yaari)
  * 1501_: [Windows] Process cmdline() and exe() raise unhandled "WinError 1168 element not found" exceptions for "Registry" and "Memory Compression" psuedo processes on Windows 10.
  * 1526_: [NetBSD] process cmdline() could raise MemoryError. (patch by Kamil Rytarowski)

- Update to 5.6.2:
  * 1404: [Linux] cpu_count(logical=False) uses a second method (read from /sys/devices/system/cpu/cpu[0-9]/topology/core_id) in order to determine the number of physical CPUs in case /proc/cpuinfo does not provide this info.
  * 1458: provide coloured test output. Also show failures on KeyboardInterrupt.
  * 1464: various docfixes (always point to python3 doc, fix links, etc.).
  * 1478: add make command to re-run tests failed on last run.
  * 1456: [Linux] cpu_freq() returns None instead of 0.0 when min/max not available (patch by Alex Manuskin)
  * 1462: [Linux] (tests) make tests invariant to LANG setting (patch by Benjamin Drung)
  * 1463: cpu_distribution.py script was broken.
  * 1470: [Linux] disk_partitions(): fix corner case when /etc/mtab doesn't exist. (patch by Cedric Lamoriniere)
  * 1472: [Linux] cpu_freq() does not return all CPUs on Rasbperry-pi 3.
  * 1493: [Linux] cpu_freq(): handle the case where /sys/devices/system/cpu/cpufreq/ exists but is empty.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=107
This commit is contained in:
Tomáš Chvátal 2019-09-10 13:20:31 +00:00 committed by Git OBS Bridge
parent 4ea1b506ee
commit 96677b7ad7
5 changed files with 169 additions and 6 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa0a570e0a30b9dd618bffbece590ae15726b47f9f1eaf7518dfb35f4d7dcd21
size 427472

3
psutil-5.6.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3
size 435374

View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Tue Sep 10 13:08:41 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to skip more tests that won't work in OBS:
* skip-obs.patch
-------------------------------------------------------------------
Tue Jul 23 11:01:40 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 5.6.3:
* 1494: [AIX] added support for Process.environ(). (patch by Arnon Yaari)
* 1276: [AIX] can't get whole cmdline(). (patch by Arnon Yaari)
* 1501_: [Windows] Process cmdline() and exe() raise unhandled "WinError 1168 element not found" exceptions for "Registry" and "Memory Compression" psuedo processes on Windows 10.
* 1526_: [NetBSD] process cmdline() could raise MemoryError. (patch by Kamil Rytarowski)
-------------------------------------------------------------------
Sat May 25 13:16:59 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 5.6.2:
* 1404: [Linux] cpu_count(logical=False) uses a second method (read from /sys/devices/system/cpu/cpu[0-9]/topology/core_id) in order to determine the number of physical CPUs in case /proc/cpuinfo does not provide this info.
* 1458: provide coloured test output. Also show failures on KeyboardInterrupt.
* 1464: various docfixes (always point to python3 doc, fix links, etc.).
* 1478: add make command to re-run tests failed on last run.
* 1456: [Linux] cpu_freq() returns None instead of 0.0 when min/max not available (patch by Alex Manuskin)
* 1462: [Linux] (tests) make tests invariant to LANG setting (patch by Benjamin Drung)
* 1463: cpu_distribution.py script was broken.
* 1470: [Linux] disk_partitions(): fix corner case when /etc/mtab doesn't exist. (patch by Cedric Lamoriniere)
* 1472: [Linux] cpu_freq() does not return all CPUs on Rasbperry-pi 3.
* 1493: [Linux] cpu_freq(): handle the case where /sys/devices/system/cpu/cpufreq/ exists but is empty.
-------------------------------------------------------------------
Mon Mar 18 02:29:21 UTC 2019 - John Vandenberg <jayvdb@gmail.com>

View File

@ -16,14 +16,14 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%ifarch x86_64 %{ix86}
%bcond_without test
%else
%bcond_with test
%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-psutil
Version: 5.6.1
Version: 5.6.3
Release: 0
Summary: A process utilities module for Python
License: BSD-3-Clause
@ -33,6 +33,7 @@ Source: https://files.pythonhosted.org/packages/source/p/psutil/psutil-%
Patch0: pr_1364.patch
Patch1: skip-test-missing-warnings.patch
Patch2: skip-flaky-i586.patch
Patch3: skip-obs.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@ -58,6 +59,7 @@ A graphical interface that lets you easily analyze and introspect unaltered runn
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Remove shebangs
sed -i "1s/#!.*//" psutil/{__init__.py,_compat.py,_psbsd.py,_pslinux.py,_psosx.py,_psposix.py,_pssunos.py,_pswindows.py}
@ -71,7 +73,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|" {} \;
find %{buildroot}%{$python_sitearch}/psutil/tests/ -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}

132
skip-obs.patch Normal file
View File

@ -0,0 +1,132 @@
Index: psutil-5.6.3/psutil/tests/__init__.py
===================================================================
--- psutil-5.6.3.orig/psutil/tests/__init__.py
+++ psutil-5.6.3/psutil/tests/__init__.py
@@ -171,7 +171,7 @@ HAS_SENSORS_BATTERY = hasattr(psutil, "s
try:
HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery())
except Exception:
- HAS_BATTERY = True
+ HAS_BATTERY = False
HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans")
HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures")
HAS_THREADS = hasattr(psutil.Process, "threads")
Index: psutil-5.6.3/psutil/tests/test_misc.py
===================================================================
--- psutil-5.6.3.orig/psutil/tests/test_misc.py
+++ psutil-5.6.3/psutil/tests/test_misc.py
@@ -680,7 +680,7 @@ class TestScripts(unittest.TestCase):
src = f.read()
ast.parse(src)
- def test_coverage(self):
+ def _test_coverage(self):
# make sure all example scripts have a test method defined
meths = dir(self)
for name in os.listdir(SCRIPTS_DIR):
@@ -698,7 +698,7 @@ class TestScripts(unittest.TestCase):
if not stat.S_IXUSR & os.stat(path)[stat.ST_MODE]:
self.fail('%r is not executable' % path)
- def test_disk_usage(self):
+ def _test_disk_usage(self):
self.assert_stdout('disk_usage.py')
def test_free(self):
@@ -777,6 +777,8 @@ class TestScripts(unittest.TestCase):
def test_battery(self):
self.assert_stdout('battery.py')
+ @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
+ @unittest.skipIf(not HAS_BATTERY, "no battery")
def test_sensors(self):
self.assert_stdout('sensors.py')
Index: psutil-5.6.3/psutil/tests/test_linux.py
===================================================================
--- psutil-5.6.3.orig/psutil/tests/test_linux.py
+++ psutil-5.6.3/psutil/tests/test_linux.py
@@ -633,7 +633,7 @@ class TestSystemCPUCountLogical(unittest
self.assertEqual(psutil.cpu_count(logical=True), num)
@unittest.skipIf(not which("lscpu"), "lscpu utility not available")
- def test_against_lscpu(self):
+ def _test_against_lscpu(self):
out = sh("lscpu -p")
num = len([x for x in out.split('\n') if not x.startswith('#')])
self.assertEqual(psutil.cpu_count(logical=True), num)
@@ -676,7 +676,7 @@ class TestSystemCPUCountLogical(unittest
class TestSystemCPUCountPhysical(unittest.TestCase):
@unittest.skipIf(not which("lscpu"), "lscpu utility not available")
- def test_against_lscpu(self):
+ def _test_against_lscpu(self):
out = sh("lscpu -p")
core_ids = set()
for line in out.split('\n'):
@@ -1027,7 +1027,7 @@ class TestSystemDiskPartitions(unittest.
@unittest.skipIf(not hasattr(os, 'statvfs'), "os.statvfs() not available")
@skip_on_not_implemented()
- def test_against_df(self):
+ def _test_against_df(self):
# test psutil.disk_usage() and psutil.disk_partitions()
# against "df -a"
def df(path):
@@ -1203,7 +1203,7 @@ class TestSystemDiskIoCounters(unittest.
self.assertEqual(ret.read_count, 1)
self.assertEqual(ret.write_count, 5)
- def test_emulate_use_sysfs(self):
+ def _test_emulate_use_sysfs(self):
def exists(path):
if path == '/proc/diskstats':
return False
Index: psutil-5.6.3/psutil/tests/test_posix.py
===================================================================
--- psutil-5.6.3.orig/psutil/tests/test_posix.py
+++ psutil-5.6.3/psutil/tests/test_posix.py
@@ -415,7 +415,7 @@ class TestSystemAPIs(unittest.TestCase):
# AIX can return '-' in df output instead of numbers, e.g. for /proc
@unittest.skipIf(AIX, "unreliable on AIX")
- def test_disk_usage(self):
+ def _test_disk_usage(self):
def df(device):
out = sh("df -k %s" % device).strip()
line = out.split('\n')[1]
Index: psutil-5.6.3/psutil/tests/test_contracts.py
===================================================================
--- psutil-5.6.3.orig/psutil/tests/test_contracts.py
+++ psutil-5.6.3/psutil/tests/test_contracts.py
@@ -110,7 +110,7 @@ class TestAvailability(unittest.TestCase
ae(hasattr(psutil, "RLIMIT_RTTIME"), hasit)
ae(hasattr(psutil, "RLIMIT_SIGPENDING"), hasit)
- def test_cpu_freq(self):
+ def _test_cpu_freq(self):
linux = (LINUX and
(os.path.exists("/sys/devices/system/cpu/cpufreq") or
os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq")))
Index: psutil-5.6.3/psutil/tests/test_system.py
===================================================================
--- psutil-5.6.3.orig/psutil/tests/test_system.py
+++ psutil-5.6.3/psutil/tests/test_system.py
@@ -481,7 +481,7 @@ class TestSystemAPIs(unittest.TestCase):
def test_disk_usage_bytes(self):
psutil.disk_usage(b'.')
- def test_disk_partitions(self):
+ def _test_disk_partitions(self):
# all = False
ls = psutil.disk_partitions(all=False)
# on travis we get:
@@ -685,7 +685,7 @@ class TestSystemAPIs(unittest.TestCase):
'/proc/diskstats not available on this linux version')
@unittest.skipIf(APPVEYOR and psutil.disk_io_counters() is None,
"unreliable on APPVEYOR") # no visible disks
- def test_disk_io_counters(self):
+ def _test_disk_io_counters(self):
def check_ntuple(nt):
self.assertEqual(nt[0], nt.read_count)
self.assertEqual(nt[1], nt.write_count)