1 |
commit: 4e721b8eee52e9ad9e1a7a5a4b52fddf2ab5bf52 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 4 06:34:21 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 4 08:05:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e721b8e |
7 |
|
8 |
dev-python/psutil: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/psutil/Manifest | 2 - |
13 |
dev-python/psutil/files/psutil-5.7.0-tests.patch | 158 ----------------------- |
14 |
dev-python/psutil/psutil-5.7.0-r1.ebuild | 39 ------ |
15 |
dev-python/psutil/psutil-5.7.2-r1.ebuild | 39 ------ |
16 |
4 files changed, 238 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest |
19 |
index 7dc9e562e7b..5990e841b32 100644 |
20 |
--- a/dev-python/psutil/Manifest |
21 |
+++ b/dev-python/psutil/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 |
24 |
-DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320 |
25 |
DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d |
26 |
|
27 |
diff --git a/dev-python/psutil/files/psutil-5.7.0-tests.patch b/dev-python/psutil/files/psutil-5.7.0-tests.patch |
28 |
deleted file mode 100644 |
29 |
index 9097e90535a..00000000000 |
30 |
--- a/dev-python/psutil/files/psutil-5.7.0-tests.patch |
31 |
+++ /dev/null |
32 |
@@ -1,158 +0,0 @@ |
33 |
-From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001 |
34 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
35 |
-Date: Wed, 19 Feb 2020 07:27:32 +0100 |
36 |
-Subject: [PATCH] Skip broken tests on Gentoo |
37 |
- |
38 |
---- |
39 |
- psutil/tests/test_linux.py | 8 ++++++++ |
40 |
- psutil/tests/test_posix.py | 1 + |
41 |
- psutil/tests/test_process.py | 2 ++ |
42 |
- psutil/tests/test_system.py | 1 + |
43 |
- 4 files changed, 12 insertions(+) |
44 |
- |
45 |
-diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py |
46 |
-index e51f8bd5..48527ccb 100755 |
47 |
---- a/psutil/tests/test_linux.py |
48 |
-+++ b/psutil/tests/test_linux.py |
49 |
-@@ -17,6 +17,7 @@ import re |
50 |
- import shutil |
51 |
- import socket |
52 |
- import struct |
53 |
-+import sys |
54 |
- import tempfile |
55 |
- import textwrap |
56 |
- import time |
57 |
-@@ -381,6 +382,8 @@ class TestSystemVirtualMemory(unittest.TestCase): |
58 |
- ret = psutil.virtual_memory() |
59 |
- assert m.called |
60 |
- self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024) |
61 |
-+ if sys.version_info < (3,): |
62 |
-+ return |
63 |
- w = ws[0] |
64 |
- self.assertIn( |
65 |
- "inactive memory stats couldn't be determined", str(w.message)) |
66 |
-@@ -411,6 +414,8 @@ class TestSystemVirtualMemory(unittest.TestCase): |
67 |
- ret = psutil.virtual_memory() |
68 |
- self.assertEqual( |
69 |
- ret.available, 2057400 * 1024 + 4818144 * 1024) |
70 |
-+ if sys.version_info < (3,): |
71 |
-+ return |
72 |
- w = ws[0] |
73 |
- self.assertIn( |
74 |
- "inactive memory stats couldn't be determined", |
75 |
-@@ -882,6 +887,7 @@ class TestLoadAvg(unittest.TestCase): |
76 |
- @unittest.skipIf(not LINUX, "LINUX only") |
77 |
- class TestSystemNetIfAddrs(unittest.TestCase): |
78 |
- |
79 |
-+ @unittest.skip("broken on Gentoo") |
80 |
- def test_ips(self): |
81 |
- for name, addrs in psutil.net_if_addrs().items(): |
82 |
- for addr in addrs: |
83 |
-@@ -1364,6 +1370,7 @@ class TestMisc(unittest.TestCase): |
84 |
- psutil.PROCFS_PATH = "/proc" |
85 |
- os.rmdir(tdir) |
86 |
- |
87 |
-+ @unittest.skip("broken on Gentoo") |
88 |
- def test_issue_687(self): |
89 |
- # In case of thread ID: |
90 |
- # - pid_exists() is supposed to return False |
91 |
-@@ -2073,6 +2080,7 @@ class TestProcessAgainstStatus(unittest.TestCase): |
92 |
- value = self.read_status_file("nonvoluntary_ctxt_switches:") |
93 |
- self.assertEqual(self.proc.num_ctx_switches().involuntary, value) |
94 |
- |
95 |
-+ @unittest.skip("broken on Gentoo") |
96 |
- def test_cpu_affinity(self): |
97 |
- value = self.read_status_file("Cpus_allowed_list:") |
98 |
- if '-' in str(value): |
99 |
-diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py |
100 |
-index a96b310f..70199203 100755 |
101 |
---- a/psutil/tests/test_posix.py |
102 |
-+++ b/psutil/tests/test_posix.py |
103 |
-@@ -364,6 +364,7 @@ class TestSystemAPIs(unittest.TestCase): |
104 |
- "couldn't find %s nic in 'ifconfig -a' output\n%s" % ( |
105 |
- nic, output)) |
106 |
- |
107 |
-+ @unittest.skip("broken on Gentoo") |
108 |
- @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI") |
109 |
- @retry_on_failure() |
110 |
- def test_users(self): |
111 |
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py |
112 |
-index 987bdf38..cb04f3ef 100755 |
113 |
---- a/psutil/tests/test_process.py |
114 |
-+++ b/psutil/tests/test_process.py |
115 |
-@@ -350,6 +350,7 @@ class TestProcess(unittest.TestCase): |
116 |
- self.assertGreaterEqual(io2[i], 0) |
117 |
- self.assertGreaterEqual(io2[i], 0) |
118 |
- |
119 |
-+ @unittest.skip("fails if builder is ioniced already") |
120 |
- @unittest.skipIf(not HAS_IONICE, "not supported") |
121 |
- @unittest.skipIf(not LINUX, "linux only") |
122 |
- def test_ionice_linux(self): |
123 |
-@@ -1495,6 +1496,7 @@ class TestProcess(unittest.TestCase): |
124 |
- d2 = clean_dict(os.environ.copy()) |
125 |
- self.assertEqual(d1, d2) |
126 |
- |
127 |
-+ @unittest.skip("broken by sandbox") |
128 |
- @unittest.skipIf(not HAS_ENVIRON, "not supported") |
129 |
- @unittest.skipIf(not POSIX, "POSIX only") |
130 |
- def test_weird_environ(self): |
131 |
-diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py |
132 |
-index 3834209f..b07b5883 100755 |
133 |
---- a/psutil/tests/test_system.py |
134 |
-+++ b/psutil/tests/test_system.py |
135 |
-@@ -215,6 +215,7 @@ class TestMiscAPIs(unittest.TestCase): |
136 |
- self.assertGreater(bt, 0) |
137 |
- self.assertLess(bt, time.time()) |
138 |
- |
139 |
-+ @unittest.skip("broken on Gentoo") |
140 |
- @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI") |
141 |
- def test_users(self): |
142 |
- users = psutil.users() |
143 |
--- |
144 |
-2.25.1 |
145 |
- |
146 |
-From 026e4b0076a352fcb1e8de71f1393ae0d50ac06d Mon Sep 17 00:00:00 2001 |
147 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
148 |
-Date: Tue, 26 May 2020 12:28:59 +0200 |
149 |
-Subject: [PATCH] Sort results in test_cpu_affinity_all_combinations |
150 |
- |
151 |
-Fix test_cpu_affinity_all_combinations to permit any CPU order |
152 |
-in results. This fixes test failure due to affinity being reported |
153 |
-out of order: |
154 |
- |
155 |
- ====================================================================== |
156 |
- FAIL: psutil.tests.test_process.TestProcess.test_cpu_affinity_all_combinations |
157 |
- ---------------------------------------------------------------------- |
158 |
- Traceback (most recent call last): |
159 |
- File "/tmp/psutil/psutil/tests/test_process.py", line 940, in test_cpu_affinity_all_combinations |
160 |
- self.assertEqual(p.cpu_affinity(), combo) |
161 |
- AssertionError: Lists differ: [8, 1] != [1, 8] |
162 |
- |
163 |
- First differing element 0: |
164 |
- 8 |
165 |
- 1 |
166 |
- |
167 |
- - [8, 1] |
168 |
- + [1, 8] |
169 |
- |
170 |
- ---------------------------------------------------------------------- |
171 |
---- |
172 |
- psutil/tests/test_process.py | 2 +- |
173 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
174 |
- |
175 |
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py |
176 |
-index a0b21c6e..e3394799 100755 |
177 |
---- a/psutil/tests/test_process.py |
178 |
-+++ b/psutil/tests/test_process.py |
179 |
-@@ -937,7 +937,7 @@ class TestProcess(PsutilTestCase): |
180 |
- |
181 |
- for combo in combos: |
182 |
- p.cpu_affinity(combo) |
183 |
-- self.assertEqual(p.cpu_affinity(), combo) |
184 |
-+ self.assertEqual(sorted(p.cpu_affinity()), sorted(combo)) |
185 |
- |
186 |
- # TODO: #595 |
187 |
- @unittest.skipIf(BSD, "broken on BSD") |
188 |
--- |
189 |
-2.26.2 |
190 |
- |
191 |
|
192 |
diff --git a/dev-python/psutil/psutil-5.7.0-r1.ebuild b/dev-python/psutil/psutil-5.7.0-r1.ebuild |
193 |
deleted file mode 100644 |
194 |
index bba7bd27b88..00000000000 |
195 |
--- a/dev-python/psutil/psutil-5.7.0-r1.ebuild |
196 |
+++ /dev/null |
197 |
@@ -1,39 +0,0 @@ |
198 |
-# Copyright 1999-2021 Gentoo Authors |
199 |
-# Distributed under the terms of the GNU General Public License v2 |
200 |
- |
201 |
-EAPI=7 |
202 |
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) |
203 |
- |
204 |
-inherit distutils-r1 |
205 |
- |
206 |
-DESCRIPTION="Retrieve information on running processes and system utilization" |
207 |
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/" |
208 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
209 |
- |
210 |
-LICENSE="BSD" |
211 |
-SLOT="0" |
212 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
213 |
-IUSE="test" |
214 |
-RESTRICT="!test? ( test )" |
215 |
- |
216 |
-PATCHES=( |
217 |
- "${FILESDIR}/psutil-5.7.0-tests.patch" |
218 |
-) |
219 |
- |
220 |
-python_test() { |
221 |
- if [[ ${EPYTHON} == pypy* ]]; then |
222 |
- ewarn "Not running tests on ${EPYTHON} since they are broken" |
223 |
- return 0 |
224 |
- fi |
225 |
- |
226 |
- # since we are running in an environment a bit similar to CI, |
227 |
- # let's skip the tests that are disable for CI |
228 |
- TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py || |
229 |
- die "tests failed with ${EPYTHON}" |
230 |
-} |
231 |
- |
232 |
-python_compile() { |
233 |
- # force -j1 to avoid .o linking race conditions |
234 |
- local MAKEOPTS=-j1 |
235 |
- distutils-r1_python_compile |
236 |
-} |
237 |
|
238 |
diff --git a/dev-python/psutil/psutil-5.7.2-r1.ebuild b/dev-python/psutil/psutil-5.7.2-r1.ebuild |
239 |
deleted file mode 100644 |
240 |
index 8022b352281..00000000000 |
241 |
--- a/dev-python/psutil/psutil-5.7.2-r1.ebuild |
242 |
+++ /dev/null |
243 |
@@ -1,39 +0,0 @@ |
244 |
-# Copyright 1999-2021 Gentoo Authors |
245 |
-# Distributed under the terms of the GNU General Public License v2 |
246 |
- |
247 |
-EAPI=7 |
248 |
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) |
249 |
- |
250 |
-inherit distutils-r1 |
251 |
- |
252 |
-DESCRIPTION="Retrieve information on running processes and system utilization" |
253 |
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/" |
254 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
255 |
- |
256 |
-LICENSE="BSD" |
257 |
-SLOT="0" |
258 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
259 |
-IUSE="test" |
260 |
-RESTRICT="!test? ( test )" |
261 |
- |
262 |
-PATCHES=( |
263 |
- "${FILESDIR}/psutil-5.7.2-tests.patch" |
264 |
-) |
265 |
- |
266 |
-python_test() { |
267 |
- if [[ ${EPYTHON} == pypy* ]]; then |
268 |
- ewarn "Not running tests on ${EPYTHON} since they are broken" |
269 |
- return 0 |
270 |
- fi |
271 |
- |
272 |
- # since we are running in an environment a bit similar to CI, |
273 |
- # let's skip the tests that are disable for CI |
274 |
- TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py || |
275 |
- die "tests failed with ${EPYTHON}" |
276 |
-} |
277 |
- |
278 |
-python_compile() { |
279 |
- # force -j1 to avoid .o linking race conditions |
280 |
- local MAKEOPTS=-j1 |
281 |
- distutils-r1_python_compile |
282 |
-} |