.gitignore

@@ -1 +1 @@
-SOURCES/psutil-5.8.0.tar.gz
+SOURCES/psutil-5.9.8.tar.gz

.python-psutil.metadata

@@ -1 +1 @@
-4561d6c7747bdcc6764bc14510415016016522b0 SOURCES/psutil-5.8.0.tar.gz
+1453f621d9e7ac73d764f84af944264e67888690 SOURCES/psutil-5.9.8.tar.gz

SOURCES/2372.patch

@@ -0,0 +1,54 @@
+From 7664f36157268dba47313043da27761727c813ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 9 Feb 2024 14:55:41 +0100
+Subject: [PATCH] Tests: Compare floats less strictly
+
+We see:
+
+    ======================================================================
+    FAIL: psutil.tests.test_system.TestCpuAPIs.test_cpu_times
+    ----------------------------------------------------------------------
+    Traceback (most recent call last):
+      File "/builddir/build/BUILD/psutil-release-5.9.5/psutil/tests/test_system.py", line 351, in test_cpu_times
+        self.assertAlmostEqual(total, sum(times))
+    AssertionError: 885725913.3 != 885725913.3000001 within 7 places (1.1920928955078125e-07 difference)
+    ----------------------------------------------------------------------
+
+Or:
+
+    ======================================================================
+    FAIL: psutil.tests.test_system.TestCpuAPIs.test_cpu_times
+    ----------------------------------------------------------------------
+    Traceback (most recent call last):
+      File "/builddir/build/BUILD/psutil-release-5.9.5/psutil/tests/test_system.py", line 351, in test_cpu_times
+        self.assertAlmostEqual(total, sum(times))
+    AssertionError: 324284741.90999997 != 324284741.91 within 7 places (5.960464477539063e-08 difference)
+    ----------------------------------------------------------------------
+
+In CentOS Stream 10 builds on i686 and x86_64.
+---
+ psutil/tests/test_system.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
+index 6656c19ba..56979c927 100755
+--- a/psutil/tests/test_system.py
++++ b/psutil/tests/test_system.py
+@@ -385,7 +385,7 @@ def test_cpu_times(self):
+             self.assertIsInstance(cp_time, float)
+             self.assertGreaterEqual(cp_time, 0.0)
+             total += cp_time
+-        self.assertAlmostEqual(total, sum(times))
++        self.assertAlmostEqual(total, sum(times), places=6)
+         str(times)
+         # CPU times are always supposed to increase over time
+         # or at least remain the same and that's because time
+@@ -424,7 +424,7 @@ def test_per_cpu_times(self):
+                 self.assertIsInstance(cp_time, float)
+                 self.assertGreaterEqual(cp_time, 0.0)
+                 total += cp_time
+-            self.assertAlmostEqual(total, sum(times))
++            self.assertAlmostEqual(total, sum(times), places=6)
+             str(times)
+         self.assertEqual(
+             len(psutil.cpu_times(percpu=True)[0]),

SOURCES/python-psutil-add-tolerance.patch

@@ -1,25 +0,0 @@
-From 4ffbcb458ff0b838f2bfe387b6305c4817e363ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 15 Apr 2021 17:07:38 +0200
-Subject: [PATCH] Add tolerance to
- test_linux.TestSystemVirtualMemory.test_total
-
-We see this test as very flaky without tolerance in Fedora and CentOS
----
- psutil/tests/test_linux.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index 0c6d498c8..f5243c2cd 100755
---- a/psutil/tests/test_linux.py
-+++ b/psutil/tests/test_linux.py
-@@ -243,7 +243,8 @@ def test_total(self):
-         # self.assertEqual(free_value, psutil_value)
-         vmstat_value = vmstat('total memory') * 1024
-         psutil_value = psutil.virtual_memory().total
--        self.assertAlmostEqual(vmstat_value, psutil_value)
-+        self.assertAlmostEqual(
-+            vmstat_value, psutil_value, delta=TOLERANCE_SYS_MEM)
- 
-     @retry_on_failure()
-     def test_used(self):

SOURCES/python-psutil-skip-test_debug.patch

@@ -0,0 +1,12 @@
+diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
+index 700c054..d0b675e 100755
+--- a/psutil/tests/test_misc.py
++++ b/psutil/tests/test_misc.py
+@@ -569,6 +569,7 @@ class TestCommonModule(PsutilTestCase):
+         with mock.patch('psutil._common.stat.S_ISREG', return_value=False):
+             assert not isfile_strict(this_file)
+ 
++    @unittest.skip("https://github.com/giampaolo/psutil/issues/2374")
+     def test_debug(self):
+         if PY3:
+             from io import StringIO

SOURCES/python-psutil-skip-test_emulate_multi_cpu.patch

@@ -0,0 +1,36 @@
+From 35d3054307a6f2e607026101e6f0b19b6c472864 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Wed, 14 Feb 2024 18:14:08 -0500
+Subject: [PATCH] Skip on aarch64 and ppc64le
+
+Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+---
+ psutil/tests/test_linux.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
+index 0583e619de59931a9ee80411a95ef8eb7ef6c171..7f6cfd5431086b108c1a7fa140b407cc9b6b0836 100755
+--- a/psutil/tests/test_linux.py
++++ b/psutil/tests/test_linux.py
+@@ -14,6 +14,7 @@ import errno
+ import glob
+ import io
+ import os
++import platform
+ import re
+ import shutil
+ import socket
+@@ -888,6 +889,10 @@ class TestSystemCPUFrequency(PsutilTestCase):
+                     self.assertEqual(freq.max, 700.0)
+ 
+     @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
++    @unittest.skipIf(platform.machine() == "aarch64",
++                     "https://github.com/giampaolo/psutil/issues/2373")
++    @unittest.skipIf(platform.machine() == "ppc64le",
++                     "https://github.com/giampaolo/psutil/issues/2373")
+     def test_emulate_multi_cpu(self):
+         def open_mock(name, *args, **kwargs):
+             n = name
+-- 
+2.43.0
+

SOURCES/python-psutil-skip-tests-in-brew.patch

@@ -1,24 +0,0 @@
-diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index c1d0a94..e9914a9 100755
---- a/psutil/tests/test_linux.py
-+++ b/psutil/tests/test_linux.py
-@@ -924,6 +924,7 @@ class TestLoadAvg(PsutilTestCase):
- @unittest.skipIf(not LINUX, "LINUX only")
- class TestSystemNetIfAddrs(PsutilTestCase):
- 
-+    @unittest.skip("Broken in brew")
-     def test_ips(self):
-         for name, addrs in psutil.net_if_addrs().items():
-             for addr in addrs:
-diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
-index a55164c..21a04bb 100755
---- a/psutil/tests/test_system.py
-+++ b/psutil/tests/test_system.py
-@@ -724,6 +724,7 @@ class TestNetAPIs(PsutilTestCase):
-             self.assertEqual(psutil.net_io_counters(pernic=True), {})
-             assert m.called
- 
-+    @unittest.skip("Broken in brew")
-     def test_net_if_addrs(self):
-         nics = psutil.net_if_addrs()
-         assert nics, nics

SOURCES/python-psutil-skip-tests-in-mock.patch

@@ -1,12 +1,44 @@
-diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_linux.py psutil-release-5.8.0/psutil/tests/test_linux.py
---- psutil-release-5.8.0.orig/psutil/tests/test_linux.py	2020-12-18 16:45:00.000000000 -0800
-+++ psutil-release-5.8.0/psutil/tests/test_linux.py	2021-01-10 15:38:31.104890945 -0800
-@@ -661,14 +661,13 @@
+diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
+index 0aa04f1..1096d3c 100755
+--- a/psutil/tests/test_linux.py
++++ b/psutil/tests/test_linux.py
+@@ -272,7 +272,7 @@ class TestSystemVirtualMemoryAgainstFree(PsutilTestCase):
+         psutil_value = psutil.virtual_memory().total
+         self.assertEqual(cli_value, psutil_value)
+ 
+-    @retry_on_failure()
++    @unittest.skip("Unreliable on mock")
+     def test_used(self):
+         # Older versions of procps used slab memory to calculate used memory.
+         # This got changed in:
+@@ -337,6 +337,7 @@ class TestSystemVirtualMemoryAgainstVmstat(PsutilTestCase):
+         )
+ 
+     @retry_on_failure()
++    @unittest.skip("Unreliable in mock")
+     def test_used(self):
+         # Older versions of procps used slab memory to calculate used memory.
+         # This got changed in:
+@@ -717,10 +718,7 @@ class TestSystemCPUTimes(PsutilTestCase):
+ 
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemCPUCountLogical(PsutilTestCase):
+-    @unittest.skipIf(
+-        not os.path.exists("/sys/devices/system/cpu/online"),
+-        "/sys/devices/system/cpu/online does not exist",
+-    )
++    @unittest.skip("Unreliable on mock")
+     def test_against_sysdev_cpu_online(self):
+         with open("/sys/devices/system/cpu/online") as f:
+             value = f.read().strip()
+@@ -728,16 +726,13 @@ class TestSystemCPUCountLogical(PsutilTestCase):
              value = int(value.split('-')[1]) + 1
              self.assertEqual(psutil.cpu_count(), value)
  
