From: kong wei <kong.wei2@zte.com.cn>
Date: Thu, 16 Feb 2017 05:46:25 +0000 (+0000)
Subject: Merge "Delete deprecated Hacking in tox.ini"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=758ecc69091be8c02b664de83e48a6c566702232;hp=f85a9829e1e9aa679310d298cd7090a454149e1c;p=escalator.git

Merge "Delete deprecated Hacking in tox.ini"
---

diff --git a/api/tox.ini b/api/tox.ini
index 5b5d52f..65f48a8 100644
--- a/api/tox.ini
+++ b/api/tox.ini
@@ -39,12 +39,10 @@ commands = python setup.py build_sphinx
 # TODO(dmllr): Analyze or fix the warnings blacklisted below
 # E711  comparison to None should be 'if cond is not None:'
 # E712  comparison to True should be 'if cond is True:' or 'if cond:'
-# H302  import only modules
-# H402  one line docstring needs punctuation.
 # H404  multi line docstring should start with a summary
 # H405  multi line docstring summary not separated with an empty line
 # H904  Wrap long lines in parentheses instead of a backslash
-ignore = E711,E712,H302,H402,H404,H405,H904,F841,F821,E265,F812,F402,E226,E731
+ignore = E711,E712,H404,H405,H904,F841,F821,E265,F812,F402,E226,E731
 exclude = .venv,.git,.tox,dist,doc,etc,*escalator/locale*,*openstack/common*,*lib/python*,*egg,build,escalator/i18n.py
 
 [hacking]
diff --git a/client/tox.ini b/client/tox.ini
index eca4fd9..6a6ea7d 100644
--- a/client/tox.ini
+++ b/client/tox.ini
@@ -33,9 +33,7 @@ downloadcache = ~/cache/pip
 
 [flake8]
 # H233  Python 3.x incompatible use of print operator
-# H302  import only modules
-# H303  no wildcard import
 # H404  multi line docstring should start with a summary
-ignore = F403,F812,H233,H302,H303,H404,F401,E731
+ignore = F403,F812,H233,H404,F401,E731
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build