Merge "Update from global-requirements"

requirements.txt

@@ -32,7 +32,7 @@ jsonschema>=2.0.0,<3.0.0
 python-keystoneclient>=0.11.1
 python-heatclient>=0.2.9
 python-neutronclient>=2.3.6,<3
-oslo.db>=1.0.0  # Apache-2.0
+oslo.db>=1.1.0  # Apache-2.0
 oslo.config>=1.4.0  # Apache-2.0
 oslo.messaging>=1.4.0
 

test-requirements.txt

@@ -1,4 +1,4 @@
-hacking>=0.8.0,<0.9
+hacking>=0.9.2,<0.10
 
 coverage>=3.6
 discover
@@ -9,7 +9,7 @@ sqlalchemy-migrate>=0.8.2,!=0.8.4
 testrepository>=0.0.18
 testresources>=0.2.4
 testscenarios>=0.4
-testtools>=0.9.34
+testtools>=0.9.36,!=1.2.0
 unittest2
 
 # Some of the tests use real MySQL and Postgres databases

tox.ini

@@ -38,10 +38,21 @@ commands = flake8
 commands = oslo-config-generator --config-file etc/oslo-config-generator/murano.conf
 
 [flake8]
+# E122 Continuation line missing indentation or outdented
+# E128 Continuation line under-indented for visual indent
+# E265 Block comment should start with '# '
+# E713 Test for membership should be 'not in'
+# F402 Shadowed by local variable
+# H233 Python 3.x incompatible use of print operator
+# H305 Imports not grouped correctly
+# H307 Like imports should be grouped together
+# H402 One line docstring needs punctuation.
+# H405 Multi line docstring summary not separated with an empty line
 # H501 Do not use locals() for string formatting
 # H702 Argument to _ must be just a string
 # H902 Use the 'not in' operator for collection membership evaluation
-ignore =H501,H702,H902
+# H904 Wrap long lines in parentheses instead of a backslash
+ignore =E122,E128,E265,E713,F402,H233,H305,H307,H402,H405,H501,H702,H902,H904
 show-source = true
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools