Bump hacking to 0.9.x series

Change-Id: I0e223dc5ccb6d9e68564911f986b665bc00d69e8

monascaclient/__init__.py

@@ -1,14 +0,0 @@
-# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.

monascaclient/common/utils.py

@@ -16,10 +16,11 @@
 from __future__ import print_function
 
 import os
-import prettytable
 import sys
 import textwrap
 import uuid
+
+import prettytable
 import yaml
 
 from monascaclient import exc

monascaclient/shell.py

@@ -21,10 +21,10 @@ from __future__ import print_function
 
 import argparse
 import logging
-import six
 import sys
 
 from keystoneclient.v2_0 import client as ksclient
+import six
 
 from monascaclient import client as monasca_client
 from monascaclient.common import utils

monascaclient/tests/fakes.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 from keystoneclient.v2_0 import client as ksclient
+
 from monascaclient.openstack.common import jsonutils
 
 

monascaclient/tests/test_shell.py

@@ -14,18 +14,18 @@
 # limitations under the License.
 
 import re
-import six
 import sys
 
 import fixtures
+from keystoneclient.v2_0 import client as ksclient
+from mox3 import mox
+import six
 import testtools
 
-from keystoneclient.v2_0 import client as ksclient
 from monascaclient.common import http
 from monascaclient import exc
 import monascaclient.shell
 from monascaclient.tests import fakes
-from mox3 import mox
 
 
 class TestCase(testtools.TestCase):
@@ -55,7 +55,7 @@ class TestCase(testtools.TestCase):
         orig = sys.stderr
         sys.stderr = six.StringIO()
         _shell = monascaclient.shell.MonascaShell()
-        e = self.assertRaises(Exception, _shell.main, argstr.split())
+        e = self.assertRaises(Exception, _shell.main, argstr.split())  # noqa
         self.assertRegexpMatches(e.__str__(), error_match)
         err = sys.stderr.getvalue()
         sys.stderr.close()

monascaclient/v2_0/shell.py

@@ -14,10 +14,11 @@
 # limitations under the License.
 
 import json
+import time
+
 from monascaclient.common import utils
 import monascaclient.exc as exc
 from monascaclient.openstack.common import jsonutils
-import time
 
 
 # Alarm valid types
@@ -127,7 +128,7 @@ def format_measure_id(measurements):
     # returns newline separated measurements id's for the id column
     meas_string_list = list()
     for meas in measurements:
-        #meas_string = '{:10d}'.format(meas[0])
+        # meas_string = '{:10d}'.format(meas[0])
         meas_string = '{:20d}'.format(meas[0])
         meas_string_list.append(meas_string)
     return '\n'.join(meas_string_list)

test-requirements.txt

@@ -1,9 +1,7 @@
-# Hacking already pins down pep8, pyflakes and flake8
-#tox>=1.6,<1.7
 coverage>=3.6
 discover
 fixtures>=0.3.14
-hacking>=0.8.0,<0.9
+hacking>=0.9.2,<0.10
 mock>=1.0
 mox3>=0.7.0
 sphinx>=1.1.2,<1.2

tox.ini

@@ -28,7 +28,9 @@ downloadcache = ~/cache/pip
 [flake8]
 show-source = True
 max-line-length = 120
-# H302: Do not import objects, only modules
-ignore = H302,H803
+# H302  Do not import objects, only modules
+# H803  git commit title should not end with period
+# H904  Wrap long lines in parentheses instead of a backslash
+ignore = H302,H803,H904
 builtins = _
 exclude=.venv,.git,.tox,dist,client_api_example.py,*openstack/common*,*lib/python*,*egg,build