Marcel Telka
2023-12-18 697e17ed770ca04de06bb271cca17ec371ee3ce7
python/psutil: update to 5.9.7

8 files modified
60 ■■■■ changed files
components/python/psutil/Makefile 6 ●●●● patch | view | raw | blame | history
components/python/psutil/patches/01-no-shebang.patch 4 ●●●● patch | view | raw | blame | history
components/python/psutil/patches/02-test_connections.patch 4 ●●●● patch | view | raw | blame | history
components/python/psutil/patches/03-sunos.patch 12 ●●●● patch | view | raw | blame | history
components/python/psutil/patches/04-test-disable-failing.patch 24 ●●●● patch | view | raw | blame | history
components/python/psutil/patches/05-test_count.patch 4 ●●●● patch | view | raw | blame | history
components/python/psutil/patches/06-test_cpu_times_comparison.patch 4 ●●●● patch | view | raw | blame | history
components/python/psutil/test/results-all.master 2 ●●● patch | view | raw | blame | history
components/python/psutil/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        psutil
HUMAN_VERSION =            5.9.6
HUMAN_VERSION =            5.9.7
COMPONENT_SUMMARY =        psutil - Cross-platform lib for process and system monitoring in Python.
COMPONENT_PROJECT_URL =        https://github.com/giampaolo/psutil
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/2d/01/beb7331fc6c8d1c49dd051e3611379bfe379e915c808e1301506027fce9d/psutil-5.9.6.tar.gz
    https://files.pythonhosted.org/packages/a0/d0/c9ae661a302931735237791f04cb7086ac244377f78692ba3b3eae3a9619/psutil-5.9.7.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a
    sha256:3f02134e82cfb5d089fddf20bb2e03fd5cd52395321d1c8458a9e58500ff417c
COMPONENT_LICENSE =        BSD-3-Clause
COMPONENT_LICENSE_FILE =    LICENSE
components/python/psutil/patches/01-no-shebang.patch
@@ -1,7 +1,7 @@
https://github.com/giampaolo/psutil/pull/2316
--- psutil-5.9.6/psutil/tests/__main__.py.orig
+++ psutil-5.9.6/psutil/tests/__main__.py
--- psutil-5.9.7/psutil/tests/__main__.py.orig
+++ psutil-5.9.7/psutil/tests/__main__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 
components/python/psutil/patches/02-test_connections.patch
@@ -1,7 +1,7 @@
https://github.com/giampaolo/psutil/issues/2317
--- psutil-5.9.6/psutil/tests/test_connections.py.orig
+++ psutil-5.9.6/psutil/tests/test_connections.py
--- psutil-5.9.7/psutil/tests/test_connections.py.orig
+++ psutil-5.9.7/psutil/tests/test_connections.py
@@ -52,13 +52,13 @@
 class ConnectionTestCase(PsutilTestCase):
 
components/python/psutil/patches/03-sunos.patch
@@ -1,5 +1,5 @@
--- psutil-5.9.6/psutil/tests/__init__.py.orig
+++ psutil-5.9.6/psutil/tests/__init__.py
--- psutil-5.9.7/psutil/tests/__init__.py.orig
+++ psutil-5.9.7/psutil/tests/__init__.py
@@ -221,7 +221,7 @@
 HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans")
 HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures")
@@ -9,8 +9,8 @@
 
 # --- misc
 
--- psutil-5.9.6/psutil/tests/test_contracts.py.orig
+++ psutil-5.9.6/psutil/tests/test_contracts.py
--- psutil-5.9.7/psutil/tests/test_contracts.py.orig
+++ psutil-5.9.7/psutil/tests/test_contracts.py
@@ -433,6 +433,7 @@
                 ls.append(proc_info(pid))
             return ls
@@ -19,8 +19,8 @@
     def test_all(self):
         failures = []
         for info in self.iter_proc_info():
--- psutil-5.9.6/psutil/tests/test_system.py.orig
+++ psutil-5.9.6/psutil/tests/test_system.py
--- psutil-5.9.7/psutil/tests/test_system.py.orig
+++ psutil-5.9.7/psutil/tests/test_system.py
@@ -600,7 +600,7 @@
             self.assertIsInstance(nt.opts, str)
             self.assertIsInstance(nt.maxfile, (int, type(None)))
components/python/psutil/patches/04-test-disable-failing.patch
@@ -1,5 +1,5 @@
--- psutil-5.9.6/psutil/tests/test_process.py.orig
+++ psutil-5.9.6/psutil/tests/test_process.py
--- psutil-5.9.7/psutil/tests/test_process.py.orig
+++ psutil-5.9.7/psutil/tests/test_process.py
@@ -295,6 +295,7 @@
         time.strftime("%Y %m %d %H:%M:%S", time.localtime(p.create_time()))
 