--    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu"),
--                     "/sys/devices/system/cpu does not exist")
+-    @unittest.skipIf(
+-        not os.path.exists("/sys/devices/system/cpu"),
+-        "/sys/devices/system/cpu does not exist",
+-    )
 +    @unittest.skip("Unreliable on mock")
      def test_against_sysdev_cpu_num(self):
          ls = os.listdir("/sys/devices/system/cpu")
@@ -18,117 +50,117 @@ diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_linux.py psutil-re
      def test_against_nproc(self):
          num = int(sh("nproc --all"))
          self.assertEqual(psutil.cpu_count(logical=True), num)
-@@ -713,7 +712,7 @@
-                 m.called
+@@ -785,7 +780,7 @@ class TestSystemCPUCountLogical(PsutilTestCase):
+                 assert m.called
  
  
 -@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable in mock")
- class TestSystemCPUCountPhysical(PsutilTestCase):
- 
++@unittest.skip("Unreliable on mock")
+ class TestSystemCPUCountCores(PsutilTestCase):
      @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
-@@ -745,7 +744,7 @@
+     def test_against_lscpu(self):
+@@ -815,7 +810,7 @@ class TestSystemCPUCountCores(PsutilTestCase):
+ 
  @unittest.skipIf(not LINUX, "LINUX only")
  class TestSystemCPUFrequency(PsutilTestCase):
