Merge "Start using hacking 0.6"

openstack · Jul 25, 2013 · 7ae158b · 7ae158b
2 parents ca6fe8d + dea5ce7
commit 7ae158b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/nova/api/openstack/compute/plugins/v3/migrations.py b/nova/api/openstack/compute/plugins/v3/migrations.py
@@ -10,7 +10,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,9 +1,4 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.3,<0.6
-
+hacking>=0.5.6,<0.7
 coverage>=3.6
 discover
 feedparser

diff --git a/tox.ini b/tox.ini
@@ -41,7 +41,13 @@ commands =
 commands = {posargs}
 
 [flake8]
-ignore = E121,E122,E123,E124,E126,E127,E128,E711,E712,H302,H303,H404,F403,F811,F841,N309
+# TODO Hacking 0.6 checks to fix
+# H102  Apache 2.0 license header not found
+# H232  Python 3.x incompatible octal 1 should be written as 0o1
+# H233  Python 3.x incompatible use of print operator
+# H501  Do not use locals() for string formatting
+
+ignore = E121,E122,E123,E124,E126,E127,E128,E711,E712,H102,H232,H233,H302,H303,H404,F403,H501,F811,F841,N309
 builtins = _
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*plugins/xenserver*,tools