Fix and re-gate on H306
H306, alphabetical imports, was mistakenly skipped in
f96ec4411c
Change-Id: I16db4600107b1f8f54b9f46a8552331612859346
This commit is contained in:
parent
b39df562c7
commit
3aaefad0d2
|
@ -15,8 +15,8 @@
|
|||
|
||||
"""Custom SQLAlchemy types."""
|
||||
|
||||
from oslo.utils import netutils
|
||||
import netaddr
|
||||
from oslo.utils import netutils
|
||||
from sqlalchemy.dialects import postgresql
|
||||
from sqlalchemy import types
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ eventlet.monkey_patch(os=False)
|
|||
|
||||
import copy
|
||||
import inspect
|
||||
import mock
|
||||
import logging
|
||||
import mock
|
||||
import os
|
||||
|
||||
import fixtures
|
||||
|
|
|
@ -26,9 +26,10 @@ import warnings
|
|||
import fixtures
|
||||
from oslo.config import cfg
|
||||
from oslo.messaging import conffixture as messaging_conffixture
|
||||
|
||||
from nova.db import migration
|
||||
from nova import rpc
|
||||
from nova.db.sqlalchemy import api as session
|
||||
from nova import rpc
|
||||
from nova import service
|
||||
|
||||
_TRUE_VALUES = ('True', 'true', '1', 'yes')
|
||||
|
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
from oslo.config import cfg
|
||||
|
||||
from nova.api.metadata import password
|
||||
from nova.api.openstack.compute.contrib import server_password \
|
||||
as server_password_v2
|
||||
from nova.api.openstack.compute.plugins.v3 import server_password \
|
||||
as server_password_v21
|
||||
from nova.api.metadata import password
|
||||
from nova import compute
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -73,4 +73,4 @@ class ServerPasswordTestV21(test.TestCase):
|
|||
|
||||
class ServerPasswordTestV2(ServerPasswordTestV21):
|
||||
server_password = server_password_v2
|
||||
delete_call = 'self.controller.delete'
|
||||
delete_call = 'self.controller.delete'
|
||||
|
|
|
@ -22,8 +22,8 @@ from oslo.config import cfg
|
|||
import testtools
|
||||
|
||||
from nova.db.sqlalchemy import api as session
|
||||
from nova.tests.unit import conf_fixture
|
||||
from nova.tests import fixtures
|
||||
from nova.tests.unit import conf_fixture
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
|
3
tox.ini
3
tox.ini
|
@ -67,10 +67,9 @@ commands = python setup.py build_sphinx
|
|||
# New from hacking 0.9: E129, E131, H407, H405
|
||||
# E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301
|
||||
# New from hacking 0.10: H238
|
||||
# H306 was mistakenly ignored, TODO to re-add
|
||||
# Temporarily skip W292 (new in hacking 0.10)
|
||||
|
||||
ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,H238,H306,W292
|
||||
ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,H238,W292
|
||||
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools/xenserver*
|
||||
# To get a list of functions that are more complex than 25, set max-complexity
|
||||
# to 25 and run 'tox -epep8'.
|
||||
|
|
Loading…
Reference in New Issue