- 
 -    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_emulate_use_second_file(self):
          # https://github.com/giampaolo/psutil/issues/981
          def path_exists_mock(path):
-@@ -759,7 +758,7 @@
-                         create=True):
+@@ -830,7 +825,7 @@ class TestSystemCPUFrequency(PsutilTestCase):
+         ):
              assert psutil.cpu_freq()
  
 -    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_emulate_use_cpuinfo(self):
          # Emulate a case where /sys/devices/system/cpu/cpufreq* does not
          # exist and /proc/cpuinfo is used instead.
-@@ -888,7 +887,7 @@
+@@ -964,7 +959,7 @@ class TestSystemCPUFrequency(PsutilTestCase):
                      self.assertEqual(freq.current, 200)
  
  
 -@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable in mock")
++@unittest.skip("Unreliable on mock")
  class TestSystemCPUStats(PsutilTestCase):
- 
      def test_ctx_switches(self):
-@@ -2126,13 +2125,14 @@
-         value = tuple(map(int, value.split()[1:4]))
-         self.assertEqual(self.proc.gids(), value)
+         vmstat_value = vmstat("context switches")
+@@ -995,7 +990,7 @@ class TestLoadAvg(PsutilTestCase):
+ # =====================================================================
  
--    @retry_on_failure()
-+    @unittest.skip("Unreliable in mock")
-     def test_num_ctx_switches(self):
-         value = self.read_status_file("voluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().voluntary, value)
+ 
+-@unittest.skipIf(not LINUX, "LINUX only")
++@unittest.skip("Unreliable on mock")
+ class TestSystemNetIfAddrs(PsutilTestCase):
+     def test_ips(self):
+         for name, addrs in psutil.net_if_addrs().items():
+@@ -1404,7 +1399,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
+             self.assertRaises(FileNotFoundError, finder.ask_sys_dev_block)
+         finder.ask_sys_class_block()
+ 
+-    @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
++    @unittest.skip("Unreliable on mock")
+     def test_comparisons(self):
+         finder = RootFsDeviceFinder()
+         self.assertIsNotNone(finder.find())
+@@ -1428,11 +1423,13 @@ class TestRootFsDeviceFinder(PsutilTestCase):
+ 
+     @unittest.skipIf(not which("findmnt"), "findmnt utility not available")
+     @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
++    @unittest.skip("Unreliable on mock")
+     def test_against_findmnt(self):
+         psutil_value = RootFsDeviceFinder().find()
+         findmnt_value = sh("findmnt -o SOURCE -rn /")
+         self.assertEqual(psutil_value, findmnt_value)
+ 
++    @unittest.skip("Unreliable on mock")
+     def test_disk_partitions_mocked(self):
+         with mock.patch(
+             'psutil._pslinux.cext.disk_partitions',
+@@ -2112,6 +2109,7 @@ class TestProcess(PsutilTestCase):
+         with mock.patch(patch_point, side_effect=open_mock_2):
+             self.assertRaises(psutil.AccessDenied, psutil.Process().threads)
+ 
++    @unittest.skip("Unreliable on mock")
+     def test_exe_mocked(self):
+         with mock.patch(
+             'psutil._pslinux.readlink', side_effect=OSError(errno.ENOENT, "")
+@@ -2313,6 +2311,7 @@ class TestProcessAgainstStatus(PsutilTestCase):
          value = self.read_status_file("nonvoluntary_ctxt_switches:")
          self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
  
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_cpu_affinity(self):
          value = self.read_status_file("Cpus_allowed_list:")
          if '-' in str(value):
-diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_misc.py psutil-release-5.8.0/psutil/tests/test_misc.py
---- psutil-release-5.8.0.orig/psutil/tests/test_misc.py	2020-12-18 16:45:00.000000000 -0800
-+++ psutil-release-5.8.0/psutil/tests/test_misc.py	2021-01-10 15:38:31.104890945 -0800
-@@ -355,7 +355,7 @@
- 
-     def test_setup_script(self):
-         setup_py = os.path.join(ROOT_DIR, 'setup.py')
--        if CI_TESTING and not os.path.exists(setup_py):
-+        if not os.path.exists(setup_py):
-             return self.skipTest("can't find setup.py")
-         module = import_module_by_path(setup_py)
-         self.assertRaises(SystemExit, module.setup)
-diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_system.py psutil-release-5.8.0/psutil/tests/test_system.py
---- psutil-release-5.8.0.orig/psutil/tests/test_system.py	2020-12-18 16:45:00.000000000 -0800
-+++ psutil-release-5.8.0/psutil/tests/test_system.py	2021-01-10 15:38:31.105890946 -0800
-@@ -198,7 +198,7 @@
-         self.assertGreater(bt, 0)
-         self.assertLess(bt, time.time())
- 
--    @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-+    @unittest.skipIf(not psutil.users(), "unreliable on CI")
-     def test_users(self):
-         users = psutil.users()
-         self.assertNotEqual(users, [])
-@@ -510,7 +510,7 @@
+diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
+index 152e378..35542f5 100755
+--- a/psutil/tests/test_system.py
++++ b/psutil/tests/test_system.py
+@@ -561,11 +561,7 @@ class TestCpuAPIs(PsutilTestCase):
              if not AIX and name in ('ctx_switches', 'interrupts'):
                  self.assertGreater(value, 0)
  
--    @unittest.skipIf(not HAS_CPU_FREQ, "not suported")
-+    @unittest.skip("Unreliable in mock")
+-    # TODO: remove this once 1892 is fixed
+-    @unittest.skipIf(
+-        MACOS and platform.machine() == 'arm64', "skipped due to #1892"
+-    )
+-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
++    @unittest.skip("Unreliable on mock")
      def test_cpu_freq(self):
          def check_ls(ls):
              for nt in ls:
-@@ -579,6 +579,7 @@
-     def test_disk_usage_bytes(self):
-         psutil.disk_usage(b'.')
- 
-+    @unittest.skip("unreliable on CI")
-     def test_disk_partitions(self):
-         def check_ntuple(nt):
-             self.assertIsInstance(nt.device, str)
-@@ -828,7 +829,7 @@
- 
- class TestSensorsAPIs(PsutilTestCase):
- 
--    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-+    @unittest.skip("Unreliable in mock")
-     def test_sensors_temperatures(self):
-         temps = psutil.sensors_temperatures()
-         for name, entries in temps.items():
-diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_testutils.py psutil-release-5.8.0/psutil/tests/test_testutils.py
---- psutil-release-5.8.0.orig/psutil/tests/test_testutils.py	2020-12-18 16:45:00.000000000 -0800
-+++ psutil-release-5.8.0/psutil/tests/test_testutils.py	2021-01-10 15:48:14.240695423 -0800
-@@ -364,7 +364,7 @@
+diff --git a/psutil/tests/test_testutils.py b/psutil/tests/test_testutils.py
+index a93f9f0..59ae083 100755
+--- a/psutil/tests/test_testutils.py
++++ b/psutil/tests/test_testutils.py
+@@ -373,7 +373,7 @@ class TestMemLeakClass(TestMemoryLeak):
          self.assertRaises(ValueError, self.execute, lambda: 0, retries=-1)
  
      @retry_on_failure()
 -    @unittest.skipIf(CI_TESTING, "skipped on CI")
 +    @unittest.skip("Unreliable in mock")
+     @unittest.skipIf(COVERAGE, "skipped during test coverage")
      def test_leak_mem(self):
          ls = []
- 

SPECS/python-psutil.spec

@@ -1,32 +1,35 @@
-%global srcname psutil
-%global sum A process and system utilities module for Python
+Name:           python-psutil
+Version:        5.9.8
+Release:        3%{?dist}
+Summary:        A process and system utilities module for Python
 
-Name:           python-%{srcname}
-Version:        5.8.0
-Release:        12%{?dist}
-Summary:        %{sum}
-
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/giampaolo/psutil
-Source0:        %{url}/archive/release-%{version}/%{srcname}-%{version}.tar.gz
+Source:         %{url}/archive/release-%{version}/psutil-%{version}.tar.gz
 #
-# skip 2 tests that fail in mock chroots
+# skip tests that fail in mock chroots
 #
-Patch0:         python-psutil-skip-tests-in-mock.patch
+Patch:          python-psutil-skip-tests-in-mock.patch
 #
-# skip 2 tests that fail in brew due to broken IPv6
+# avoid: AssertionError: 885725913.3 != 885725913.3000001 within 7 places
 #
-Patch1:         python-psutil-skip-tests-in-brew.patch
-
-# Add tolerance to psutil.tests.test_linux.TestSystemVirtualMemory.test_total
-Patch2:         https://github.com/giampaolo/psutil/pull/1935.patch#/python-psutil-add-tolerance.patch
+Patch:          https://github.com/giampaolo/psutil/pull/2372.patch
+#
+# Skip test_emulate_multi_cpu on aarch64 and ppc64le
+# Failure reported upstream: https://github.com/giampaolo/psutil/issues/2373
+#
+Patch:          python-psutil-skip-test_emulate_multi_cpu.patch
+#
+# Skip test_misc.TestCommonModule.test_debug
+# Failure reported upstream: https://github.com/giampaolo/psutil/issues/2374
+#
+Patch:          python-psutil-skip-test_debug.patch
 
-BuildRequires: make
 BuildRequires:  gcc
+BuildRequires:  sed
 BuildRequires:  python%{python3_pkgversion}-devel
 # Test dependencies
 BuildRequires:  procps-ng
-BuildRequires:  python%{python3_pkgversion}-setuptools
 
 %description
 psutil is a module providing an interface for retrieving information on all
@@ -37,8 +40,7 @@ ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
 
 
 %package -n python%{python3_pkgversion}-psutil
-Summary:        %{sum}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
+Summary:        %{summary}
 
 %description -n python%{python3_pkgversion}-psutil
 psutil is a module providing an interface for retrieving information on all
@@ -47,15 +49,17 @@ a portable way by using Python 3, implementing many functionalities offered by
 command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
 ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
 
+
 %package -n python%{python3_pkgversion}-psutil-tests
-Summary:        %{sum}, test suite
+Summary:        %{summary}, test suite
 Requires:       python%{python3_pkgversion}-psutil%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n python%{python3_pkgversion}-psutil-tests
 The test suite for psutil.
 
+
 %prep
-%autosetup -p1 -n %{srcname}-release-%{version}
+%autosetup -p1 -n psutil-release-%{version}
 
 # Remove shebangs
 find psutil -name \*.py | while read file; do
@@ -65,56 +69,117 @@ find psutil -name \*.py | while read file; do
 done
 
 
+%generate_buildrequires
+%pyproject_buildrequires
+
+
 %build
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files psutil
 
 
+# Ignore tests when building with flatpak-module-tools to avoid build failures
+# when building inside VMs or containers. Flatpaks would usually build this package
+# as dependency from stable and already tested branches.
+%if ! 0%{?flatpak}
 %check
-make test CI_TESTING=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sitearch}
+# Setting APPVEYOR to convince the test suite this is a CI.
+# That way, some unreliable tests are skipped and some timeouts are extended.
+# Previously, this was done by the CI_TESTING variable, but that works no more.
+# Alternative is to set GITHUB_ACTIONS but that has undesirable side effects.
 
+# Note: We deliberately bypass the Makefile here to test the installed modules.
+APPVEYOR=1 %{py3_test_envvars} %{python3} psutil/tests/runner.py
+%endif
 
-%files -n python%{python3_pkgversion}-%{srcname}
-%license LICENSE
+
+%files -n python%{python3_pkgversion}-psutil -f %{pyproject_files}
 %doc CREDITS HISTORY.rst README.rst
-%{python3_sitearch}/%{srcname}/
-%{python3_sitearch}/*.egg-info
-%exclude %{python3_sitearch}/%{srcname}/tests
+%exclude %{python3_sitearch}/psutil/tests
+
+%files -n python%{python3_pkgversion}-psutil-tests
+%{python3_sitearch}/psutil/tests/
 
-%files -n python%{python3_pkgversion}-%{srcname}-tests
-%{python3_sitearch}/%{srcname}/tests/
 
 %changelog
-* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 5.8.0-12
-- Add automatically generated Obsoletes tag with the python39- prefix
-  for smoother upgrade from RHEL8
-- Related: rhbz#1990421
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.9.8-3
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.9.8-3
+- Bump release for June 2024 mass rebuild
+
+* Wed Feb 14 2024 Stephen Gallagher <sgallagh@redhat.com> - 5.9.8-2
+- Skip unreliable multi-cpu test on ppc64le
+
+* Fri Feb 09 2024 Miro Hrončok <mhroncok@redhat.com> - 5.9.8-1
+- Update to 5.9.8
+- Fixes: rhbz#2244271
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Fri Aug 20 2021 Charalampos Stratakis <cstratak@redhat.com> - 5.8.0-11
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Aug 08 2023 Karolina Surma <ksurma@redhat.com> - 5.9.5-2
+- Declare the license as an SPDX expression
+
+* Fri Aug 04 2023 Jonathan Wright <jonathan@almalinux.org> - 5.9.5-1
+- Update to 5.9.5 rhbz#2135931
+- Skip unreliable test rhbz#2169395
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 5.9.2-3
+- Rebuilt for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Sep 18 2022 Kevin Fenzi <kevin@scrye.com> - 5.9.2-1
+- Update to 5.9.2. Fixes rhbz#2124116
+
+* Sun Jul 31 2022 Jonathan Wright <jonathan@almalinux.org> - 5.9.1-1
+- Update to 5.9.1.  Fixes rhbz#2036137
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.8.0-15
+- Rebuilt for Python 3.11
+
+* Thu Jun 09 2022 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-14
+- Relax testing assumptions when building the package
+- Fixes: rhbz#2049426
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Sep 08 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-12
+- Drop python2-psutil, as it is no longer needed
+
+* Wed Aug 18 2021 Charalampos Stratakis <cstratak@redhat.com> - 5.8.0-11
 - Separate the tests to their own subpackage
-Resolves: rhbz#1990466
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.8.0-10
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Aug 07 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-10
+- Add patch to add delta for cpu tests.
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.8.0-9
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Thu Apr 15 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-8
-- Skip 2 tests that fail in brew due to broken IPv6
-Resolves: rhbz#1913682
+* Wed Jun 23 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-8
+- Drop optional build dependency on python2-setuptools
 
-* Thu Apr 15 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-7
-- Add tolerance to a flaky test
-Resolves: rhbz#1913682
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 5.8.0-7
+- Rebuilt for Python 3.10
 
-* Tue Apr 06 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-6
-- Drop python2-psutil
-Resolves: rhbz#1913682
+* Thu Apr 15 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-6
+- Add tolerance to a flaky test
 
 * Thu Jan 28 2021 Tomas Orsava <torsava@redhat.com> - 5.8.0-5
 - Remove unnecessary test dependency on python3-mock