From c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 May 2021 01:33:16 +0100 Subject: gentoo resync : 07.05.2021 --- dev-python/mock/Manifest | 3 +- dev-python/mock/files/mock-4.0.3-py310.patch | 76 ++++++++++++++++++++++++++++ dev-python/mock/mock-4.0.3.ebuild | 15 +++--- 3 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 dev-python/mock/files/mock-4.0.3-py310.patch (limited to 'dev-python/mock') diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest index 2a00fdacb4af..05417b474405 100644 --- a/dev-python/mock/Manifest +++ b/dev-python/mock/Manifest @@ -1,3 +1,4 @@ +AUX mock-4.0.3-py310.patch 2849 BLAKE2B a23047a6a872f7badb845388c3dcfb6c554824e524a094c09762a8749b3f6c292ddd58a1843cc540892a1a850f639af254a74abbfffb70deda4b756dca7dec9f SHA512 ad4448a85267aab11a35c761896779d66b45c2a38b6208226eeddcbbb7b28bac840f11fb9d69b72781383a82334a37b00dfac601fd9fe16f842da93c1b4ee3bb DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89 -EBUILD mock-4.0.3.ebuild 1672 BLAKE2B 2a6a8b2bb74fbb711b04a90e6c9ea2bfd8056726b725b34f18e02ccf4ff8757490be66bc861f690bc5c2af05f75c5dce1dbe768403155700600e80f6db797fd3 SHA512 b0909bf975cfc731689917b906c0edd1a33eff5a9dd65acdc2339d1b1372b0c6d8393afb5a920731db0845ea89d395d57f39d6b3122ccbdb0d0d39371be15b13 +EBUILD mock-4.0.3.ebuild 1533 BLAKE2B 6696428fda382a15f2c2e63dc04c55b4e68071c37f2a7e647dc953292d5cc277bbd2319897b2262b7b0e8ac7bf522cb3c96962b633380041484079fbdde935e6 SHA512 416e3133bfba2855076199e62051507f22817143c72a49278c1fbdc2f2a9297075c8ea92de5c6720da8b40ecdb82da937366bdbb01a10b8471963c2539568e90 MISC metadata.xml 389 BLAKE2B 0663f612b893e4f8dd7b7e28c624c5abaf1f3bcd1fc2f454e5dceed971f8b9ca9f3ab32f2ba51eaf88572e6178eb87669b98bcf852d731fac4c077d10cc89ef7 SHA512 e142011c0f4c7b3ea4eeac1c0431e3d3df8eea803dad50ae5dd0184e0fe070b009b9a1e6933e7a298751091dac4972f10adfbd6bbf713b36a28ad8f4b29f2a66 diff --git a/dev-python/mock/files/mock-4.0.3-py310.patch b/dev-python/mock/files/mock-4.0.3-py310.patch new file mode 100644 index 000000000000..4a096f35126c --- /dev/null +++ b/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 +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 + diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild index d8149f697701..be913d227c1f 100644 --- a/dev-python/mock/mock-4.0.3.ebuild +++ b/dev-python/mock/mock-4.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 @@ -16,12 +16,12 @@ 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=" - $(python_gen_cond_dep ' - dev-python/funcsigs[${PYTHON_USEDEP}] - ' -2) >=dev-python/six-1.9[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - >=dev-python/setuptools-17.1[${PYTHON_USEDEP}]" +BDEPEND=${RDEPEND} + +PATCHES=( + "${FILESDIR}"/${P}-py310.patch +) src_prepare() { sed -i -e '/ pytest.*/d' setup.cfg || die @@ -35,9 +35,6 @@ python_test() { # test filtering. cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die cd "${BUILD_DIR}"/lib || die - if ! python_is_python3; then - rm mock/tests/*py3* || die - fi # https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa if [[ ${EPYTHON} == pypy* ]]; then -- cgit v1.2.3