Compare commits

..

90 Commits
el6 ... rawhide

Author SHA1 Message Date
Miro Hrončok
7c7693548a Fix build with Python 3.13.0a1 2023-10-23 23:46:05 +02:00
Karolina Surma
05d572f7b0 Declare the license as an SPDX expression 2023-08-08 16:18:59 +02:00
jonathanspw
1a0cc2acdf skip problematic unit test 2023-08-04 08:32:52 -05:00
jonathanspw
a32e126863 skip broken test in mock 2023-08-04 08:19:08 -05:00
jonathanspw
d2322e6e84 update to 5.9.5 2023-08-04 06:45:17 -05:00
Fedora Release Engineering
68a7c624b2 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 12:27:19 +00:00
Yaakov Selkowitz
5fb0e79b2f Skip more tests as unreliable in mock 2023-07-11 01:41:06 -04:00
Miro Hrončok
b5c0e1e7df Workaround flaky tests 2023-06-14 17:49:34 +02:00
Python Maint
0cdd22e763 Rebuilt for Python 3.12 2023-06-13 20:48:02 +02:00
Fedora Release Engineering
cb79c5011e Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 15:50:58 +00:00
Kevin Fenzi
d6cf005656 Update to 5.9.2. Fixes rhbz#2124116 2022-09-18 16:07:37 -07:00
jonathanspw
30fcf3776d disable test that I think is causing hang 2022-08-01 18:22:33 -05:00
jonathanspw
6ec7291d0c fix typo in changelog 2022-07-31 10:57:22 -05:00
jonathanspw
b5548b46a5 Update to 5.9.1. Fixes rhbz#2036137 2022-07-31 01:18:11 -05:00
Fedora Release Engineering
da6436a832 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 21:01:40 +00:00
Python Maint
cd92dec0f5 Rebuilt for Python 3.11 2022-06-13 15:14:10 +02:00
Miro Hrončok
85fa344f2e %check like this is a CI 2022-06-09 15:37:29 +02:00
Jay W
a14a3d77e9 Update python-psutil.spec
Skip checks if running flatpak build.
2022-02-08 18:56:02 +00:00
Fedora Release Engineering
46402c3c18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-21 14:20:05 +00:00
Miro Hrončok
024746ce9a Drop python2-psutil, as it is no longer needed 2021-09-08 12:15:38 +02:00
Charalampos Stratakis
523a918663 Remove redundant patch 2021-09-03 18:20:45 +02:00
Charalampos Stratakis
b87ad1ed94 Separate the tests to their own subpackage 2021-08-18 19:40:10 +02:00
Kevin Fenzi
675494cbda Add patch to add delta for cpu tests. 2021-08-07 12:56:39 -07:00
Fedora Release Engineering
5dc2a1dbcc - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 08:23:09 +00:00
Miro Hrončok
b11f8dc358 Drop optional build dependency on python2-setuptools
While we are on version 5.8.0 we need egg-info to remain a directory,
so we copy paste the Python 3 egg-info directory.

However, it is temporary. Once the version is updated, we can get rid of it.
2021-06-24 17:20:07 +02:00
Python Maint
6b565402a2 Rebuilt for Python 3.10 2021-06-03 00:22:17 +02:00
Miro Hrončok
b0b42254f1 Add tolerance to a flaky test
Resolves occasional build failure:

    ======================================================================
    FAIL: psutil.tests.test_linux.TestSystemVirtualMemory.test_total
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/builddir/build/BUILD/psutil-release-5.8.0/psutil/tests/test_linux.py", line 245, in test_total
        self.assertAlmostEqual(vmstat_value, psutil_value)
    AssertionError: 134801801216 != 134801805312 within 7 places (4096 difference)
    ----------------------------------------------------------------------
