From 4bc37fd50ead756438ef62dc8c626bea38185522 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Thu, 13 Nov 2014 13:10:49 +0000 Subject: [PATCH] Bump hacking to 0.9.x series Change-Id: I474266c647f31f0ad92ec9878fc03eb5a5c97f43 --- os_collect_config/collect.py | 3 ++- os_collect_config/heat_local.py | 1 + os_collect_config/local.py | 3 ++- os_collect_config/tests/test_cache.py | 3 ++- os_collect_config/tests/test_collect.py | 6 +++--- os_collect_config/tests/test_ec2.py | 3 ++- os_collect_config/tests/test_heat.py | 3 +-- os_collect_config/tests/test_heat_local.py | 5 +++-- os_collect_config/tests/test_keystone.py | 2 +- test-requirements.txt | 3 ++- tox.ini | 3 ++- 11 files changed, 21 insertions(+), 14 deletions(-) diff --git a/os_collect_config/collect.py b/os_collect_config/collect.py index c21d660..dcfa0f6 100644 --- a/os_collect_config/collect.py +++ b/os_collect_config/collect.py @@ -22,6 +22,8 @@ import subprocess import sys import time +from oslo.config import cfg + from os_collect_config import cache from os_collect_config import cfn from os_collect_config import ec2 @@ -33,7 +35,6 @@ from os_collect_config import local from os_collect_config.openstack.common import log from os_collect_config import request from os_collect_config import version -from oslo.config import cfg DEFAULT_COLLECTORS = ['heat_local', 'ec2', 'cfn', 'heat', 'request', 'local'] opts = [ diff --git a/os_collect_config/heat_local.py b/os_collect_config/heat_local.py index 1cbbf3b..06981fd 100644 --- a/os_collect_config/heat_local.py +++ b/os_collect_config/heat_local.py @@ -15,6 +15,7 @@ import json import os + from oslo.config import cfg from os_collect_config import exc diff --git a/os_collect_config/local.py b/os_collect_config/local.py index 2477b44..e7bf578 100644 --- a/os_collect_config/local.py +++ b/os_collect_config/local.py @@ -16,9 +16,10 @@ import json import locale import os -from oslo.config import cfg import stat +from oslo.config import cfg + from os_collect_config import exc from os_collect_config.openstack.common import log diff --git a/os_collect_config/tests/test_cache.py b/os_collect_config/tests/test_cache.py index 594d5d7..919b01a 100644 --- a/os_collect_config/tests/test_cache.py +++ b/os_collect_config/tests/test_cache.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import fixtures import json import os + +import fixtures import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_collect.py b/os_collect_config/tests/test_collect.py index eba38f7..4efcff8 100644 --- a/os_collect_config/tests/test_collect.py +++ b/os_collect_config/tests/test_collect.py @@ -14,16 +14,16 @@ # limitations under the License. import copy -import extras -import fixtures import json -import mock import os import signal import sys import tempfile +import extras +import fixtures from keystoneclient import discover as ks_discover +import mock from oslo.config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_ec2.py b/os_collect_config/tests/test_ec2.py index db76477..22e5b44 100644 --- a/os_collect_config/tests/test_ec2.py +++ b/os_collect_config/tests/test_ec2.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +import uuid + import fixtures import requests import six.moves.urllib.parse as urlparse import testtools from testtools import matchers -import uuid from os_collect_config import collect from os_collect_config import ec2 diff --git a/os_collect_config/tests/test_heat.py b/os_collect_config/tests/test_heat.py index feac846..92f731d 100644 --- a/os_collect_config/tests/test_heat.py +++ b/os_collect_config/tests/test_heat.py @@ -12,11 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock - import fixtures from keystoneclient import discover as ks_discover from keystoneclient import exceptions as ks_exc +import mock from oslo.config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_heat_local.py b/os_collect_config/tests/test_heat_local.py index 2347681..4d9678e 100644 --- a/os_collect_config/tests/test_heat_local.py +++ b/os_collect_config/tests/test_heat_local.py @@ -13,11 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import fixtures import json import os.path -from oslo.config import cfg import tempfile + +import fixtures +from oslo.config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_keystone.py b/os_collect_config/tests/test_keystone.py index f02c7fb..59bbc88 100644 --- a/os_collect_config/tests/test_keystone.py +++ b/os_collect_config/tests/test_keystone.py @@ -12,12 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import tempfile import fixtures from keystoneclient import discover as ks_discover from keystoneclient import exceptions as ks_exc +import mock from oslo.config import cfg import testtools diff --git a/test-requirements.txt b/test-requirements.txt index eebc32a..973d6ac 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,10 +1,11 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. +hacking>=0.9.2,<0.10 + coverage>=3.6 discover fixtures>=0.3.14 -hacking>=0.8.0,<0.9 mock>=1.0 python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 diff --git a/tox.ini b/tox.ini index fd1551d..45fccb0 100644 --- a/tox.ini +++ b/tox.ini @@ -28,6 +28,7 @@ commands = commands = {posargs} [flake8] -ignore = H803 +# H405 multi line docstring summary not separated with an empty line +ignore = H803,H405 exclude = .venv,.tox,dist,doc,*.egg,./os_collect_config/openstack/* show-source = true