diff --git a/kolla_cli/tests/unit/test_deploy_cmd.py b/kolla_cli/tests/unit/test_deploy_cmd.py index 72a8f55..ca662e3 100644 --- a/kolla_cli/tests/unit/test_deploy_cmd.py +++ b/kolla_cli/tests/unit/test_deploy_cmd.py @@ -11,7 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock + +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_genconfig_cmd.py b/kolla_cli/tests/unit/test_genconfig_cmd.py index 6e28a5f..aebbcdf 100644 --- a/kolla_cli/tests/unit/test_genconfig_cmd.py +++ b/kolla_cli/tests/unit/test_genconfig_cmd.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_group_cmd.py b/kolla_cli/tests/unit/test_group_cmd.py index 340b1fa..7cb6769 100644 --- a/kolla_cli/tests/unit/test_group_cmd.py +++ b/kolla_cli/tests/unit/test_group_cmd.py @@ -11,7 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock + +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_host_cmd.py b/kolla_cli/tests/unit/test_host_cmd.py index c573342..cc30d3e 100644 --- a/kolla_cli/tests/unit/test_host_cmd.py +++ b/kolla_cli/tests/unit/test_host_cmd.py @@ -11,7 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock + +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_prechecks_cmd.py b/kolla_cli/tests/unit/test_prechecks_cmd.py index 3ba39f3..6ee4413 100644 --- a/kolla_cli/tests/unit/test_prechecks_cmd.py +++ b/kolla_cli/tests/unit/test_prechecks_cmd.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_pull_cmd.py b/kolla_cli/tests/unit/test_pull_cmd.py index f89457a..579b518 100644 --- a/kolla_cli/tests/unit/test_pull_cmd.py +++ b/kolla_cli/tests/unit/test_pull_cmd.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_reconfigure_cmd.py b/kolla_cli/tests/unit/test_reconfigure_cmd.py index d94654e..4ab9c77 100644 --- a/kolla_cli/tests/unit/test_reconfigure_cmd.py +++ b/kolla_cli/tests/unit/test_reconfigure_cmd.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_service_cmd.py b/kolla_cli/tests/unit/test_service_cmd.py index d6b68e0..2d36ecb 100644 --- a/kolla_cli/tests/unit/test_service_cmd.py +++ b/kolla_cli/tests/unit/test_service_cmd.py @@ -11,7 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock + +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_stop_cmd.py b/kolla_cli/tests/unit/test_stop_cmd.py index 10929ac..499f7cc 100644 --- a/kolla_cli/tests/unit/test_stop_cmd.py +++ b/kolla_cli/tests/unit/test_stop_cmd.py @@ -11,7 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock + +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/kolla_cli/tests/unit/test_upgrade_cmd.py b/kolla_cli/tests/unit/test_upgrade_cmd.py index 276adb9..d05272a 100644 --- a/kolla_cli/tests/unit/test_upgrade_cmd.py +++ b/kolla_cli/tests/unit/test_upgrade_cmd.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from kolla_cli.tests.unit.common import KollaCliUnitTest diff --git a/lower-constraints.txt b/lower-constraints.txt index 1566b06..7c03f14 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -42,7 +42,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 monotonic==1.4 mox3==0.25.0 mypy==0.6 diff --git a/test-requirements.txt b/test-requirements.txt index bfeeab9..1147b3b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,7 +11,6 @@ bandit>=1.1.0,<1.6.0 # Apache-2.0 coverage>=4.0 doc8>=0.6.0 # Apache-2.0 fixtures>=3.0.0 -mock>=2.0.0 mypy>=0.6 oslo.utils>=3.33.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index ed35cbe..886a679 100644 --- a/tox.ini +++ b/tox.ini @@ -70,7 +70,7 @@ commands = [testenv:mypy] skip_install = true commands = - mypy --py2 --ignore-missing-imports kolla_cli + mypy --ignore-missing-imports kolla_cli [testenv:venv] commands = {posargs}