2021-04-15 17:14:57 +02:00
Tomas Orsava
6bd1fcc572 Remove unnecessary bits
- Remove unnecessary test dependency on python3-mock
- Remove unnecessary macro __provides_exclude_from
2021-01-28 12:36:03 +01:00
Fedora Release Engineering
aed98cae09 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 12:25:21 +00:00
Kevin Fenzi
15207803b4 Disable test_leak_mem test. 2021-01-10 16:11:39 -08:00
Kevin Fenzi
3d5b05e393 Disable test_sensors_temperatures test. 2021-01-10 15:41:05 -08:00
Tom Stellard
33a4f96bda Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-08 19:55:24 +00:00
Kevin Fenzi
d98e5c9d77 Disable a number of more tests that fail in koji on various arches
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-01-01 14:16:52 -08:00
Kevin Fenzi
20f45452ed Update to 5.8.0. Fixes rhbz#1909321
Re-enable tests (skipping 2 that fail in mock).
2021-01-01 12:40:55 -08:00
Joel Capitao
d31e9000e9 Update to 5.7.3 2020-11-06 17:25:52 +01:00
Fedora Release Engineering
64d17fc0a5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 02:55:22 +00:00
Nicolas Chauvet
df548f8079 Fixup Source0 url 2020-07-22 17:12:15 +02:00
Nicolas Chauvet
dd0c2a6b68 Fixup gitignore 2020-07-22 17:12:02 +02:00
Nicolas Chauvet
b61258609c Update to 5.7.2 2020-07-22 17:08:34 +02:00
Troy Dawson
f0d96dcff7 Minor conditional tweak for ELN
Signed-off-by: Troy Dawson tdawson@redhat.com
2020-07-07 15:28:35 +00:00
Michel Alexandre Salim
a871772027 Add BR on setuptools for all package combinations 2020-06-23 20:18:21 -07:00
Miro Hrončok
accc13ea06 Rebuilt for Python 3.9 2020-05-23 18:09:55 +02:00
Kevin Fenzi
acbe2009db Update to 5.6.7. Fixes bug 1768362. 2020-02-16 15:08:04 -08:00
Fedora Release Engineering
0b867087f3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 14:13:44 +00:00
Kevin Fenzi
f1d9e101a6 Add python2-setuptools to BuildRequires
This gives us the full egg-info directory.
If we don't do this, then upgrades are broken because the egg-info dir
switches to a file which conflicts. See bug 1750362

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-10-06 13:38:49 -07:00
Miro Hrončok
797de7c8f2 Document Python 2 exception and reduce unused build dependencies 2019-09-03 16:53:10 +02:00
Miro Hrončok
f582884697 Rebuilt for Python 3.8 2019-08-16 23:43:41 +02:00
Fedora Release Engineering
4a1b497879 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 15:20:22 +00:00
Kevin Fenzi
4e65480c37 Update to 5.6.3 Fixes bug #1567102 2019-06-30 16:48:28 -07:00
yatin
e23a56adab Update to 5.5.1 (Resolves #1567102) 2019-02-28 11:36:51 +05:30
Fedora Release Engineering
42683b9c8c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 08:27:51 +00:00
Fedora Release Engineering
4222a97431 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 01:29:55 +00:00
Igor Gnatenko
5bc97021c1 add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-10 15:56:26 +02:00
Miro Hrončok
54d8483aa8 Rebuilt for Python 3.7 2018-06-17 19:22:32 +02:00
Fedora Release Engineering
399ac93433 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 09:56:27 +00:00
Iryna Shcherbina
7478ae4e26 Update Python 2 dependency declarations to new packaging standards 2018-01-30 00:12:42 +01:00
Gwyn Ciesla
892ef68e84 Disable tests. 2018-01-22 10:56:37 -06:00
Gwyn Ciesla
7886928912 Test patch fix. 2018-01-22 10:44:58 -06:00
Gwyn Ciesla
531faaa8c4 5.4.3, fix FTBFS. 2018-01-22 10:19:30 -06:00
Fedora Release Engineering
a4bfc7f353 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 06:53:53 +00:00
Fedora Release Engineering
160e79c8a9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 11:22:25 +00:00
Kevin Fenzi
e13b8f8f25 Update to 5.2.2. Fixes bug #1441010 2017-04-23 14:22:36 -06:00
Kevin Fenzi
0f7a4c5dd3 Update to 5.2.1. Fixes bug #1418489 2017-03-25 12:47:24 -06:00
Fedora Release Engineering
75c23c7a51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 10:01:55 +00:00
Kevin Fenzi
0a660b84c0 Merge remote-tracking branch 'refs/remotes/origin/master' 2017-01-02 10:58:47 -07:00
Kevin Fenzi
f6a224cf80 Update to 5.0.1. Fixes bug #1389579
Disable failing test while upstream looks at it.
2017-01-02 10:56:21 -07:00
Miro Hrončok
fb43636bb3 Rebuild for Python 3.6 2016-12-19 18:20:37 +01:00
Kevin Fenzi
845ccc035d Update to 4.4.0. Fixes bug #1387942 2016-10-25 12:44:36 -06:00
Kevin Fenzi
ef10aec0ab Update to 4.3.1. Fixes bug #1372500 2016-09-03 18:25:03 -06:00
Fedora Release Engineering
0576e7c0cd - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 11:04:34 +00:00
Orion Poplawski
9a5f544941 Update to 4.3.0 2016-06-21 16:55:24 -06:00
Orion Poplawski
b5b6253f2a Use modern provides filter
- Update URL
- Use %python3_pkgversion for EPEL7 compat
2016-05-16 11:57:08 -06:00
Than Ngo
fa0f51adb1 fix endian issue on s390x/ppc64 2016-03-11 13:31:56 +01:00
Fedora Release Engineering
ac2bed990d - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 20:33:11 +00:00
Peter Robinson
62668e392f - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 2015-11-10 16:49:21 +00:00
Michel Alexandre Salim
619cfca3f9 Add Obsoletes for old package 2015-09-05 00:21:34 +07:00
Michel Alexandre Salim
f3be17d1e0 Update to 3.2.1
- Update to latest Python guidelines (https://fedorahosted.org/fpc/ticket/281)
2015-09-05 00:05:09 +07:00
Michel Alexandre Salim
e49f6f60f7 Restore *.so files
- Enable tests
2015-07-22 20:40:33 +07:00
Michel Alexandre Salim
309b4ec271 Update to 3.1.1 2015-07-22 00:11:24 +07:00
Dennis Gilmore
1a40221437 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-18 20:21:33 +00:00
Ralph Bean
33eb98bf07 2.2.0 2015-02-18 13:23:02 -05:00
Michel Alexandre Salim
4a60da6a69 Update to 2.1.3 2015-01-06 10:36:23 +07:00
Peter Robinson
f6a2f35a72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 21:35:02 +00:00
Tom Callaway
950a7d44b3 fix license handling 2014-07-31 11:28:16 -04:00
Dennis Gilmore
2666fe052c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 17:14:35 -05:00
Kalev Lember
bcc2969d76 Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 2014-05-28 00:31:06 +02:00
Mohamed El Morabity
5a6e6979bb Update to 1.2.1 + update source URL 2014-01-06 15:31:11 +01:00
Mohamed El Morabity
73ecb22636 Update to 1.0.1 2013-08-16 13:39:57 +02:00
Dennis Gilmore
4fd23bc259 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 04:09:38 -05:00
Mohamed El Morabity
2320dc8381 Update to 0.7.1 2013-05-12 14:00:01 +02:00
6 changed files with 512 additions and 106 deletions

9
.gitignore vendored
View File

@ -1,8 +1 @@
psutil-0.1.3.tar.gz psutil-*.tar.gz
/psutil-0.2.0.tar.gz
/psutil-0.2.1.tar.gz
/psutil-0.3.0.tar.gz
/psutil-0.4.0.tar.gz
/psutil-0.4.1.tar.gz
/psutil-0.5.1.tar.gz
/psutil-0.6.1.tar.gz

View File

@ -0,0 +1,12 @@
diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c
index a6ee602..56fd4f6 100644
--- a/psutil/_psutil_linux.c
+++ b/psutil/_psutil_linux.c
@@ -24,6 +24,7 @@
#include <linux/sockios.h>
#include <linux/if.h>
#include <sys/resource.h>
+#include <unistd.h>
// see: https://github.com/giampaolo/psutil/issues/659
#ifdef PSUTIL_ETHTOOL_MISSING_TYPES

View File

@ -0,0 +1,169 @@
diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_contracts.py psutil-release-5.9.5/psutil/tests/test_contracts.py
--- psutil-release-5.9.5.orig/psutil/tests/test_contracts.py 2023-08-04 06:14:41.080097504 -0500
+++ psutil-release-5.9.5/psutil/tests/test_contracts.py 2023-08-04 06:36:02.844609234 -0500
@@ -425,6 +425,7 @@
ls.append(proc_info(pid))
return ls
+ @unittest.skip("Unreliable in mock")
def test_all(self):
failures = []
for info in self.iter_proc_info():
diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_linux.py psutil-release-5.9.5/psutil/tests/test_linux.py
--- psutil-release-5.9.5.orig/psutil/tests/test_linux.py 2023-08-04 06:14:41.080097504 -0500
+++ psutil-release-5.9.5/psutil/tests/test_linux.py 2023-08-04 08:32:44.666822057 -0500
@@ -257,7 +257,7 @@
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:
@@ -314,6 +314,7 @@
vmstat_value, psutil_value, delta=TOLERANCE_SYS_MEM)
@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:
@@ -691,8 +692,7 @@
@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()
@@ -700,14 +700,13 @@
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.skip("Unreliable in mock on ppc64le")
def test_against_sysdev_cpu_num(self):
ls = os.listdir("/sys/devices/system/cpu")
count = len([x for x in ls if re.search(r"cpu\d+$", x) is not None])
self.assertEqual(psutil.cpu_count(), count)
- @unittest.skipIf(not which("nproc"), "nproc utility not available")
+ @unittest.skip("Unreliable on mock")
def test_against_nproc(self):
num = int(sh("nproc --all"))
self.assertEqual(psutil.cpu_count(logical=True), num)
@@ -752,7 +751,7 @@
assert m.called
-@unittest.skipIf(not LINUX, "LINUX only")
+@unittest.skip("Unreliable on mock")
class TestSystemCPUCountCores(PsutilTestCase):
@unittest.skipIf(not which("lscpu"), "lscpu utility not available")
@@ -784,7 +783,7 @@
@unittest.skipIf(not LINUX, "LINUX only")
class TestSystemCPUFrequency(PsutilTestCase):
- @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
+ @unittest.skip("Unreliable on mock")
def test_emulate_use_second_file(self):
# https://github.com/giampaolo/psutil/issues/981
def path_exists_mock(path):
@@ -798,7 +797,7 @@
create=True):
assert psutil.cpu_freq()
- @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
+ @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.
@@ -923,7 +922,7 @@
self.assertEqual(freq.current, 200)
-@unittest.skipIf(not LINUX, "LINUX only")
+@unittest.skip("Unreliable on mock")
class TestSystemCPUStats(PsutilTestCase):
def test_ctx_switches(self):
@@ -956,7 +955,7 @@
# =====================================================================
-@unittest.skipIf(not LINUX, "LINUX only")
+@unittest.skip("Unreliable on mock")
class TestSystemNetIfAddrs(PsutilTestCase):
def test_ips(self):
@@ -1350,7 +1349,7 @@
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())
@@ -1373,11 +1372,13 @@
@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',
@@ -1513,6 +1514,7 @@
psutil._pslinux.boot_time)
assert m.called
+ @unittest.skip("Unreliable on mock")
def test_users_mocked(self):
# Make sure ':0' and ':0.0' (returned by C ext) are converted
# to 'localhost'.
@@ -2275,6 +2277,7 @@
value = self.read_status_file("nonvoluntary_ctxt_switches:")
self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
+ @unittest.skip("Unreliable on mock")
def test_cpu_affinity(self):
value = self.read_status_file("Cpus_allowed_list:")
if '-' in str(value):
diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_system.py psutil-release-5.9.5/psutil/tests/test_system.py
--- psutil-release-5.9.5.orig/psutil/tests/test_system.py 2023-08-04 06:14:41.080097504 -0500
+++ psutil-release-5.9.5/psutil/tests/test_system.py 2023-08-04 08:18:37.164817563 -0500
@@ -512,10 +512,7 @@
if not AIX and name in ('ctx_switches', 'interrupts'):
self.assertGreater(value, 0)
- # 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:
diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_testutils.py psutil-release-5.9.5/psutil/tests/test_testutils.py
--- psutil-release-5.9.5.orig/psutil/tests/test_testutils.py 2023-08-04 06:14:41.080097504 -0500
+++ psutil-release-5.9.5/psutil/tests/test_testutils.py 2023-08-04 06:35:41.421931668 -0500
@@ -370,7 +370,7 @@
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 = []

