summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-17 17:48:47 +0000
committerGerrit Code Review <review@openstack.org>2016-06-17 17:48:48 +0000
commit5c66d30e4c4ffb209a5dbb588ff2f85ebbe8b61a (patch)
tree5a6ba73a7d6308168e7cace093eea4a85823ab4d
parent7c60b7ea9d61ad638b3494fcbd92683b74ac3e81 (diff)
parent7360f85dabd13f87d2fbf56fb924e2cb9d382dc0 (diff)
downloadtooz-5c66d30e4c4ffb209a5dbb588ff2f85ebbe8b61a.tar.gz
Merge "Run doc8 only in pep8 target"
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini4
2 files changed, 2 insertions, 3 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index af7acb6..77d7c40 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,6 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-doc8 # Apache-2.0
mock>=2.0 # BSD
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 68838a8..b2619c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ commands = {posargs}
[testenv:py27]
commands = python setup.py testr --slowest --testr-args="{posargs}"
{toxinidir}/run-examples.sh
- doc8 doc/source
[testenv:py27-zookeeper]
commands = pifpaf -e TOOZ_TEST run zookeeper -- python setup.py testr --slowest --testr-args="{posargs}"
@@ -75,12 +74,13 @@ commands = python setup.py testr --slowest --coverage --testr-args="{posargs}"
[testenv:docs]
commands = python setup.py build_sphinx
- doc8 doc/source
[testenv:pep8]
deps = hacking<0.11,>=0.10.0
+ doc8
commands =
flake8
+ doc8 doc/source
[flake8]
exclude=.venv,.git,.tox,dist,*egg,*.egg-info,build,examples,doc