diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /dev-python/psutil | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'dev-python/psutil')
-rw-r--r-- | dev-python/psutil/Manifest | 14 | ||||
-rw-r--r-- | dev-python/psutil/files/psutil-5.6.5-tests.patch | 90 | ||||
-rw-r--r-- | dev-python/psutil/files/psutil-5.7.0-tests.patch | 113 | ||||
-rw-r--r-- | dev-python/psutil/psutil-5.4.8.ebuild | 32 | ||||
-rw-r--r-- | dev-python/psutil/psutil-5.5.0.ebuild | 32 | ||||
-rw-r--r-- | dev-python/psutil/psutil-5.6.0.ebuild | 31 | ||||
-rw-r--r-- | dev-python/psutil/psutil-5.6.7-r1.ebuild (renamed from dev-python/psutil/psutil-5.6.7.ebuild) | 6 | ||||
-rw-r--r-- | dev-python/psutil/psutil-5.7.0.ebuild (renamed from dev-python/psutil/psutil-5.6.5.ebuild) | 19 |
8 files changed, 134 insertions, 203 deletions
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest index 0a89ca09d58f..a7f5cc22b636 100644 --- a/dev-python/psutil/Manifest +++ b/dev-python/psutil/Manifest @@ -1,13 +1,7 @@ -AUX psutil-5.6.5-tests.patch 3942 BLAKE2B 95c1f1c65b68a274d4bae00acc7872dbc25e646a94cb466f811efa90883cc233fdcad9f268c77f56a0a4cacdb65089e0c4038c16a7ddf275260055b2b7127a92 SHA512 de6e199927e548cda039c8296b8f8402391ea48586db873e8d1337145428eaebcb5f64847f3c661883a2898be1345edef4ff1cb30da3da84daecede2eff4907c AUX psutil-5.6.7-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a4a6150fa8679df01bba7fe99925f97bdaab61cac7ffa19341ea33c7a68260d644fea09a4774b795e813e12c4a4 SHA512 e33a7d375b72b3d43169adb493d8ad0684a2ce88159fdeb2e92ed966b2de1a6381a023f2e226b8d91194c66eeee4ce2b936cc08a9a84152a7119fecd8679723e -DIST psutil-5.4.8.tar.gz 422742 BLAKE2B 13c4b9b412704728c4b192032a6be78756b03a37cd6f425a81a83d0aca4ce155ebf24a1f62b75e66433f21e8bd3f2fa3c7bbb5ec2686c6dc951b89e97ebfa688 SHA512 5691e7e7ecd827aff2755a85c4c1be3a23beec3a1dbff079547991dcfffa8e075cff7fb6983e1f6fa287e2216e3b1466618730afaf114a0ee209d7b70d7b0c6a -DIST psutil-5.5.0.tar.gz 425058 BLAKE2B 0a13149b060d1a99faa600470fdbd592ee520b247f916313bef428feaa652bc4e9152f09ceeea5378769d4cdcd9876ccdc96dc4378d74136bcbcadf4a9266b90 SHA512 e614d41162087e236779738b50ec9e83403082f20492e152605fe80da23a11a4bd667db82a234f00815f68139d53b19368c2118ab27d52144341c2250091c570 -DIST psutil-5.6.0.tar.gz 426596 BLAKE2B 803cb09262575a7193ecc9cf9bfbbf721e10ef4adc25672f6747111306d1803c1422c9894636421653eaae11c241100f58837c80173ab473bb9dc39da2580aed SHA512 01daf80698954a53a9e987afad6c7aefad502c76b5f34601728c3864c924ca52099f139242e508fd4c72378cbe436c9870eca7a33c112fb8dead0be501aaf2aa -DIST psutil-5.6.5.tar.gz 447489 BLAKE2B 9301d1580bded927b4b117facf82a3c6be9b43cb648f0f52b841dc2c59cbcc58b5a5c3e0ea7cee30a546e1ea1c00fc0e03b3b49fa69209bbfd3c873e18510859 SHA512 037b1501b686b7101be4180c8698b09d20d4260962a88f0c437ff558d91c405f56eae186c9d55c1893c612c4534093ab26e6943f0ed56db69e343c5c0317be1b +AUX psutil-5.7.0-tests.patch 4420 BLAKE2B a3daf702d70c2a945a7373e34d7ddbb730f884eb99716605f3d202a4bcb271d899330de9a96d7666ebf743157604721f5ee76136559f33ac34d8a0ecab4368a5 SHA512 89315123d1de4c5f1601b56bbaa200a180419865ba2e303b8470c56ea36d7eba251bcc2592b61659762c04f02e4ccea20a4774a11b4936c03efbbd42f58c4a51 DIST psutil-5.6.7.tar.gz 448321 BLAKE2B 4e47fb7def5a0eed162686d4e90dd122bd380eca50c3294cd89ed154e27f71972dbc2b3b481456d5022107a1adad2a637e8f233002d429463232c38a04a957c7 SHA512 74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503 -EBUILD psutil-5.4.8.ebuild 911 BLAKE2B 552531d6c0b70dcb013cb8a4f089fa788cc90c0ba62a82f11b48dbb7e9f7f6d9ede63c8f51c8e89be55c1242569fa60c2e8b6246914d996fd3d9d96d412949c4 SHA512 54a6fde56fd09337094025e5272615e03c521d66c041a9cf0d11850c0b7c36734e02cf5082f0e6567955593badccd73dc87bc655df98376dff8d0f3a39640bad -EBUILD psutil-5.5.0.ebuild 902 BLAKE2B 73d74d37194d56024151676e46d7ab2de98bc4b28cd9ff2d1763290df33f71eb526d2ab5bbb402fd755794386ef6995224f1ec58a686f6c07af36714ae1f97bf SHA512 5df37887f03dff322ceb6eacd0d1737bb1b31a203c1664a7ed38e7a01cf31c2f1bdcd0eb707626cca4ec523b53d429b9608dcf23a0861a2e1513c2362250a291 -EBUILD psutil-5.6.0.ebuild 904 BLAKE2B 5d85f27ecb4d758cf8ea4de82d0605ec1f8cf047835259c6069230f936b9a212b082be539cce6f8c5ae70c83a391ffb42f11ea8e7b4d6e7ce9f1f34fc38f327d SHA512 27991183c768aaacc25993d727b3905a74df0638b69c1d0f5a23e38c7008fab9bfc8e67e49067bd4775773ae79587824c4ba38505cbd13d984e08d3e185c72ec -EBUILD psutil-5.6.5.ebuild 1219 BLAKE2B b9a1cf7ddcf48299f0b9a97754b29d3b6ca3ca32b34f15c2bec7da5c189cb744d11cc7b06d7a6e7f89500627a40b754eccf68016d383d9d4e36cb64507cc6b39 SHA512 95145244df8b0a050ac9e74068c5a82dce594169a7a8157a973faf7b99cb17711c7d4ddad70525c756c72e35fd7c675f68156e7b8de9569f3a4e27fc67f2f652 -EBUILD psutil-5.6.7.ebuild 1300 BLAKE2B 4840866eea59dbbad5fb5a395e93de1f5463ad339e89d2119928b6b890121a291a7b7d64a22f60c9ee3b66fe180c938de1c7c21115375a0ee29336d4f3546508 SHA512 307518cc34244bcd2caf3bb74b4179cdaef1e388feafc1ad581f858a53c93c586215ee79bae4e4d12c88af4a515882ab0f6cca85c92651a1cb931a472b05750c +DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 +EBUILD psutil-5.6.7-r1.ebuild 1336 BLAKE2B cc0a153d2eabe52ad6224f181e84f769faef36a8619a50e34426f3eb538c0e3302c268ab5acd94b2cc812e2eb4085c2557a10e793888b8b295955c515243b11d SHA512 cfc2c90df13a952ca2b054f05233d2ace7e6cf4788c7404e28a3fbd594fe4668e48f3ab711fcc09d08613d603d193df3ecb674b2d60329625a9b54a03865ed61 +EBUILD psutil-5.7.0.ebuild 1343 BLAKE2B 43db8ce77edc252c097d9eefa36bcc697a6224517cdaca2a72b83f02645737a321e23a8de716704a9c8b8bbb82ba686824a79b751926985037c1f6734f5cfff0 SHA512 4d5ccc004d4930c23e61e5bb993930cc358eeb73c908661208ad2e278306c779a5dd99ee3768392d246de7ebfc48f56f122b8c0603872069b3807692f907138f MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d diff --git a/dev-python/psutil/files/psutil-5.6.5-tests.patch b/dev-python/psutil/files/psutil-5.6.5-tests.patch deleted file mode 100644 index ab06ffd069b6..000000000000 --- a/dev-python/psutil/files/psutil-5.6.5-tests.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py -index 80fbf8bf..13c195b8 100644 ---- a/psutil/_pslinux.py -+++ b/psutil/_pslinux.py -@@ -1108,7 +1108,7 @@ def disk_io_counters(perdisk=False): - fields = f.read().strip().split() - name = os.path.basename(root) - (reads, reads_merged, rbytes, rtime, writes, writes_merged, -- wbytes, wtime, _, busy_time, _) = map(int, fields) -+ wbytes, wtime, _, busy_time, _) = map(int, fields[:11]) - yield (name, reads, writes, rbytes, wbytes, rtime, - wtime, reads_merged, writes_merged, busy_time) - -diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py -index cb4a2b96..1ff7f6ca 100755 ---- a/psutil/tests/test_contracts.py -+++ b/psutil/tests/test_contracts.py -@@ -174,6 +174,7 @@ class TestAvailability(unittest.TestCase): - - class TestDeprecations(unittest.TestCase): - -+ @unittest.skip("broken with newer deps") - def test_memory_info_ex(self): - with warnings.catch_warnings(record=True) as ws: - psutil.Process().memory_info_ex() -diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py -index ccde735d..db7183af 100755 ---- a/psutil/tests/test_linux.py -+++ b/psutil/tests/test_linux.py -@@ -380,9 +380,10 @@ class TestSystemVirtualMemory(unittest.TestCase): - ret = psutil.virtual_memory() - assert m.called - self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024) -- w = ws[0] -- self.assertIn( -- "inactive memory stats couldn't be determined", str(w.message)) -+ # i have no idea what they are trying to do here -+ #w = ws[0] -+ #self.assertIn( -+ # "inactive memory stats couldn't be determined", str(w.message)) - - def test_avail_old_missing_zoneinfo(self): - # Remove /proc/zoneinfo file. Make sure fallback is used -@@ -410,10 +411,12 @@ class TestSystemVirtualMemory(unittest.TestCase): - ret = psutil.virtual_memory() - self.assertEqual( - ret.available, 2057400 * 1024 + 4818144 * 1024) -- w = ws[0] -- self.assertIn( -- "inactive memory stats couldn't be determined", -- str(w.message)) -+ -+ # i have no idea what they are trying to do here -+ #w = ws[0] -+ #self.assertIn( -+ # "inactive memory stats couldn't be determined", -+ # str(w.message)) - - def test_virtual_memory_mocked(self): - # Emulate /proc/meminfo because neither vmstat nor free return slab. -@@ -878,7 +881,7 @@ class TestLoadAvg(unittest.TestCase): - # ===================================================================== - - --@unittest.skipIf(not LINUX, "LINUX only") -+@unittest.skipIf(not LINUX or True, "Not working with latest ipaddress") - class TestSystemNetIfAddrs(unittest.TestCase): - - def test_ips(self): -diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py -index 24a29b5a..9d9d36d2 100755 ---- a/psutil/tests/test_process.py -+++ b/psutil/tests/test_process.py -@@ -950,7 +950,7 @@ class TestProcess(unittest.TestCase): - - for combo in combos: - p.cpu_affinity(combo) -- self.assertEqual(p.cpu_affinity(), combo) -+ self.assertEqual(set(p.cpu_affinity()), set(combo)) - - # TODO: #595 - @unittest.skipIf(BSD, "broken on BSD") -@@ -1486,6 +1486,7 @@ class TestProcess(unittest.TestCase): - d2 = clean_dict(os.environ.copy()) - self.assertEqual(d1, d2) - -+ @unittest.skipIf(TRAVIS, "broken under sandbox, using TRAVIS for Gentoo") - @unittest.skipIf(not HAS_ENVIRON, "not supported") - @unittest.skipIf(not POSIX, "POSIX only") - def test_weird_environ(self): diff --git a/dev-python/psutil/files/psutil-5.7.0-tests.patch b/dev-python/psutil/files/psutil-5.7.0-tests.patch new file mode 100644 index 000000000000..2def4979faf4 --- /dev/null +++ b/dev-python/psutil/files/psutil-5.7.0-tests.patch @@ -0,0 +1,113 @@ +From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +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 + diff --git a/dev-python/psutil/psutil-5.4.8.ebuild b/dev-python/psutil/psutil-5.4.8.ebuild deleted file mode 100644 index 02ce4a8970ab..000000000000 --- a/dev-python/psutil/psutil-5.4.8.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_{6,7} 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild deleted file mode 100644 index 98afea2f8060..000000000000 --- a/dev-python/psutil/psutil-5.5.0.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_{6,7} 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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.0.ebuild b/dev-python/psutil/psutil-5.6.0.ebuild deleted file mode 100644 index 205a8af99750..000000000000 --- a/dev-python/psutil/psutil-5.6.0.ebuild +++ /dev/null @@ -1,31 +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_{6,7} 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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.7.ebuild b/dev-python/psutil/psutil-5.6.7-r1.ebuild index ca07e5b732d8..251842c884bd 100644 --- a/dev-python/psutil/psutil-5.6.7.ebuild +++ b/dev-python/psutil/psutil-5.6.7-r1.ebuild @@ -19,8 +19,10 @@ RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/ipaddress[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/mock[${PYTHON_USEDEP}] + dev-python/ipaddress[${PYTHON_USEDEP}] + ' -2) ) " diff --git a/dev-python/psutil/psutil-5.6.5.ebuild b/dev-python/psutil/psutil-5.7.0.ebuild index c33d3e6eddaf..7940191f1b91 100644 --- a/dev-python/psutil/psutil-5.6.5.ebuild +++ b/dev-python/psutil/psutil-5.7.0.ebuild @@ -14,19 +14,20 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" +RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/ipaddress[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/mock[${PYTHON_USEDEP}] + dev-python/ipaddress[${PYTHON_USEDEP}] + ' -2) ) " -RESTRICT="!test? ( test )" - PATCHES=( - "${FILESDIR}/psutil-5.6.5-tests.patch" + "${FILESDIR}/psutil-5.7.0-tests.patch" ) python_test() { @@ -37,6 +38,12 @@ python_test() { # 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 PYTHONPATH="${BUILD_DIR}/lib" ${PYTHON} psutil/tests/__main__.py || \ + 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 +} |