Remove dependency on the external module mock. Fixes #820
Matěj Cepl authored a month ago
Jelmer Vernooij committed a month ago
4 | 4 |
|
5 | 5 |
* Add ``no_verify`` flag to ``porcelain.commit`` and ``Repo.do_commit``.
|
6 | 6 |
(Peter Rowlands)
|
|
7 |
|
|
8 |
* Remove dependency on external mock module.
|
|
9 |
(Matěj Cepl, #820)
|
7 | 10 |
|
8 | 11 |
0.20.14 2020-11-26
|
9 | 12 |
|
57 | 57 |
missing_libs.append("geventhttpclient")
|
58 | 58 |
|
59 | 59 |
try:
|
60 | |
from mock import patch
|
|
60 |
from unittest.mock import patch
|
61 | 61 |
except ImportError:
|
62 | 62 |
missing_libs.append("mock")
|
63 | 63 |
|
40 | 40 |
)
|
41 | 41 |
|
42 | 42 |
try:
|
43 | |
from mock import patch
|
|
43 |
from unittest.mock import patch
|
44 | 44 |
except ImportError:
|
45 | 45 |
patch = None # type: ignore
|
46 | 46 |
|
61 | 61 |
|
62 | 62 |
if '__pypy__' not in sys.modules and not sys.platform == 'win32':
|
63 | 63 |
tests_require.extend([
|
64 | |
'gevent', 'geventhttpclient', 'mock', 'setuptools>=17.1'])
|
|
64 |
'gevent', 'geventhttpclient', 'setuptools>=17.1'])
|
65 | 65 |
|
66 | 66 |
|
67 | 67 |
ext_modules = [
|