diff --git a/ceilometer/alarm/evaluator/__init__.py b/ceilometer/alarm/evaluator/__init__.py index f1059f5523..3e6a82e778 100644 --- a/ceilometer/alarm/evaluator/__init__.py +++ b/ceilometer/alarm/evaluator/__init__.py @@ -17,10 +17,10 @@ import abc -import croniter import datetime from ceilometerclient import client as ceiloclient +import croniter from oslo.config import cfg from oslo.utils import timeutils import pytz diff --git a/ceilometer/alarm/notifier/__init__.py b/ceilometer/alarm/notifier/__init__.py index 7edfc271f2..891b04dbef 100644 --- a/ceilometer/alarm/notifier/__init__.py +++ b/ceilometer/alarm/notifier/__init__.py @@ -16,6 +16,7 @@ # under the License. import abc + import six diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py index f952fd0bc4..96603efcd3 100644 --- a/ceilometer/api/controllers/v2.py +++ b/ceilometer/api/controllers/v2.py @@ -27,21 +27,21 @@ import ast import base64 import copy -import croniter import datetime import functools import inspect import json -import jsonschema -import pytz import uuid +import croniter +import jsonschema from oslo.config import cfg from oslo.utils import netutils from oslo.utils import strutils from oslo.utils import timeutils import pecan from pecan import rest +import pytz import six import wsme from wsme import types as wtypes diff --git a/ceilometer/compute/notifications/instance.py b/ceilometer/compute/notifications/instance.py index f9974f2a30..62e8e3e668 100644 --- a/ceilometer/compute/notifications/instance.py +++ b/ceilometer/compute/notifications/instance.py @@ -20,6 +20,7 @@ """ import abc + import six from ceilometer.compute import notifications diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py index 4d619d6963..d585d1c301 100644 --- a/ceilometer/event/trait_plugins.py +++ b/ceilometer/event/trait_plugins.py @@ -16,6 +16,7 @@ # under the License. import abc + import six diff --git a/ceilometer/hardware/plugin.py b/ceilometer/hardware/plugin.py index 5e9dc9c60a..fb6740f3e6 100644 --- a/ceilometer/hardware/plugin.py +++ b/ceilometer/hardware/plugin.py @@ -21,6 +21,7 @@ import abc import itertools + from oslo.utils import netutils import six diff --git a/ceilometer/ipmi/platform/intel_node_manager.py b/ceilometer/ipmi/platform/intel_node_manager.py index 9f4a46fa98..80dcd35ea6 100644 --- a/ceilometer/ipmi/platform/intel_node_manager.py +++ b/ceilometer/ipmi/platform/intel_node_manager.py @@ -28,10 +28,11 @@ import binascii import tempfile import time +from oslo.config import cfg + from ceilometer.ipmi.platform import exception as nmexcept from ceilometer.ipmi.platform import ipmitool from ceilometer.openstack.common.gettextutils import _ -from oslo.config import cfg def get_ordereddict(): diff --git a/ceilometer/storage/hbase/inmemory.py b/ceilometer/storage/hbase/inmemory.py index b0abdea759..83bde82c04 100644 --- a/ceilometer/storage/hbase/inmemory.py +++ b/ceilometer/storage/hbase/inmemory.py @@ -16,6 +16,7 @@ import copy import re + import six import ceilometer diff --git a/ceilometer/storage/mongo/utils.py b/ceilometer/storage/mongo/utils.py index e07971235e..699ad45e38 100644 --- a/ceilometer/storage/mongo/utils.py +++ b/ceilometer/storage/mongo/utils.py @@ -19,12 +19,12 @@ """ import time +import weakref from oslo.config import cfg from oslo.utils import netutils import pymongo import six -import weakref from ceilometer.openstack.common.gettextutils import _ from ceilometer.openstack.common import log @@ -400,4 +400,4 @@ class Prefection(pymongo.collection.Collection): return found def __getattr__(self, item): - return getattr(self.conn, item) \ No newline at end of file + return getattr(self.conn, item) diff --git a/ceilometer/tests/alarm/evaluator/test_combination.py b/ceilometer/tests/alarm/evaluator/test_combination.py index c59ba3a163..48c3a585e3 100644 --- a/ceilometer/tests/alarm/evaluator/test_combination.py +++ b/ceilometer/tests/alarm/evaluator/test_combination.py @@ -17,17 +17,17 @@ """Tests for ceilometer/alarm/threshold_evaluation.py """ import datetime -import mock -import pytz import uuid +from ceilometerclient import exc +from ceilometerclient.v2 import alarms +import mock from oslo.utils import timeutils +import pytz from ceilometer.alarm.evaluator import combination from ceilometer.alarm.storage import models from ceilometer.tests.alarm.evaluator import base -from ceilometerclient import exc -from ceilometerclient.v2 import alarms class TestEvaluate(base.TestEvaluatorBase): diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py index d02b7b551a..8efa7868a5 100644 --- a/ceilometer/tests/alarm/evaluator/test_threshold.py +++ b/ceilometer/tests/alarm/evaluator/test_threshold.py @@ -17,19 +17,19 @@ """Tests for ceilometer/alarm/evaluator/threshold.py """ import datetime -import mock -import pytz import uuid +from ceilometerclient import exc +from ceilometerclient.v2 import statistics +import mock +from oslo.config import cfg from oslo.utils import timeutils +import pytz from six import moves from ceilometer.alarm.evaluator import threshold from ceilometer.alarm.storage import models from ceilometer.tests.alarm.evaluator import base -from ceilometerclient import exc -from ceilometerclient.v2 import statistics -from oslo.config import cfg class TestEvaluate(base.TestEvaluatorBase): diff --git a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py index 52d820b326..45f2eb1d5f 100644 --- a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py +++ b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py @@ -17,6 +17,7 @@ """Tests for ceilometer.alarm.service.PartitionedAlarmService. """ import contextlib + import mock from oslo.config import fixture as fixture_config from stevedore import extension diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py index 055bc546d4..f29d4fee6a 100644 --- a/ceilometer/tests/db.py +++ b/ceilometer/tests/db.py @@ -18,11 +18,11 @@ # under the License. """Base classes for API tests.""" -import fixtures import os import uuid import warnings +import fixtures import mock from oslo.config import fixture as fixture_config from oslotest import mockpatch diff --git a/ceilometer/tests/ipmi/pollsters/base.py b/ceilometer/tests/ipmi/pollsters/base.py index 5b72edf0aa..780f8afa70 100644 --- a/ceilometer/tests/ipmi/pollsters/base.py +++ b/ceilometer/tests/ipmi/pollsters/base.py @@ -15,14 +15,14 @@ # under the License. import abc + import mock +from oslotest import mockpatch import six from ceilometer.ipmi import manager import ceilometer.tests.base as base -from oslotest import mockpatch - @six.add_metaclass(abc.ABCMeta) class TestPollsterBase(base.BaseTestCase): diff --git a/ceilometer/tests/test_coordination.py b/ceilometer/tests/test_coordination.py index 87e1bc1be2..ce2d343c62 100644 --- a/ceilometer/tests/test_coordination.py +++ b/ceilometer/tests/test_coordination.py @@ -16,6 +16,7 @@ # under the License. import logging + import mock from oslo.config import fixture as fixture_config import tooz.coordination diff --git a/ceilometer/utils.py b/ceilometer/utils.py index 53b8930ff6..fcf818fbcd 100644 --- a/ceilometer/utils.py +++ b/ceilometer/utils.py @@ -27,12 +27,13 @@ import hashlib import multiprocessing import struct -from ceilometer.openstack.common import processutils from oslo.config import cfg from oslo.utils import timeutils from oslo.utils import units import six +from ceilometer.openstack.common import processutils + OPTS = [ cfg.StrOpt('rootwrap_config', default="/etc/ceilometer/rootwrap.conf", diff --git a/tox.ini b/tox.ini index fc2de9d64c..a5f8fe1b36 100644 --- a/tox.ini +++ b/tox.ini @@ -68,8 +68,7 @@ commands = bash -x {toxinidir}/setup-test-env-mysql.sh oslo_debug_helper {posargs} [flake8] -# H305 imports not grouped correctly -ignore = H305 +ignore = builtins = _ exclude=.venv,.git,.tox,dist,doc,./ceilometer/openstack/common,*lib/python*,*egg,tools,nova_tests,build show-source = True