From 3572ea83812989bcdd78595b105e478db0ff92d2 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Fri, 13 May 2022 14:30:16 +0800 Subject: [PATCH] psutil: remove in Gentoo's favour --- dev-python/psutil/Manifest | 1 - .../psutil/files/psutil-5.7.2-tests.patch | 112 ------------------ dev-python/psutil/psutil-5.8.0.ebuild | 39 ------ 3 files changed, 152 deletions(-) delete mode 100644 dev-python/psutil/Manifest delete mode 100644 dev-python/psutil/files/psutil-5.7.2-tests.patch delete mode 100644 dev-python/psutil/psutil-5.8.0.ebuild diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest deleted file mode 100644 index 1168c1b14..000000000 --- a/dev-python/psutil/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST psutil-5.8.0.tar.gz 470886 BLAKE2B f3d8d55dcbc2e0821f1ce96b9187692b2389681e13599b04e33b10f11fbe02f768a4dfc0802fe506713c8c3306d4c7011f2ac659c78f6a23a5523c7e36abc318 SHA512 b716bcbf33ceacdc30ddd0d0cf9bca0ab7751225b8f20dea664a82751dc88cb590720b098ae26056c8b3cdabcfe2fa198d618cea24c21465b1368a52ee182818 diff --git a/dev-python/psutil/files/psutil-5.7.2-tests.patch b/dev-python/psutil/files/psutil-5.7.2-tests.patch deleted file mode 100644 index 3faaedad6..000000000 --- a/dev-python/psutil/files/psutil-5.7.2-tests.patch +++ /dev/null @@ -1,112 +0,0 @@ -From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 19 Feb 2020 07:27:32 +0100 -Subject: [PATCH] Skip broken tests on Gentoo - ---- - psutil/tests/test_linux.py | 8 ++++++++ - psutil/tests/test_posix.py | 1 + - psutil/tests/test_process.py | 2 ++ - psutil/tests/test_system.py | 1 + - 4 files changed, 12 insertions(+) - -diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py -index e51f8bd5..48527ccb 100755 ---- a/psutil/tests/test_linux.py -+++ b/psutil/tests/test_linux.py -@@ -17,5 +17,6 @@ import re - import shutil - import socket - import struct -+import sys - import textwrap - import time -@@ -381,6 +382,8 @@ class TestSystemVirtualMemory(unittest.TestCase): - ret = psutil.virtual_memory() - assert m.called - self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024) -+ if sys.version_info < (3,): -+ return - w = ws[0] - self.assertIn( - "inactive memory stats couldn't be determined", str(w.message)) -@@ -411,6 +414,8 @@ class TestSystemVirtualMemory(unittest.TestCase): - ret = psutil.virtual_memory() - self.assertEqual( - ret.available, 2057400 * 1024 + 4818144 * 1024) -+ if sys.version_info < (3,): -+ return - w = ws[0] - self.assertIn( - "inactive memory stats couldn't be determined", -@@ -882,6 +887,7 @@ class TestLoadAvg(unittest.TestCase): - @unittest.skipIf(not LINUX, "LINUX only") - class TestSystemNetIfAddrs(unittest.TestCase): - -+ @unittest.skip("broken on Gentoo") - def test_ips(self): - for name, addrs in psutil.net_if_addrs().items(): - for addr in addrs: -@@ -1364,7 +1370,8 @@ class TestMisc(unittest.TestCase): - psutil.PROCFS_PATH = "/proc" - os.rmdir(tdir) - - @retry_on_failure() -+ @unittest.skip("broken on Gentoo") - def test_issue_687(self): - # In case of thread ID: - # - pid_exists() is supposed to return False -@@ -2073,6 +2080,7 @@ class TestProcessAgainstStatus(unittest.TestCase): - value = self.read_status_file("nonvoluntary_ctxt_switches:") - self.assertEqual(self.proc.num_ctx_switches().involuntary, value) - -+ @unittest.skip("broken on Gentoo") - def test_cpu_affinity(self): - value = self.read_status_file("Cpus_allowed_list:") - if '-' in str(value): -diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py -index a96b310f..70199203 100755 ---- a/psutil/tests/test_posix.py -+++ b/psutil/tests/test_posix.py -@@ -364,6 +364,7 @@ class TestSystemAPIs(unittest.TestCase): - "couldn't find %s nic in 'ifconfig -a' output\n%s" % ( - nic, output)) - -+ @unittest.skip("broken on Gentoo") - @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI") - @retry_on_failure() - def test_users(self): -diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py -index 987bdf38..cb04f3ef 100755 ---- a/psutil/tests/test_process.py -+++ b/psutil/tests/test_process.py -@@ -350,6 +350,7 @@ class TestProcess(unittest.TestCase): - self.assertGreaterEqual(io2[i], 0) - self.assertGreaterEqual(io2[i], 0) - -+ @unittest.skip("fails if builder is ioniced already") - @unittest.skipIf(not HAS_IONICE, "not supported") - @unittest.skipIf(not LINUX, "linux only") - def test_ionice_linux(self): -@@ -1495,6 +1496,7 @@ class TestProcess(unittest.TestCase): - d2 = clean_dict(os.environ.copy()) - self.assertEqual(d1, d2) - -+ @unittest.skip("broken by sandbox") - @unittest.skipIf(not HAS_ENVIRON, "not supported") - @unittest.skipIf(not POSIX, "POSIX only") - def test_weird_environ(self): -diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py -index 3834209f..b07b5883 100755 ---- a/psutil/tests/test_system.py -+++ b/psutil/tests/test_system.py -@@ -215,6 +215,7 @@ class TestMiscAPIs(unittest.TestCase): - self.assertGreater(bt, 0) - self.assertLess(bt, time.time()) - -+ @unittest.skip("broken on Gentoo") - @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI") - def test_users(self): - users = psutil.users() --- -2.25.1 diff --git a/dev-python/psutil/psutil-5.8.0.ebuild b/dev-python/psutil/psutil-5.8.0.ebuild deleted file mode 100644 index e368a59df..000000000 --- a/dev-python/psutil/psutil-5.8.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{9..10} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Retrieve information on running processes and system utilization" -HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -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" -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/psutil-5.7.2-tests.patch" -) - -python_test() { - if [[ ${EPYTHON} == pypy* ]]; then - ewarn "Not running tests on ${EPYTHON} since they are broken" - return 0 - fi - - # since we are running in an environment a bit similar to CI, - # let's skip the tests that are disable for CI - TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py || - die "tests failed with ${EPYTHON}" -} - -python_compile() { - # force -j1 to avoid .o linking race conditions - local MAKEOPTS=-j1 - distutils-r1_python_compile -}