View File

@ -0,0 +1,22 @@
diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
index 3b787ee..db22245 100755
--- a/psutil/tests/test_system.py
+++ b/psutil/tests/test_system.py
@@ -346,7 +346,7 @@ class TestCpuAPIs(PsutilTestCase):
self.assertIsInstance(cp_time, float)
self.assertGreaterEqual(cp_time, 0.0)
total += cp_time
- self.assertEqual(total, sum(times))
+ self.assertAlmostEqual(total, sum(times))
str(times)
# CPU times are always supposed to increase over time
# or at least remain the same and that's because time
@@ -385,7 +385,7 @@ class TestCpuAPIs(PsutilTestCase):
self.assertIsInstance(cp_time, float)
self.assertGreaterEqual(cp_time, 0.0)
total += cp_time
- self.assertEqual(total, sum(times))
+ self.assertAlmostEqual(total, sum(times))
str(times)
self.assertEqual(len(psutil.cpu_times(percpu=True)[0]),
len(psutil.cpu_times(percpu=False)))

View File

@ -1,38 +1,37 @@
%if 0%{?fedora} > 12 || 0%{?rhel} > 6 %global srcname psutil
%global with_python3 1 %global sum A process and system utilities module for Python
%endif
%if 0%{?el5} Name: python-%{srcname}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")} Version: 5.9.5
%endif Release: 2%{?dist}
Summary: %{sum}
%global short_name psutil License: BSD-3-Clause
URL: https://github.com/giampaolo/psutil
Source0: %{url}/archive/release-%{version}/%{srcname}-%{version}.tar.gz
#
# skip 2 tests that fail in mock chroots
#
Patch0: python-psutil-skip-tests-in-mock.patch
#
# avoid: AssertionError: 7883822.420000001 != 7883822.42
#
Patch1: python-psutil-test-sum-floats-via-almost-equal.patch
#
# include unistd.h to avoid (on Python 3.13+):
# error: implicit declaration of function syscall
# error: implicit declaration of function close
# upstream PR: https://github.com/giampaolo/psutil/pull/2321
#
Patch2: python-psutil-include-unistd.h.patch
# Filter Python modules from Provides BuildRequires: gcc
%{?filter_setup: BuildRequires: grep
%filter_provides_in %{python_sitearch}/.*\.so$ BuildRequires: make
%filter_setup BuildRequires: python%{python3_pkgversion}-devel
} BuildRequires: python%{python3_pkgversion}-setuptools
# Test dependencies
Name: python-psutil BuildRequires: procps-ng
Version: 2.2.1
Release: 1%{?dist}
Summary: A process and system utilities module for Python
Group: Development/Languages
License: BSD
URL: http://psutil.googlecode.com/
Source0: https://pypi.python.org/packages/source/p/%{short_name}/%{short_name}-%{version}.tar.gz
BuildRequires: python2-devel
%if 0%{?with_python3}
BuildRequires: python3-devel
%endif
%if 0%{?el5}
BuildRequires: python-setuptools
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%endif
%description %description
psutil is a module providing an interface for retrieving information on all psutil is a module providing an interface for retrieving information on all
@ -42,102 +41,313 @@ command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
%if 0%{?with_python3} %package -n python%{python3_pkgversion}-psutil
%package -n python3-psutil Summary: %{sum}
Summary: A process and system utilities module for Python 3
Group: Development/Languages
%description -n python3-psutil
%description -n python%{python3_pkgversion}-psutil
psutil is a module providing an interface for retrieving information on all psutil is a module providing an interface for retrieving information on all
running processes and system utilization (CPU, memory, disks, network, users) in running processes and system utilization (CPU, memory, disks, network, users) in
a portable way by using Python 3, implementing many functionalities offered by 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, command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
%endif
%package -n python%{python3_pkgversion}-psutil-tests
Summary: %{sum}, 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 %prep
%setup -q -n %{short_name}-%{version} %autosetup -p1 -n %{srcname}-release-%{version}
# Remove shebangs # Remove shebangs
for file in psutil/*.py; do find psutil -name \*.py | while read file; do
sed -i.orig -e 1d $file && \ sed -i.orig -e '1{/^#!/d}' $file && \
touch -r $file.orig $file && \ touch -r $file.orig $file && \
rm $file.orig rm $file.orig
done done
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
%endif
%build %build
CFLAGS=$RPM_OPT_FLAGS %{__python} setup.py build %py3_build
%if 0%{?with_python3}
pushd %{py3dir}
CFLAGS=$RPM_OPT_FLAGS %{__python3} setup.py build
popd
%endif
%install %install
%if 0%{?el5} %py3_install
rm -rf $RPM_BUILD_ROOT
# 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
# 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.
make test APPVEYOR=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sitearch}
%endif %endif
%{__python} setup.py install \ %files -n python%{python3_pkgversion}-%{srcname}
--skip-build \ %license LICENSE
--root $RPM_BUILD_ROOT %doc CREDITS HISTORY.rst README.rst
%{python3_sitearch}/%{srcname}/
%{python3_sitearch}/%{srcname}-%{version}-py%{python3_version}.egg-info/
%exclude %{python3_sitearch}/%{srcname}/tests
# Fix permissions %files -n python%{python3_pkgversion}-%{srcname}-tests
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/*.so %{python3_sitearch}/%{srcname}/tests/
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install \
--skip-build \
--root $RPM_BUILD_ROOT
popd
# Fix permissions
chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/*.so
%endif
%files
%doc CREDITS HISTORY.rst LICENSE README.rst
%{python_sitearch}/%{short_name}/
%{python_sitearch}/*.egg-info
%{python_sitearch}/*.so
%if 0%{?with_python3}
%files -n python3-psutil
%doc CREDITS HISTORY.rst LICENSE README.rst
%{python3_sitearch}/%{short_name}/
%{python3_sitearch}/*.egg-info
%{python3_sitearch}/*.so
%endif
%changelog %changelog
* Thu Nov 30 2017 Kevin Fenzi <kevin@scrye.com> - 2.2.1-1 * Tue Aug 08 2023 Karolina Surma <ksurma@redhat.com> - 5.9.5-2
- Update to 2.2.1. Fixes bug #1479740 - Declare the license as an SPDX expression
* Fri Apr 19 2013 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1 * 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
* Sat Aug 07 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-10
- Add patch to add delta for cpu tests.
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jun 23 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-8
- Drop optional build dependency on python2-setuptools
* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 5.8.0-7
- Rebuilt for Python 3.10
* 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
- Remove unnecessary macro __provides_exclude_from
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Jan 10 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-3
- Disable test_leak_mem test.
* Sun Jan 10 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-2
- Disable test_sensors_temperatures test.
* Fri Jan 01 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-1
- Update to 5.8.0. Fixes rhbz#1909321
- Re-enable tests (skipping 2 that fail in mock).
* Fri Nov 06 2020 Joel Capitao <jcapitao@redhat.com> - 5.7.3-1
- Update to 5.7.3 (rhbz#1857187)
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 22 2020 Nicolas Chauvet <kwizart@gmail.com> - 5.7.2-1
- Update to 5.7.2
* Wed Jun 24 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 5.6.7-3
- Add BR on setuptools for all package combinations
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 5.6.7-2
- Rebuilt for Python 3.9
* Sun Feb 16 2020 Kevin Fenzi <kevin@scrye.com> - 5.6.7-1
- Update to 5.6.7. Fixes bug 1768362.
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Oct 06 2019 Kevin Fenzi <kevin@scrye.com> - 5.6.3-5
- Add python2-setuptools to BuildRequires to fix egg info. Fixes bug #1750362
* Tue Sep 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.6.3-4
- Reduce unused build dependencies
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 5.6.3-3
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jun 30 2019 Kevin Fenzi <kevin@scrye.com> - 5.6.3-1
- Update to 5.6.3 Fixes bug #1567102
* Thu Feb 28 2019 Yatin Karel <ykarel@redhat.com> - 5.5.1-1
- Update to 5.5.1 (Resolves #1567102)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 5.4.3-5
- Rebuilt for Python 3.7
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 29 2018 Iryna Shcherbina <ishcherb@redhat.com> - 5.4.3-3
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Mon Jan 22 2018 Gwyn Ciesla <limburgher@gmail.com> - 5.4.3-2
- Disable tests entirely.
* Mon Jan 22 2018 Gwyn Ciesla <limburgher@gmail.com> - 5.4.3-1
- 5.4.3
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sun Apr 23 2017 Kevin Fenzi <kevin@scrye.com> - 5.2.2-1
- Update to 5.2.2. Fixes bug #1441010
* Sat Mar 25 2017 Kevin Fenzi <kevin@scrye.com> - 5.2.1-1
- Update to 5.2.1. Fixes bug #1418489
* Sat Feb 25 2017 Kevin Fenzi <kevin@scrye.com> - 5.1.3-1
- Update to 5.1.3. Fixes bug #1418489
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Jan 02 2017 Kevin Fenzi <kevin@scrye.com> - 5.0.1-1
- Update to 5.0.1. Fixes bug #1389579
- Disable failing test while upstream looks at it.
* Wed Nov 09 2016 Kevin Fenzi <kevin@scrye.com> - 5.0.0-1
- Update to 5.0.0. Fixes bug #1389579
* Tue Oct 25 2016 Kevin Fenzi <kevin@scrye.com> - 4.4.0-1
- Update to 4.4.0. Fixes bug #1387942
* Sat Sep 03 2016 Kevin Fenzi <kevin@scrye.com> - 4.3.1-1
- Update to 4.3.1. Fixes bug #1372500
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.0-2
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Tue Jun 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-1
- Update to 4.3.0
* Mon May 16 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2.1-6
- Use modern provides filter
- Update URL
- Use %%python3_pkgversion for EPEL7 compat
* Fri Mar 11 2016 Than Ngo <than@redhat.com> - 3.2.1-5
- fix endian issue on s390x/ppc64
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Fri Sep 4 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 3.2.1-2
- Add Obsoletes for old package
* Fri Sep 4 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 3.2.1-1
- Update to 3.2.1
- Update to latest Python guidelines (https://fedorahosted.org/fpc/ticket/281)
* Wed Jul 22 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 3.1.1-2
- Restore *.so files
- Enable tests
* Tue Jul 21 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 3.1.1-1
- Update to 3.1.1
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Feb 18 2015 Ralph Bean <rbean@redhat.com> - 2.2.0-1
- new version
* Wed Dec 3 2014 Michel Alexandre Salim <salimma@fedoraproject.org> - 2.1.3-1
- Update to 2.1.3
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Thu Jul 31 2014 Tom Callaway <spot@fedoraproject.org> - 1.2.1-4
- fix license handling
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed May 28 2014 Kalev Lember <kalevlember@gmail.com> - 1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
* Mon Jan 06 2014 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.2.1-1
- Update to 1.2.1
* Fri Aug 16 2013 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.0.1-1
- Update to 1.0.1
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sun May 12 2013 Mohamed El Morabity <melmorabity@fedoraproject.org> - 0.7.1-1
- Update to 0.7.1
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Aug 19 2012 Mohamed El Morabity <melmorabity@fedorapeople.org> - 0.6.1-1
- Update to 0.6.1 - Update to 0.6.1
* Tue Mar 19 2013 Michel Salim <salimma@fedoraproject.org> - 0.4.1-3.2 * Sat Aug 04 2012 David Malcolm <dmalcolm@redhat.com> - 0.5.1-3
- Also generate egg-info on EL5 - rebuild for https://fedoraproject.org/wiki/Features/Python_3.3
* Sat Mar 16 2013 Michel Salim <salimma@fedoraproject.org> - 0.4.1-3.1 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
- Conditionally declare and clean buildroot to support el5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
- Fix declaration of Python macro, and make it apply only to el5
* Wed Apr 18 2012 Ralph Bean <rbean@redhat.com> - 0.4.1-3 * Sun Jul 01 2012 Mohamed El Morabity <melmorabity@fedoraproject.org> - 0.5.1-1
- Added a conditional around with_python3 to support el6. - Update to 0.5.1
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-2 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

View File

@ -1 +1 @@
1a2b58cd9e3a53528bb6148f0c4d5244 psutil-2.2.1.tar.gz SHA512 (psutil-5.9.5.tar.gz) = b9872acbecd1d9a9a79f032bd375ff0f10be4574e5f76f904c7a6367d7d3e24e7f0a1d06affa2fafbea74ecb594017029bdf29fdb8a8d37aeb51fb0016c3339c