From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- dev-python/psutil/Manifest | 7 +- dev-python/psutil/files/psutil-5.7.0-tests.patch | 158 ----------------------- dev-python/psutil/psutil-5.7.0-r1.ebuild | 39 ------ dev-python/psutil/psutil-5.7.2-r1.ebuild | 39 ------ dev-python/psutil/psutil-5.7.3.ebuild | 2 +- 5 files changed, 2 insertions(+), 243 deletions(-) delete mode 100644 dev-python/psutil/files/psutil-5.7.0-tests.patch delete mode 100644 dev-python/psutil/psutil-5.7.0-r1.ebuild delete mode 100644 dev-python/psutil/psutil-5.7.2-r1.ebuild (limited to 'dev-python/psutil') diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest index 09843896359b..1220f4837d1b 100644 --- a/dev-python/psutil/Manifest +++ b/dev-python/psutil/Manifest @@ -1,9 +1,4 @@ -AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ceb88538d9abef454724d298225ba3f65f735fd8528d3ed22d4f463e8025677144442ac471aeeea44bbe7c607d55 SHA512 46145825084b5d09e2dfa7f7b765757a8d5ac7ff2379ae66bb628ea30f010daff2fe9d389f7846a1f63f9b03c4b7bd8ac4f4d07a4ed977e06a68b63a4e27231b -DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 -DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320 DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d -EBUILD psutil-5.7.0-r1.ebuild 1140 BLAKE2B 95af4642e5489c02e92536181bc65ac814ee5b48aef220f8a54b8e7e70d53cfcf3a9a31d592c5233b4a2de8180f4018a8759a43aa731bc6a9d327b3db3c3d78b SHA512 7622f810bac7d26ca1a9eef9558e0749b1a506ffc316d4dc253d966d1fb7c14a191b54b3bbae17938dffba157c739526ebe650789d1f063ebd6e1a92963fcd09 -EBUILD psutil-5.7.2-r1.ebuild 1153 BLAKE2B e48b32b47313c8041b518e61a81441a5ad477347371e6156b23eff2e4eddfa859317700d6b03e366484b4c3fba2c2300dfe31d720a03de3d8566070576f27c01 SHA512 70c177b24471ef79854eba6673d66aa558a9ea376c11b502c7c8228f25dfb6e8ecfe96d926938a66ceab9303ff703749084f7ea4c997356ae32a89138b8a3c9f -EBUILD psutil-5.7.3.ebuild 1161 BLAKE2B 1fefed698955a9dfc48e1a61992a3f8c1d8a9395d26327fafdad7237e0c9baa5f966a798f0c2a30553f0adba6b799daa1d1f07357bc67c6d8070d70b5ce759e5 SHA512 b8490a41703a6bc04983a69944c884e7264ed2a5784aaf9f9e9a6e7fc73e10b58a68f96478ee1834df1c06e2e6a564e3c511ed9c34eac47e0c21e76149449ce8 +EBUILD psutil-5.7.3.ebuild 1159 BLAKE2B 4fa7f8b093a37f710ce13ef630afa8086774d7a2b01bafd38c73f423480bf44ac8bffcaae38af7f2ffb5e7e4115d1703adabeeba3de454f5fe420b9cac404928 SHA512 6303bce4bfeab4a1aded7dc91ef498a4beb4a92d48484421c650f92909d29964bd63e105f6ba96621ad9e80b79c87b5cc77f32bae9a268e71bf5b72dda738a70 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0 diff --git a/dev-python/psutil/files/psutil-5.7.0-tests.patch b/dev-python/psutil/files/psutil-5.7.0-tests.patch deleted file mode 100644 index 9097e90535a5..000000000000 --- a/dev-python/psutil/files/psutil-5.7.0-tests.patch +++ /dev/null @@ -1,158 +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,6 +17,7 @@ import re - import shutil - import socket - import struct -+import sys - import tempfile - 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,6 +1370,7 @@ class TestMisc(unittest.TestCase): - psutil.PROCFS_PATH = "/proc" - os.rmdir(tdir) - -+ @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 - -From 026e4b0076a352fcb1e8de71f1393ae0d50ac06d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Tue, 26 May 2020 12:28:59 +0200 -Subject: [PATCH] Sort results in test_cpu_affinity_all_combinations - -Fix test_cpu_affinity_all_combinations to permit any CPU order -in results. This fixes test failure due to affinity being reported -out of order: - - ====================================================================== - FAIL: psutil.tests.test_process.TestProcess.test_cpu_affinity_all_combinations - ---------------------------------------------------------------------- - Traceback (most recent call last): - File "/tmp/psutil/psutil/tests/test_process.py", line 940, in test_cpu_affinity_all_combinations - self.assertEqual(p.cpu_affinity(), combo) - AssertionError: Lists differ: [8, 1] != [1, 8] - - First differing element 0: - 8 - 1 - - - [8, 1] - + [1, 8] - - ---------------------------------------------------------------------- ---- - psutil/tests/test_process.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py -index a0b21c6e..e3394799 100755 ---- a/psutil/tests/test_process.py -+++ b/psutil/tests/test_process.py -@@ -937,7 +937,7 @@ class TestProcess(PsutilTestCase): - - for combo in combos: - p.cpu_affinity(combo) -- self.assertEqual(p.cpu_affinity(), combo) -+ self.assertEqual(sorted(p.cpu_affinity()), sorted(combo)) - - # TODO: #595 - @unittest.skipIf(BSD, "broken on BSD") --- -2.26.2 - diff --git a/dev-python/psutil/psutil-5.7.0-r1.ebuild b/dev-python/psutil/psutil-5.7.0-r1.ebuild deleted file mode 100644 index bba7bd27b88f..000000000000 --- a/dev-python/psutil/psutil-5.7.0-r1.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_{7,8,9} 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 ~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.0-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 -} diff --git a/dev-python/psutil/psutil-5.7.2-r1.ebuild b/dev-python/psutil/psutil-5.7.2-r1.ebuild deleted file mode 100644 index 8022b3522812..000000000000 --- a/dev-python/psutil/psutil-5.7.2-r1.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_{7,8,9} 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 -} diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild index 40677b1a3599..ddf8240254b4 100644 --- a/dev-python/psutil/psutil-5.7.3.ebuild +++ b/dev-python/psutil/psutil-5.7.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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 )" -- cgit v1.2.3