summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-15 16:17:48 +0000
committerGerrit Code Review <review@openstack.org>2015-04-15 16:17:48 +0000
commit71093e44311694b55531eda084977cb8ca9f99f4 (patch)
treed849da7e1702e57314ad37e7986eff2c64f53cf6
parent7e4dcf76f5b3234ca40dc9ef12506d92ff48c752 (diff)
parenta69fe44ff142b27b9a0dbcf643dc92a29a2a26bc (diff)
downloadtempest-lib-71093e44311694b55531eda084977cb8ca9f99f4.tar.gz
Merge "Move to hacking 0.10"
-rw-r--r--tempest_lib/tests/test_tempest_lib.py2
-rw-r--r--test-requirements.txt3
-rw-r--r--tox.ini5
3 files changed, 4 insertions, 6 deletions
diff --git a/tempest_lib/tests/test_tempest_lib.py b/tempest_lib/tests/test_tempest_lib.py
index 8f75057..76d74a6 100644
--- a/tempest_lib/tests/test_tempest_lib.py
+++ b/tempest_lib/tests/test_tempest_lib.py
@@ -25,4 +25,4 @@ from tempest_lib.tests import base
class TestTempest_lib(base.TestCase):
def test_something(self):
- pass \ No newline at end of file
+ pass
diff --git a/test-requirements.txt b/test-requirements.txt
index 0561abf..158a921 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,8 @@
# 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.
-hacking>=0.9.2,<0.10
+hacking<0.11,>=0.10.0
+
coverage>=3.6
discover
diff --git a/tox.ini b/tox.ini
index b704ce4..88c10ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,13 +26,10 @@ commands = python setup.py test --coverage --coverage-package-name='tempest_lib'
commands = python setup.py build_sphinx
[flake8]
-# H803 skipped on purpose per list discussion.
# E125 skipped as it is invalid PEP-8.
-# H402 skipped because some docstrings aren't sentences
# E123 skipped because it is ignored by default in the default pep8
# E129 skipped because it is too limiting when combined with other rules
-# H305 skipped because it is inconsistent between python versions
show-source = True
-ignore = E125,H803,H402,E123,E129,H305
+ignore = E125,E123,E129
builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build