@@ -16,8 +16,8 @@
     def test_nice(self):
         p = psutil.Process()
         self.assertRaises(TypeError, p.nice, "str")
--- psutil-5.9.6/psutil/tests/test_misc.py.orig
+++ psutil-5.9.6/psutil/tests/test_misc.py
--- psutil-5.9.7/psutil/tests/test_misc.py.orig
+++ psutil-5.9.7/psutil/tests/test_misc.py
@@ -530,6 +530,7 @@
         with mock.patch('psutil._common.stat.S_ISREG', return_value=False):
             assert not isfile_strict(this_file)
@@ -26,8 +26,8 @@
     def test_debug(self):
         if PY3:
             from io import StringIO
--- psutil-5.9.6/psutil/tests/test_posix.py.orig
+++ psutil-5.9.6/psutil/tests/test_posix.py
--- psutil-5.9.7/psutil/tests/test_posix.py.orig
+++ psutil-5.9.7/psutil/tests/test_posix.py
@@ -420,6 +420,7 @@
     # AIX can return '-' in df output instead of numbers, e.g. for /proc
     @unittest.skipIf(AIX, "unreliable on AIX")
@@ -36,8 +36,8 @@
     def test_disk_usage(self):
         def df(device):
             try:
--- psutil-5.9.6/psutil/tests/test_testutils.py.orig
+++ psutil-5.9.6/psutil/tests/test_testutils.py
--- psutil-5.9.7/psutil/tests/test_testutils.py.orig
+++ psutil-5.9.7/psutil/tests/test_testutils.py
@@ -370,6 +370,7 @@
     @retry_on_failure()
     @unittest.skipIf(CI_TESTING, "skipped on CI")
@@ -46,8 +46,8 @@
     def test_leak_mem(self):
         ls = []
 
--- psutil-5.9.6/psutil/tests/test_unicode.py.orig
+++ psutil-5.9.6/psutil/tests/test_unicode.py
--- psutil-5.9.7/psutil/tests/test_unicode.py.orig
+++ psutil-5.9.7/psutil/tests/test_unicode.py
@@ -243,6 +243,7 @@
                              os.path.normcase(self.funky_name))
 
@@ -64,8 +64,8 @@
     def test_memory_maps(self):
         # XXX: on Python 2, using ctypes.CDLL with a unicode path
         # opens a message box which blocks the test run.
--- psutil-5.9.6/psutil/tests/__init__.py.orig
+++ psutil-5.9.6/psutil/tests/__init__.py
--- psutil-5.9.7/psutil/tests/__init__.py.orig
+++ psutil-5.9.7/psutil/tests/__init__.py
@@ -984,6 +984,7 @@
                     raise AssertionError(msg)
         proc.wait(timeout=0)  # assert not raise TimeoutExpired
components/python/psutil/patches/05-test_count.patch
@@ -1,7 +1,7 @@
https://github.com/giampaolo/psutil/issues/2331
--- psutil-5.9.6/psutil/tests/test_connections.py.orig
+++ psutil-5.9.6/psutil/tests/test_connections.py
--- psutil-5.9.7/psutil/tests/test_connections.py.orig
+++ psutil-5.9.7/psutil/tests/test_connections.py
@@ -400,13 +400,13 @@
         with create_sockets():
             # tcp
components/python/psutil/patches/06-test_cpu_times_comparison.patch
@@ -1,7 +1,7 @@
We need to be less strict.  Maybe with more CPUs the delta needs to be higher due rounding errors?
--- psutil-5.9.6/psutil/tests/test_system.py.orig
+++ psutil-5.9.6/psutil/tests/test_system.py
--- psutil-5.9.7/psutil/tests/test_system.py.orig
+++ psutil-5.9.7/psutil/tests/test_system.py
@@ -441,7 +441,7 @@
         summed_values = base._make([sum(num) for num in zip(*per_cpu)])
         for field in base._fields:
components/python/psutil/test/results-all.master
@@ -122,7 +122,7 @@
psutil/tests/test_linux.py::TestMisc::test_no_procfs_on_import SKIPPED
psutil/tests/test_linux.py::TestMisc::test_pid_exists_no_proc_status SKIPPED
psutil/tests/test_linux.py::TestMisc::test_procfs_path SKIPPED (LINU...)
psutil/tests/test_linux.py::TestMisc::test_users_mocked SKIPPED (LIN...)
psutil/tests/test_linux.py::TestMisc::test_users SKIPPED (LINUX only)
psutil/tests/test_linux.py::TestProcess::test_cmdline_mixed_separators SKIPPED
psutil/tests/test_linux.py::TestProcess::test_cmdline_mocked SKIPPED
psutil/tests/test_linux.py::TestProcess::test_cmdline_spaces_mocked SKIPPED