dev-python/mock: Sync with gentoo

It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a.

sdk_container/src/third_party/portage-stable/dev-python/mock/Manifest

@@ -1,10 +1 @@
-AUX mock-1.0.1-fix-python3.4.patch 895 SHA256 1c751a699597801ac3f00e0fd629759d7f4acc598cad403a5d462e31524f4903 SHA512 86c08b8754a7ab7fe923c5d61d66f1196c603efea86a0e04df2fa8f53280522625e175bfd601de49c1f963c0948a2c6279154cd0e1fb5e7c2e5378ddfa512e97 WHIRLPOOL 7b5ab71ce0d45650a2f1b1f1b28e376bc069eb8f855e79d4416ebe8b7e1042bf173acd1f20c7c2b367acb88d0834215c5d53e5472fd4de5c003e08fc7f5ee0b1
+DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
-DIST mock-1.0.1.tar.gz 818644 SHA256 b839dd2d9c117c701430c149956918a423a9863b48b09c90e30a6013e7d2f44f SHA512 4f6f4ebc34843e16b15d866e415ad9992e79bd266a63a22fee31b773ba77615e3406bc8890ceed92c0ee296380d68c46299c4c4448a3526f9cb96b258d32cf58 WHIRLPOOL d5a83199a355d9dc8f327f287e6f6fb889f569eb6642c86390aead3f91505c5fb98512e15ed34cadb407dc0a56d541395132872f1a910d20d330d6d3190f164c
-DIST mock-1.3.0.tar.gz 70908 SHA256 1e247dbecc6ce057299eb7ee019ad68314bb93152e81d9a6110d35f4d5eca0f6 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9 WHIRLPOOL 783fa1a7dade482c318805cc34bc642e29403e2fd1e6010acf212283d20981216cc8ef85cfea3e72c9f521d2954cf8e895cbe7ee126cd84d780c8b80727421f2
-DIST mock-2.0.0.tar.gz 73684 SHA256 b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238 WHIRLPOOL eb9a80028946f146f7951046940ccb5bddd2016c279e7cf936829b80fedc4dea6aa912a04d18cfab36b67fdccdb0bb6e71f495e309c1659637fed51c82fed3cc
-EBUILD mock-1.0.1-r2.ebuild 1123 SHA256 bbe3b6d289a921c8aec444d8f4e995e19569f6b0e4d49e28560b9201380f23d5 SHA512 dcd66fc36ed0ae5e45daab0f22062774ddc219feaa1fc2ae86be46fccca563abac4a1deaa1e9c8cc08665429d4f6d99db035d57fe68d47d7dddf3d2a3321b546 WHIRLPOOL 2d9382f4fa48562ccc9090129558df5d86152bb65552fc36801a86eb0677ffd8d670b49266676e377e9a3ef9d9a6c9681e679c4c53316beaf4440adc7e5b2352
-EBUILD mock-1.3.0-r2.ebuild 1073 SHA256 1f985baa287fed89164dd244c13232a2405ffedfbbce54ed80df6e914c25965a SHA512 601b41f1e291903f62a786900aef41e815396c21c2536ea1d9d0acfb27b305765bc3ee7ec2fa8270f14d6f70f76361cc007cd9cc926fc072b1cbcee145913e39 WHIRLPOOL c642e5450ecccafc2ffffd03ca2528ebc47d5bb085856603b7097bda2033f189578d9b49bbd4b6c3801105c680a1a139cadc7b3ee44ebdd21fa1e873f38a4aee
-EBUILD mock-2.0.0.ebuild 1088 SHA256 63106bbfd6b1eeb6003e4a161bb8523915a77b86b32998477ef74642dca8f966 SHA512 8828a08dac7ceeb0cddd4c1d4eb69d8c0b02089c286a26813043a3a726cbe975915dec42ca8c18d287c98102389301c178b07ea918b3744d30736c7cd675f352 WHIRLPOOL 130089c5f7302777b764c1f474b6c680443753c48d97f2bf3c984feccb2db465ccd83383dc1f8a7f2b1c9839ac08a3192ddc95e21c7baa55eab895059dfa6670
-MISC ChangeLog 9139 SHA256 884f490f7add0325033de1eb34f2cece40d36819d1fd8e50d80f66ea2f76bfb6 SHA512 d2f999da351a21c127468dbe4a177fd1cc3ab977e5ada2e8505962eb58e37e66465f86af728be56e29699907cb41ffca5e27c4b8d7a9569cffb8284b299ae9d8 WHIRLPOOL d73ccfe6611b62b1417d13fea8fe6e23949709eb9b7dd61a03946c33a3a4535058644bc42f394f05e1b4c8d69db962740e1fcac2f515fce187a26c318b4e538c
-MISC ChangeLog-2015 11480 SHA256 5b8bbb68ce0512fc0374925e7ce774d47cb322c754f563b22d381b593b3df7bf SHA512 2e712ea2f21ea09cb282a55aee51c7352a216a6732ef9c8e9cd0a0b1a70d307cdb4d3a49f416d01280eeb1c7fd294795a8bc7b25c18933cb7df9582968dea619 WHIRLPOOL 8a6b079af71c6f05cc4a7c8a9ad3aed4b742d463dd0ab92ad01811eb969e26f75874235301543c3a120e58a2fcd0073161f1faa95be2de9b93c3c1089ba46766
-MISC metadata.xml 365 SHA256 82d0e71a904db861cd71393009a1cfde0924b60c3e0283a0a5bca68c71cee275 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f WHIRLPOOL 7a086974296517fbacdbce679fd980595db2bc4317672d444aa2413dc04ab961d770fe0e0469839da49d45654d49624495808d54ce4b444e4913a0b50e035167

sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch

@@ -1,30 +0,0 @@
-# Fix test errors with python 3.4 - thanks to Ubuntu developer Barry Warsaw.
-
-diff -r d356250e275d mock.py
---- a/mock.py	Tue Apr 09 14:53:33 2013 +0100
-+++ b/mock.py	Wed Feb 26 15:12:18 2014 -0500
-@@ -239,12 +239,21 @@
-     funcopy.__name__ = func.__name__
-     funcopy.__doc__ = func.__doc__
-     #funcopy.__dict__.update(func.__dict__)
--    funcopy.__module__ = func.__module__
-+    try:
-+        funcopy.__module__ = func.__module__
-+    except AttributeError:
-+        pass
-     if not inPy3k:
-         funcopy.func_defaults = func.func_defaults
-         return
--    funcopy.__defaults__ = func.__defaults__
--    funcopy.__kwdefaults__ = func.__kwdefaults__
-+    try:
-+        funcopy.__defaults__ = func.__defaults__
-+    except AttributeError:
-+        pass
-+    try:
-+        funcopy.__kwdefaults__ = func.__kwdefaults__
-+    except AttributeError:
-+        pass
- 
- 
- def _callable(obj):

sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-4.0.3-py310.patch

@@ -0,0 +1,76 @@
+From f3e3d82aab0ede7e25273806dc0505574d85eae2 Mon Sep 17 00:00:00 2001
+From: Chris Withers <chris@simplistix.co.uk>
+Date: Thu, 15 Apr 2021 08:27:25 +0100
+Subject: [PATCH] fix tests that should test mock but were testing
+ unittest.mock
+
+---
+ mock/tests/testmock.py | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/mock/tests/testmock.py b/mock/tests/testmock.py
+index 5702b6d..1a70909 100644
+--- a/mock/tests/testmock.py
++++ b/mock/tests/testmock.py
+@@ -13,6 +13,7 @@ from mock import (
+     create_autospec, mock
+ )
+ from mock.mock import _Call, _CallList
++import mock.mock as mock_module
+ 
+ 
+ class Iter(object):
+@@ -47,7 +48,7 @@ class MockTest(unittest.TestCase):
+         # if __all__ is badly defined then import * will raise an error
+         # We have to exec it because you can't import * inside a method
+         # in Python 3
+-        exec("from unittest.mock import *")
++        exec("from mock.mock import *")
+ 
+ 
+     def test_constructor(self):
+@@ -2137,16 +2138,16 @@ class MockTest(unittest.TestCase):
+         # test_patch_dict_test_prefix and test_patch_test_prefix not restoring
+         # causes the objects patched to go out of sync
+ 
+-        old_patch = unittest.mock.patch
++        old_patch = mock_module.patch
+ 
+         # Directly using __setattr__ on unittest.mock causes current imported
+         # reference to be updated. Use a lambda so that during cleanup the
+         # re-imported new reference is updated.
+-        self.addCleanup(lambda patch: setattr(unittest.mock, 'patch', patch),
++        self.addCleanup(lambda patch: setattr(mock_module, 'patch', patch),
+                         old_patch)
+ 
+         with patch.dict('sys.modules'):
+-            del sys.modules['unittest.mock']
++            del sys.modules['mock']
+ 
+             # This trace will stop coverage being measured ;-)
+             def trace(frame, event, arg):  # pragma: no cover
+@@ -2155,7 +2156,7 @@ class MockTest(unittest.TestCase):
+             self.addCleanup(sys.settrace, sys.gettrace())
+             sys.settrace(trace)
+ 
+-            from unittest.mock import (
++            from mock.mock import (
+                 Mock, MagicMock, NonCallableMock, NonCallableMagicMock
+             )
+ 
+@@ -2170,10 +2171,10 @@ class MockTest(unittest.TestCase):
+     def test_bool_not_called_when_passing_spec_arg(self):
+         class Something:
+             def __init__(self):
+-                self.obj_with_bool_func = unittest.mock.MagicMock()
++                self.obj_with_bool_func = mock_module.MagicMock()
+ 
+         obj = Something()
+-        with unittest.mock.patch.object(obj, 'obj_with_bool_func', autospec=True): pass
++        with mock_module.patch.object(obj, 'obj_with_bool_func', autospec=True): pass
+ 
+         self.assertEqual(obj.obj_with_bool_func.__bool__.call_count, 0)
+ 
+-- 
+2.31.1
+

sdk_container/src/third_party/portage-stable/dev-python/mock/metadata.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mock</remote-id>
 		<remote-id type="github">testing-cabal/mock</remote-id>

sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.0.1-r2.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Mocking and Patching Library for Testing"
-HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.python.org/pypi/mock"
-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 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc test"
-
-# dev-python/unittest2 is not required with Python >=3.2.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-fix-python3.4.patch )
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( docs/*.txt )
-
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r html/ -x html/objects.inv -x html/output.txt -x html/_sources
-	fi
-}

sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.3.0-r2.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-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 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.7[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst )
-
-	distutils-r1_python_install_all
-}

sdk_container/src/third_party/portage-stable/dev-python/mock/mock-2.0.0.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst )
-
-	distutils-r1_python_install_all
-}

sdk_container/src/third_party/portage-stable/dev-python/mock/mock-4.0.3.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.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 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
+src_prepare() {
+	sed -i -e '/  pytest.*/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Upstream supports running tests only in their dream pristine
+	# environment.  pytest doesn't work at all if mock is already
+	# installed.  We can use plain unittest but we have to reinvent
+	# test filtering.
+	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
+	cd "${BUILD_DIR}"/lib || die
+
+	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
+	if [[ ${EPYTHON} == pypy* ]]; then
+		sed -i -e 's:def test_copy:def _test_copy:' \
+			mock/tests/testmock.py || die
+	fi
+
+	# Avoid pytest dependency
+	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
+
+	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG.rst README.rst )
+
+	distutils-r1_python_install_all
+}