|
|
a6387fd |
diff --git a/minimum-constraints.txt b/minimum-constraints.txt
|
|
|
5a02143 |
index 570295ab..e771637b 100644
|
|
|
a6387fd |
--- a/minimum-constraints.txt
|
|
|
a6387fd |
+++ b/minimum-constraints.txt
|
|
|
5a02143 |
@@ -92,7 +92,6 @@ wheel==0.33.5; python_version >= '3.8'
|
|
|
a6387fd |
# Direct dependencies for install (must be consistent with requirements.txt)
|
|
|
a6387fd |
|
|
|
a6387fd |
M2Crypto==0.31.0
|
|
|
a6387fd |
-mock==2.0.0
|
|
|
a6387fd |
ordereddict==1.1
|
|
|
a6387fd |
ply==3.10
|
|
|
a6387fd |
PyYAML==3.11; python_version == '2.6'
|
|
|
a6387fd |
diff --git a/pywbem_mock/_wbemconnection_mock.py b/pywbem_mock/_wbemconnection_mock.py
|
|
|
5a02143 |
index aa27b305..3eedb330 100644
|
|
|
a6387fd |
--- a/pywbem_mock/_wbemconnection_mock.py
|
|
|
a6387fd |
+++ b/pywbem_mock/_wbemconnection_mock.py
|
|
|
a6387fd |
@@ -40,7 +40,7 @@ try:
|
|
|
a6387fd |
from collections import Counter
|
|
|
a6387fd |
except ImportError:
|
|
|
a6387fd |
from backport_collections import Counter
|
|
|
a6387fd |
-from mock import Mock
|
|
|
a6387fd |
+from unittest.mock import Mock
|
|
|
a6387fd |
import six
|
|
|
a6387fd |
|
|
|
5a02143 |
# pylint: disable=ungrouped-imports
|
|
|
a6387fd |
diff --git a/requirements.txt b/requirements.txt
|
|
|
5a02143 |
index 3ac782d5..1e5cd238 100644
|
|
|
a6387fd |
--- a/requirements.txt
|
|
|
a6387fd |
+++ b/requirements.txt
|
|
|
5a02143 |
@@ -11,9 +11,6 @@
|
|
|
a6387fd |
|
|
|
a6387fd |
# On Windows, M2Crypto must be installed via pywbem_os_setup.bat
|
|
|
a6387fd |
M2Crypto>=0.31.0; python_version < '3.0' and sys_platform != 'win32'
|
|
|
5a02143 |
-mock>=2.0.0,<3.0.0; python_version == '2.6'
|
|
|
5a02143 |
-mock>=2.0.0,<4.0.0; python_version >= '2.7' and python_version <= '3.5'
|
|
|
5a02143 |
-mock>=2.0.0; python_version >= '3.6'
|
|
|
a6387fd |
ordereddict>=1.1; python_version == '2.6'
|
|
|
a6387fd |
ply>=3.10
|
|
|
5a02143 |
# PyYAML 5.3 has removed support for Python 3.4; fixes narrow build error
|
|
|
a6387fd |
diff --git a/tests/unittest/pywbem/test_cim_obj.py b/tests/unittest/pywbem/test_cim_obj.py
|
|
|
5a02143 |
index 2f6b89d2..d3f8a9aa 100755
|
|
|
a6387fd |
--- a/tests/unittest/pywbem/test_cim_obj.py
|
|
|
a6387fd |
+++ b/tests/unittest/pywbem/test_cim_obj.py
|
|
|
5a02143 |
@@ -9,7 +9,7 @@ from __future__ import absolute_import, print_function
|
|
|
a6387fd |
import sys
|
|
|
a6387fd |
import re
|
|
|
a6387fd |
from datetime import timedelta, datetime
|
|
|
a6387fd |
-from mock import patch
|
|
|
a6387fd |
+from unittest.mock import patch
|
|
|
a6387fd |
try:
|
|
|
a6387fd |
from collections import OrderedDict
|
|
|
a6387fd |
except ImportError:
|
|
|
a6387fd |
diff --git a/tests/unittest/pywbem/test_itermethods.py b/tests/unittest/pywbem/test_itermethods.py
|
|
|
5a02143 |
index f7d0f8da..c613c3df 100644
|
|
|
a6387fd |
--- a/tests/unittest/pywbem/test_itermethods.py
|
|
|
a6387fd |
+++ b/tests/unittest/pywbem/test_itermethods.py
|
|
|
a6387fd |
@@ -24,7 +24,7 @@ from __future__ import absolute_import, print_function
|
|
|
a6387fd |
import pytest
|
|
|
a6387fd |
import six
|
|
|
a6387fd |
|
|
|
a6387fd |
-from mock import Mock
|
|
|
a6387fd |
+from unittest.mock import Mock
|
|
|
a6387fd |
|
|
|
5a02143 |
# pylint: disable=wrong-import-position, wrong-import-order, invalid-name
|
|
|
a6387fd |
from ...utils import import_installed
|
|
|
a6387fd |
diff --git a/tests/unittest/pywbem/test_valuemapping.py b/tests/unittest/pywbem/test_valuemapping.py
|
|
|
5a02143 |
index bf93b87c..263294a5 100644
|
|
|
a6387fd |
--- a/tests/unittest/pywbem/test_valuemapping.py
|
|
|
a6387fd |
+++ b/tests/unittest/pywbem/test_valuemapping.py
|
|
|
a6387fd |
@@ -7,7 +7,7 @@ from __future__ import absolute_import
|
|
|
a6387fd |
|
|
|
a6387fd |
import re
|
|
|
a6387fd |
import pytest
|
|
|
a6387fd |
-from mock import Mock
|
|
|
a6387fd |
+from unittest.mock import Mock
|
|
|
a6387fd |
|
|
|
5a02143 |
# pylint: disable=wrong-import-position, wrong-import-order, invalid-name
|
|
|
a6387fd |
from ...utils import import_installed
|