gentoo Easter resync : 12.04.2020

5 files changed, 75 insertions, 14 deletions

diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 0b20ee9018b9..9a9038e3860e 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,5 +1,6 @@
-DIST objgraph-3.1.0.tar.gz 629772 BLAKE2B afa34613d8b05399dec1429465d81b026000ac22c0d345289ce7b2c9c7cc0a0bb6db0054bc7f92ab8d0c69e2d40cf860dc46350951251c106e7718daa8efa0fc SHA512 4b997ff1942556fdeece39080ad00d915136d314add94e61e4b3102e332ce3fd029f7082fbbadeffae63f157f05f8af4871dc5b7ee26926d790fb043ad8f2130
+AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bcb58275d90f59fca9dcc8bebdd52f5d6ed69455f9135647b27ed64d3251cb7d7b5f3da4e7b394bf45a45791b73c73 SHA512 8d8a43bcb75141a5fa278871d7e4e3b2ba1dcb833967a347f334675d6fa1a510d7f9abbcae82419617fc593ca02e1708ff69d9b4babe1d23e08d24814f9b564b
 DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
-EBUILD objgraph-3.1.0.ebuild 589 BLAKE2B 5a6366284274f838b5d4ec375107c6965f45d4165455458aa12ec6bfd178581e3c3bc527f8d9cc6ddacae276720e57e9a5efc849519bba3620cdb5510fca18ce SHA512 baca623f2dbd6a1db055b76b923f7cc21ad8f391711253b9af13b63f23b9d947d959c61e5b34fd30d9f67cfc2b5d9b5d348144a56ae62e53ec270c4ded004191
-EBUILD objgraph-3.4.0.ebuild 660 BLAKE2B f265ac0bc152f6fa3909ba2479b8b39cf67e956d1ac147de9f9ba0d078ef1a476399ea01c6ed6353e440decb8e3be7bee1e59deb5f05a69236ff3924a5c788ef SHA512 26b48654cee5ab0ad823479a1394befed15cdc631f11c2e6083812a8f4cd501d8e6a8e5f020efd91d2f8d03db38cab5423d530a21d245291124cf120d5cdb07b
-MISC metadata.xml 422 BLAKE2B 079428e0094ac67f67e608a3f99dc09a92b6db7de99db8603357a134476f73d135a8605c6c86c5acb8c1d796168badf635ddd526b7710d40cda49451457fba48 SHA512 efdbee08e75b435bc2c976b80ff251eeeaea1e806f8cbcfbc288711f31831b4aca279b303d3e261447c3a8eecd5997c8db848812951c86c02f01b74a9c1de146
+DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
+EBUILD objgraph-3.4.0.ebuild 658 BLAKE2B 1a70a174cdc6d7b43860e3006d136b8d912c9a98244b492ef1372589c7951fa01e5953d1833e0fdeadd81bf1a64a529897d56582919634d33b58ccd373f306d7 SHA512 6209380e4e502984ab691bd2525f1eb89f7b44dccd9e7a84a99c5814b8e011c0937d14b5e405b9f42d112a50650f4714eba0d69de3def539460f3a29229e0da5
+EBUILD objgraph-3.4.1.ebuild 719 BLAKE2B 89ff9d86dc105d35b173c726928425a518eb8eaadb6bf9efd867d44819c7512b256aae2592105c05d201a830162d8f46cb635d83f3c9497d9f2dbca3ad39d9a0 SHA512 1247264a0bcaef5354e5b18054fa5a1da9b36ee4dfc3bd50e568def63769f4f173db6aa5a7fdfed502fa1784bfb816767bb34eea299719c52f8ffc014f5d5b2f
+MISC metadata.xml 323 BLAKE2B 61446164eeea15b99f003a44e0b0c3eedf83a0797401922efc0d6509c86446823201e9c7b91a11264f852ce0a56a2d6d5d5b27fe9d2205a4276c2cce5a312625 SHA512 94389cd95cc8aab6c1acd18c2135eac25566894f9d793ab8dc2af68789ee464dde409350bd4dbe9fd9a87c7f81e45723331948a7d9cfc792dfa51cb86e74ccc9
diff --git a/dev-python/objgraph/files/objgraph-3.4.1-tests.patch b/dev-python/objgraph/files/objgraph-3.4.1-tests.patch
new file mode 100644
index 000000000000..d79b78fb88b5
--- /dev/null
+++ b/dev-python/objgraph/files/objgraph-3.4.1-tests.patch
@@ -0,0 +1,57 @@
+diff --git a/tests.py b/tests.py
+index fc2ee7f..d494470 100755
+--- a/tests.py
++++ b/tests.py
+@@ -11,6 +11,7 @@ import tempfile
+ import textwrap
+ import types
+ import unittest
++import platform
+ 
+ # setuptools imports `imp`, which triggers a DeprecationWarning starting with
+ # Python 3.4 in the middle of my pristine test suite.  But if I do the import
+@@ -363,7 +364,7 @@ def doctest_get_new_ids_prints():
+         ========================================================
+         Type      Old_ids  Current_ids      New_ids Count_Deltas
+         ========================================================
+-        list          ...          ...          ...           +2
++        wt          ...          ...          ...           +2
+         ========================================================
+ 
+     """
+@@ -387,7 +388,10 @@ class ByTypeTest(GarbageCollectedMixin, unittest.TestCase):
+         # 2. the `res` list
+         # referrers we don't want:
+         # the ``objects`` list in the now-dead stack frame of objgraph.by_type
+-        self.assertLessEqual(len(gc.get_referrers(res[0])), 2)
++        if 'pypy' in platform.python_implementation().lower():
++            self.assertLessEqual(len(gc.get_referrers(res[0])), 3)
++        else:
++            self.assertLessEqual(len(gc.get_referrers(res[0])), 2)
+ 
+ 
+ class AtAddrsTest(unittest.TestCase):
+@@ -439,7 +443,10 @@ class StringRepresentationTest(GarbageCollectedMixin,
+         obj = MyClass()
+         with mock.patch.object(obj, 'my_method',
+                                types.MethodType(mock_method, obj)):
+-            self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
++            if 'pypy' in platform.python_implementation().lower():
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<bound method')
++            else:
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
+ 
+     def test_short_repr_mocked_name(self):
+         self.assertRegex(objgraph._short_repr(mock.Mock(__name__=mock.Mock())),
+@@ -462,7 +469,10 @@ class StringRepresentationTest(GarbageCollectedMixin,
+         obj = MyClass()
+         with mock.patch.object(obj, 'my_method',
+                                types.MethodType(mock_method, obj)):
+-            self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
++            if 'pypy' in platform.python_implementation().lower():
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<bound method')
++            else:
++                self.assertRegex(objgraph._short_repr(obj.my_method), '<Mock')
+ 
+     @skipIf(sys.version_info[0] > 2, "Python 3 has no unbound methods")
+     def test_short_repr_unbound_method(self):
diff --git a/dev-python/objgraph/metadata.xml b/dev-python/objgraph/metadata.xml
index d6f6331c46c2..028d3d594db6 100644
--- a/dev-python/objgraph/metadata.xml
+++ b/dev-python/objgraph/metadata.xml
@@ -5,7 +5,6 @@
     <email>heroxbd@gentoo.org</email>
     <name>Benda Xu</name>
   </maintainer>
-  <longdescription>A module that lets you visually explore Python object graphs.</longdescription>
   <upstream>
     <remote-id type="pypi">objgraph</remote-id>
   </upstream>
diff --git a/dev-python/objgraph/objgraph-3.4.0.ebuild b/dev-python/objgraph/objgraph-3.4.0.ebuild
index ac968d18225d..854f7c924c29 100644
--- a/dev-python/objgraph/objgraph-3.4.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/objgraph/objgraph-3.1.0.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index f9012789b42a..e6e7846a4ee6 100644
--- a/dev-python/objgraph/objgraph-3.1.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -12,16 +12,20 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="media-gfx/graphviz"
-DEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools
+	test? ( media-gfx/xdot )"
 
-python_test() {
-	esetup.py test
-}
+PATCHES=(
+	"${FILESDIR}/objgraph-3.4.1-tests.patch"
+)
+
+distutils_enable_tests unittest
 
 python_install_all() {
 	use doc && local HTML_DOCS=(  docs/* )