From 4e86e0ef1a808527b4211d92626e0d83e9ca4f80 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@p37t)" Date: Sun, 6 Sep 2020 06:47:39 +0200 Subject: [PATCH] psutil: cleanup & remove olds --- CHANGELOG.txt | 1 + dev-python/psutil/Manifest | 6 +- .../psutil/files/psutil-5.7.2-tests.patch | 112 ++++++++++++++++++ dev-python/psutil/psutil-5.6.2.ebuild | 32 ----- dev-python/psutil/psutil-5.6.3-r1.ebuild | 32 ----- dev-python/psutil/psutil-5.6.3.ebuild | 32 ----- 6 files changed, 114 insertions(+), 101 deletions(-) create mode 100644 dev-python/psutil/files/psutil-5.7.2-tests.patch delete mode 100644 dev-python/psutil/psutil-5.6.2.ebuild delete mode 100644 dev-python/psutil/psutil-5.6.3-r1.ebuild delete mode 100644 dev-python/psutil/psutil-5.6.3.ebuild diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c4460387b..57730403c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ * cdu-0.1.3: cleanup & remove olds * gTTS-token-1.1.3-r2: cleanup & remove olds * mypy: cleanup & remove olds + * psutil: cleanup & remove olds 2020-09-05 * repair iglo-1.2.7, drop iglo-1.2.5, abondoned anyway: https://github.com/jesserockz/python-iglo/issues/1#issuecomment-558479023 diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest index 48d228881..b3f02fef8 100644 --- a/dev-python/psutil/Manifest +++ b/dev-python/psutil/Manifest @@ -1,15 +1,11 @@ AUX psutil-5.6.5-tests.patch 3942 BLAKE2B 95c1f1c65b68a274d4bae00acc7872dbc25e646a94cb466f811efa90883cc233fdcad9f268c77f56a0a4cacdb65089e0c4038c16a7ddf275260055b2b7127a92 SHA512 de6e199927e548cda039c8296b8f8402391ea48586db873e8d1337145428eaebcb5f64847f3c661883a2898be1345edef4ff1cb30da3da84daecede2eff4907c AUX psutil-5.6.6-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a4a6150fa8679df01bba7fe99925f97bdaab61cac7ffa19341ea33c7a68260d644fea09a4774b795e813e12c4a4 SHA512 e33a7d375b72b3d43169adb493d8ad0684a2ce88159fdeb2e92ed966b2de1a6381a023f2e226b8d91194c66eeee4ce2b936cc08a9a84152a7119fecd8679723e AUX psutil-5.6.7-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a4a6150fa8679df01bba7fe99925f97bdaab61cac7ffa19341ea33c7a68260d644fea09a4774b795e813e12c4a4 SHA512 e33a7d375b72b3d43169adb493d8ad0684a2ce88159fdeb2e92ed966b2de1a6381a023f2e226b8d91194c66eeee4ce2b936cc08a9a84152a7119fecd8679723e -DIST psutil-5.6.2.tar.gz 432907 BLAKE2B 0fd1761b512d6cf2ba2e9939b4bb24ecf71b1eadcc0c51030eb85e0f33135a97a8b1c1a736a6258a45572f92d8eca6f0a18bfe189c3ada0490cdff0299d49bc2 SHA512 ff41428b43c59ad948b8b4e6824943258abb30dc76cd042bdf7fe72d5aceb9bcbd2a2038a6a43d2b4c36eccae9007ef78779fe0cb5ee3caa68da9b1ba687b66d -DIST psutil-5.6.3.tar.gz 435374 BLAKE2B 33d508c9b9838bc07a5d37d284d533c1a795ac871bdf1a9383c14408af6c31ef59bda4f5a144181e1f7870b8fb10dda61968c449463da27214d51471a79a2397 SHA512 62cf120c9391705bd393d6554afa32d672470b61ebb3c0e7458bad26134b784175ba64d3eff119ace6def2aebc97df73cd0c9d213776176ce39c3d47da3f3d9c +AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ceb88538d9abef454724d298225ba3f65f735fd8528d3ed22d4f463e8025677144442ac471aeeea44bbe7c607d55 SHA512 46145825084b5d09e2dfa7f7b765757a8d5ac7ff2379ae66bb628ea30f010daff2fe9d389f7846a1f63f9b03c4b7bd8ac4f4d07a4ed977e06a68b63a4e27231b DIST psutil-5.6.6.tar.gz 447805 BLAKE2B fd40f134a9b0f470487d3927e8b75e3eb4c6111f019bbc0f94158a30d865ff6235c4f137164ccf3bbaa90e6a010c600867278988c4b56cd170a8fbf3d7377ec3 SHA512 098c1172639a4d75e568fe5a0fe011cb385794497c4d30797da6a0af200f4e36f6b686e206b8b7f6427bcde21512724af6c6c32ac47737a717fe9ee023b93207 DIST psutil-5.6.7.tar.gz 448321 BLAKE2B 4e47fb7def5a0eed162686d4e90dd122bd380eca50c3294cd89ed154e27f71972dbc2b3b481456d5022107a1adad2a637e8f233002d429463232c38a04a957c7 SHA512 74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320 -EBUILD psutil-5.6.2.ebuild 773 BLAKE2B ceb354dcb9c1e823431539c7dd713e2637cfe97623de4cf2a29f37ad039140b6f1e6076e011cbe2ba6babf2cfaaf5ac8e57d2bc2e951194be71f55d599c508d5 SHA512 c766a7a45242d0e1da380eefc3e5a0cb722d96dc768aed4e6d36ccb2eee11bafa915f8c2347ed54e4b398871c4f922eccd217d13c75ee44bd3441a0b984d7238 -EBUILD psutil-5.6.3-r1.ebuild 748 BLAKE2B 5843883c80bd7bb7e5b8abe19a87d6198d6ee5d8439f82fd48bcc7382cb97fbd43382df9d3f03f3a12e9d9f7b9cdfa23b3f53b48eff8869bf76a07f3cf250dfe SHA512 3df6a8b1d11498054f4217d4fbe459d67644a5e69bc95e9f05768e9b532db9daa7e28703af301ada04722e040e43b57a6f80d5e2c2adce937672a0c53e1a79a6 -EBUILD psutil-5.6.3.ebuild 773 BLAKE2B ceb354dcb9c1e823431539c7dd713e2637cfe97623de4cf2a29f37ad039140b6f1e6076e011cbe2ba6babf2cfaaf5ac8e57d2bc2e951194be71f55d599c508d5 SHA512 c766a7a45242d0e1da380eefc3e5a0cb722d96dc768aed4e6d36ccb2eee11bafa915f8c2347ed54e4b398871c4f922eccd217d13c75ee44bd3441a0b984d7238 EBUILD psutil-5.6.6.ebuild 1037 BLAKE2B 3e8a63da766d066381cf25c059167a39cc58cb5e09502237f9d7ff346ec9a394a8e637454acfda5ae0c72b059136ad41c59d52496d814848221e15c25d10f6ee SHA512 c6472712f1a31322e7de9d7dd4bb8dd8e578790e1caeb77996cc6e7d27ffbc50a094fc59b100e657ed063e04691db2d05373d9d1bfb045f8d02f27d4cd3ebc29 EBUILD psutil-5.6.7.ebuild 1037 BLAKE2B 3e8a63da766d066381cf25c059167a39cc58cb5e09502237f9d7ff346ec9a394a8e637454acfda5ae0c72b059136ad41c59d52496d814848221e15c25d10f6ee SHA512 c6472712f1a31322e7de9d7dd4bb8dd8e578790e1caeb77996cc6e7d27ffbc50a094fc59b100e657ed063e04691db2d05373d9d1bfb045f8d02f27d4cd3ebc29 EBUILD psutil-5.7.0.ebuild 1037 BLAKE2B 3e8a63da766d066381cf25c059167a39cc58cb5e09502237f9d7ff346ec9a394a8e637454acfda5ae0c72b059136ad41c59d52496d814848221e15c25d10f6ee SHA512 c6472712f1a31322e7de9d7dd4bb8dd8e578790e1caeb77996cc6e7d27ffbc50a094fc59b100e657ed063e04691db2d05373d9d1bfb045f8d02f27d4cd3ebc29 diff --git a/dev-python/psutil/files/psutil-5.7.2-tests.patch b/dev-python/psutil/files/psutil-5.7.2-tests.patch new file mode 100644 index 000000000..3faaedad6 --- /dev/null +++ b/dev-python/psutil/files/psutil-5.7.2-tests.patch @@ -0,0 +1,112 @@ +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.6.2.ebuild b/dev-python/psutil/psutil-5.6.2.ebuild deleted file mode 100644 index 22c5bcbc7..000000000 --- a/dev-python/psutil/psutil-5.6.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy 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="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/ipaddress[${PYTHON_USEDEP}] - ) -" - -# Many tests fail, even on a regular tox run on a upstream clone -RESTRICT="test" - -python_test() { - ${PYTHON} psutil/tests/__main__.py || die -} diff --git a/dev-python/psutil/psutil-5.6.3-r1.ebuild b/dev-python/psutil/psutil-5.6.3-r1.ebuild deleted file mode 100644 index 0e75d224b..000000000 --- a/dev-python/psutil/psutil-5.6.3-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -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="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/ipaddress[${PYTHON_USEDEP}] - ) -" - -# Many tests fail, even on a regular tox run on a upstream clone -RESTRICT="test" - -python_test() { - ${PYTHON} psutil/tests/__main__.py || die -} diff --git a/dev-python/psutil/psutil-5.6.3.ebuild b/dev-python/psutil/psutil-5.6.3.ebuild deleted file mode 100644 index 22c5bcbc7..000000000 --- a/dev-python/psutil/psutil-5.6.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy 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="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/ipaddress[${PYTHON_USEDEP}] - ) -" - -# Many tests fail, even on a regular tox run on a upstream clone -RESTRICT="test" - -python_test() { - ${PYTHON} psutil/tests/__main__.py || die -}