From: kong wei <kong.wei2@zte.com.cn>
Date: Sun, 19 Feb 2017 14:57:40 +0000 (+0000)
Subject: Merge "ESCALATOR-42 Get available version list"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4f7acadc2e979d791aa8c2d69b60c92f69795084;hp=2cae5ac9c45eeecb496ef06d5d44ae8deec144b7;p=escalator.git

Merge "ESCALATOR-42 Get available version list"
---

diff --git a/.gitignore b/.gitignore
index 2884629..33a0451 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *~
 .*.sw?
-/build/
-/output/
+/docs_build/
+/docs_output/
 /releng/
diff --git a/INFO b/INFO
index dcc178d..8d0f92e 100644
--- a/INFO
+++ b/INFO
@@ -11,7 +11,6 @@ Mailing list tag: [escalator]
 Meetings: Every Thursday 1200-1300 UTC
 IRC : #opnfv-meeting @ Freenode.net
 
-
 Committers:
 hu.jie@zte.com.cn
 fuqiao@chinamobile.com
@@ -19,18 +18,6 @@ ulrich.kleber@huawei.com
 maria.toeroe@ericsson.com
 kong.wei2@zte.com.cn
 
-Contributors:
-sama@docomolab-euro.com
-chao.zhong@zte.com.cn
-zhang.jun3g@zte.com.cn
-yuan.yue@zte.com.cn
-huangzhipeng@huawei.com
-meng.jia@zte.com.cn
-liyi.meng@ericsson.com
-pasi.vaananen@stratus.com
-wang.guobing1@zte.com.cn
-jianfei.zhang@nokia.com
-
 Link to TSC approval of the project:
 http://meetbot.opnfv.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-04-21-14.00.html
 Link(s) to approval of project lead and additional committers:
diff --git a/api/tox.ini b/api/tox.ini
index df74702..f5c9d10 100644
--- a/api/tox.ini
+++ b/api/tox.ini
@@ -37,12 +37,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