From 124652f895cfbcf5ba0a21cf4a68e689f8ef274a Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 9 Nov 2020 12:23:07 +0100 Subject: [PATCH] Remove six leftovers We should not be using six anymore. Also add specific python 3.8 support mention to setup.cfg Change-Id: If0689f47e9c2f7382c5e763f23b7f7f5ef323d5b --- setup.cfg | 1 + sushy_tools/tests/unit/emulator/resources/test_drives.py | 3 ++- sushy_tools/tests/unit/emulator/resources/test_managers.py | 3 ++- sushy_tools/tests/unit/emulator/resources/test_storage.py | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3cd42d7c..1cf46c11 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,6 +19,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] packages = diff --git a/sushy_tools/tests/unit/emulator/resources/test_drives.py b/sushy_tools/tests/unit/emulator/resources/test_drives.py index b495f0fe..a192621c 100644 --- a/sushy_tools/tests/unit/emulator/resources/test_drives.py +++ b/sushy_tools/tests/unit/emulator/resources/test_drives.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from oslotest import base -from six.moves import mock from sushy_tools.emulator.resources.drives import StaticDriver diff --git a/sushy_tools/tests/unit/emulator/resources/test_managers.py b/sushy_tools/tests/unit/emulator/resources/test_managers.py index 938db5f6..fd258e1c 100644 --- a/sushy_tools/tests/unit/emulator/resources/test_managers.py +++ b/sushy_tools/tests/unit/emulator/resources/test_managers.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from oslotest import base -from six.moves import mock from sushy_tools.emulator.resources import managers from sushy_tools import error diff --git a/sushy_tools/tests/unit/emulator/resources/test_storage.py b/sushy_tools/tests/unit/emulator/resources/test_storage.py index bf7c3f4e..6db33335 100644 --- a/sushy_tools/tests/unit/emulator/resources/test_storage.py +++ b/sushy_tools/tests/unit/emulator/resources/test_storage.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from oslotest import base -from six.moves import mock from sushy_tools.emulator.resources.storage import StaticDriver