Merge "fix tox.ini for pep8 job"

tox.ini

@@ -20,36 +20,26 @@ distribute = false
 basepython = python2.7
 
 [testenv:pep8]
+#commands = flake8
 commands = {toxinidir}/tools/fake_pep8.sh
 distribute = false
 
 [testenv:py26]
 basepython = python2.6
 
-
 [testenv:py34]
 basepython = python3.4
 
-
 [testenv:venv]
 commands = {posargs}
 
-[testenv:cli]
-sitepackages = True
-commands = {toxinidir}/tests/ci/rally-integrated.sh
-
 [testenv:cover]
 commands = {toxinidir}/tests/ci/cover.sh {posargs}
 
-
 [testenv:docs]
 changedir = doc/
 commands = make html
 
-[testenv:genconfig]
-commands =
-    oslo-config-generator --config-file etc/rally/rally-config-generator.conf
-
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
@@ -57,7 +47,3 @@ downloadcache = ~/cache/pip
 ignore = H703
 show-source = true
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,build,setup.py
-
-[hacking]
-import_exceptions = rally.common.i18n
-local-check-factory = tests.hacking.checks.factory