Hello community, here is the log from the commit of package python-psutil for openSUSE:Factory checked in at 2020-03-27 00:23:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-psutil (Old) and /work/SRC/openSUSE:Factory/.python-psutil.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-psutil" Fri Mar 27 00:23:24 2020 rev:54 rq:784805 version:5.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-psutil/python-psutil.changes 2020-01-31 23:55:09.179585099 +0100 +++ /work/SRC/openSUSE:Factory/.python-psutil.new.3160/python-psutil.changes 2020-03-27 00:23:27.396200856 +0100 @@ -1,0 +2,10 @@ +Sat Mar 14 07:25:43 UTC 2020 - Tomáš Chvátal <tchva...@suse.com> + +- 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 + +------------------------------------------------------------------- Old: ---- pr_1364.patch pr_1665.patch psutil-5.6.7.tar.gz skip-test-missing-warnings.patch New: ---- psutil-5.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-psutil.spec ++++++ --- /var/tmp/diff_new_pack.2WXMlw/_old 2020-03-27 00:23:28.836201586 +0100 +++ /var/tmp/diff_new_pack.2WXMlw/_new 2020-03-27 00:23:28.840201587 +0100 @@ -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 @@ %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 @@ %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 @@ %{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 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} ++++++ psutil-5.6.7.tar.gz -> psutil-5.7.0.tar.gz ++++++ ++++ 16266 lines of diff (skipped) ++++++ skip-obs.patch ++++++ --- /var/tmp/diff_new_pack.2WXMlw/_old 2020-03-27 00:23:28.988201662 +0100 +++ /var/tmp/diff_new_pack.2WXMlw/_new 2020-03-27 00:23:28.988201662 +0100 @@ -1,8 +1,8 @@ -Index: psutil-5.6.3/psutil/tests/__init__.py +Index: psutil-5.7.0/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 +--- psutil-5.7.0.orig/psutil/tests/__init__.py ++++ psutil-5.7.0/psutil/tests/__init__.py +@@ -174,7 +174,7 @@ HAS_SENSORS_BATTERY = hasattr(psutil, "s try: HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery()) except Exception: @@ -11,11 +11,11 @@ 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 +Index: psutil-5.7.0/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): +--- psutil-5.7.0.orig/psutil/tests/test_misc.py ++++ psutil-5.7.0/psutil/tests/test_misc.py +@@ -684,7 +684,7 @@ class TestScripts(unittest.TestCase): src = f.read() ast.parse(src) @@ -24,7 +24,7 @@ # 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): +@@ -702,7 +702,7 @@ class TestScripts(unittest.TestCase): if not stat.S_IXUSR & os.stat(path)[stat.ST_MODE]: self.fail('%r is not executable' % path) @@ -33,7 +33,7 @@ self.assert_stdout('disk_usage.py') def test_free(self): -@@ -777,6 +777,8 @@ class TestScripts(unittest.TestCase): +@@ -783,6 +783,8 @@ class TestScripts(unittest.TestCase): def test_battery(self): self.assert_stdout('battery.py') @@ -42,11 +42,11 @@ def test_sensors(self): self.assert_stdout('sensors.py') -Index: psutil-5.6.3/psutil/tests/test_linux.py +Index: psutil-5.7.0/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 +--- psutil-5.7.0.orig/psutil/tests/test_linux.py ++++ psutil-5.7.0/psutil/tests/test_linux.py +@@ -636,7 +636,7 @@ class TestSystemCPUCountLogical(unittest self.assertEqual(psutil.cpu_count(logical=True), num) @unittest.skipIf(not which("lscpu"), "lscpu utility not available") @@ -55,7 +55,7 @@ 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 +@@ -679,7 +679,7 @@ class TestSystemCPUCountLogical(unittest class TestSystemCPUCountPhysical(unittest.TestCase): @unittest.skipIf(not which("lscpu"), "lscpu utility not available") @@ -64,7 +64,7 @@ out = sh("lscpu -p") core_ids = set() for line in out.split('\n'): -@@ -1027,7 +1027,7 @@ class TestSystemDiskPartitions(unittest. +@@ -1008,7 +1008,7 @@ class TestSystemDiskPartitions(unittest. @unittest.skipIf(not hasattr(os, 'statvfs'), "os.statvfs() not available") @skip_on_not_implemented() @@ -73,7 +73,7 @@ # test psutil.disk_usage() and psutil.disk_partitions() # against "df -a" def df(path): -@@ -1203,7 +1203,7 @@ class TestSystemDiskIoCounters(unittest. +@@ -1183,7 +1183,7 @@ class TestSystemDiskIoCounters(unittest. self.assertEqual(ret.read_count, 1) self.assertEqual(ret.write_count, 5) @@ -82,11 +82,11 @@ def exists(path): if path == '/proc/diskstats': return False -Index: psutil-5.6.3/psutil/tests/test_posix.py +Index: psutil-5.7.0/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): +--- psutil-5.7.0.orig/psutil/tests/test_posix.py ++++ psutil-5.7.0/psutil/tests/test_posix.py +@@ -414,7 +414,7 @@ class TestSystemAPIs(unittest.TestCase): # AIX can return '-' in df output instead of numbers, e.g. for /proc @unittest.skipIf(AIX, "unreliable on AIX") @@ -95,24 +95,24 @@ 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 +Index: psutil-5.7.0/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) +--- psutil-5.7.0.orig/psutil/tests/test_contracts.py ++++ psutil-5.7.0/psutil/tests/test_contracts.py +@@ -114,7 +114,7 @@ class TestAvailSystemAPIs(unittest.TestC + def test_win_service_get(self): + self.assertEqual(hasattr(psutil, "win_service_get"), WINDOWS) - 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 +Index: psutil-5.7.0/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): +--- psutil-5.7.0.orig/psutil/tests/test_system.py ++++ psutil-5.7.0/psutil/tests/test_system.py +@@ -604,7 +604,7 @@ class TestDiskAPIs(unittest.TestCase): def test_disk_usage_bytes(self): psutil.disk_usage(b'.') @@ -121,12 +121,3 @@ # 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)
