[gentoo-commits] repo/gentoo:master commit in: dev-python/mock/, dev-python/mock/files/
commit: 0204f5b41216a0403e1b7d75704f8a3d49cb6d9f
Author: Michał Górny gentoo org>
AuthorDate: Wed May 5 14:21:51 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Wed May 5 17:05:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0204f5b4
dev-python/mock: Enable python3.10
Signed-off-by: Michał Górny gentoo.org>
dev-python/mock/files/mock-4.0.3-py310.patch | 76
dev-python/mock/mock-4.0.3.ebuild| 15 +++---
2 files changed, 82 insertions(+), 9 deletions(-)
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 000..4a096f35126
--- /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 d8149f69770..be913d227c1 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
[gentoo-commits] repo/gentoo:master commit in: dev-python/mock/, dev-python/mock/files/
commit: f94f5324ce10a32512c9d3b1042e36a235688e6e
Author: Michał Górny gentoo org>
AuthorDate: Sat Mar 28 08:18:45 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Mar 28 08:33:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94f5324
dev-python/mock: Remove redundant versions
Signed-off-by: Michał Górny gentoo.org>
dev-python/mock/Manifest | 2 -
.../mock/files/mock-1.0.1-fix-python3.4.patch | 30 ---
dev-python/mock/mock-1.0.1-r2.ebuild | 42
dev-python/mock/mock-1.3.0-r2.ebuild | 45 --
4 files changed, 119 deletions(-)
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index d8ae973f1c4..a2fd44f263c 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,4 +1,2 @@
-DIST mock-1.0.1.tar.gz 818644 BLAKE2B
7bfe02c413c2f98a2d98ca9cc40ca8831d65b3a5095d95625e0844e764c3510b771dc9e36086dd44f518659cdf7f1d105c02bdb51c5ffe00953c5eb3b0e05106
SHA512
4f6f4ebc34843e16b15d866e415ad9992e79bd266a63a22fee31b773ba77615e3406bc8890ceed92c0ee296380d68c46299c4c4448a3526f9cb96b258d32cf58
-DIST mock-1.3.0.tar.gz 70908 BLAKE2B
4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca47f6ef5a394bc80cac10898b611146f28da93e84c4b26c23f25708be3c8fc6b61062dae099396e351861d8
SHA512
10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9
DIST mock-2.0.0.tar.gz 73684 BLAKE2B
970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3
SHA512
a08007651b749d2843b94f5045d74c12295290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B
b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c
SHA512
9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
diff --git a/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
b/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
deleted file mode 100644
index 166ee2ac00d..000
--- a/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
+++ /dev/null
@@ -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):
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild
b/dev-python/mock/mock-1.0.1-r2.ebuild
deleted file mode 100644
index 0f26cbcab9c..000
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Mocking and Patching Library for Testing"
-HOMEPAGE="http://www.voidspace.org.uk/python/mock/
https://pypi.org/project/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 sparc x86
~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc test"
-RESTRICT="!test? ( 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
-}
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild
b/dev-python/mock/mock-1.3.0-r2.ebuild
deleted file mode 100644
index 1d572e5630e..000
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-#
