Update from the global requirements

Note that in the latest oslo.log the default log level is changed
from WARN to INFO

Change-Id: Ib821328a5ece05d241943c645331f069c3a80276

doc/source/tools/shaker-agent.txt

@@ -21,7 +21,7 @@ optional arguments:
                         can be specified, with values in later files taking
                         precedence. The default files used are: None.
   --debug, -d           Print debugging output (set logging level to DEBUG
-                        instead of default WARNING level).
+                        instead of default INFO level).
   --log-config-append PATH, --log_config PATH
                         The name of a logging configuration file. This file is
                         appended to any existing logging configuration files.
@@ -61,6 +61,6 @@ optional arguments:
                         syslog message with APP-NAME (RFC5424). The format
                         without the APP-NAME is deprecated in K, and will be
                         removed in M, along with this option.
-  --verbose, -v         Print more verbose output (set logging level to INFO
+  --verbose, -v         If set to false, will disable INFO logging level,
-                        instead of default WARNING level).
+                        making WARNING the default.
   --version             show program's version number and exit

doc/source/tools/shaker-cleanup.txt

@@ -31,7 +31,7 @@ optional arguments:
                         can be specified, with values in later files taking
                         precedence. The default files used are: None.
   --debug, -d           Print debugging output (set logging level to DEBUG
-                        instead of default WARNING level).
+                        instead of default INFO level).
   --external-net EXTERNAL_NET
                         Name or ID of external network, defaults to
                         env[SHAKER_EXTERNAL_NET]. If no value provided then
@@ -96,6 +96,6 @@ optional arguments:
                         syslog message with APP-NAME (RFC5424). The format
                         without the APP-NAME is deprecated in K, and will be
                         removed in M, along with this option.
-  --verbose, -v         Print more verbose output (set logging level to INFO
+  --verbose, -v         If set to false, will disable INFO logging level,
-                        instead of default WARNING level).
+                        making WARNING the default.
   --version             show program's version number and exit

doc/source/tools/shaker-image-builder.txt

@@ -34,7 +34,7 @@ optional arguments:
                         can be specified, with values in later files taking
                         precedence. The default files used are: None.
   --debug, -d           Print debugging output (set logging level to DEBUG
-                        instead of default WARNING level).
+                        instead of default INFO level).
   --external-net EXTERNAL_NET
                         Name or ID of external network, defaults to
                         env[SHAKER_EXTERNAL_NET]. If no value provided then
@@ -99,6 +99,6 @@ optional arguments:
                         syslog message with APP-NAME (RFC5424). The format
                         without the APP-NAME is deprecated in K, and will be
                         removed in M, along with this option.
-  --verbose, -v         Print more verbose output (set logging level to INFO
+  --verbose, -v         If set to false, will disable INFO logging level,
-                        instead of default WARNING level).
+                        making WARNING the default.
   --version             show program's version number and exit

doc/source/tools/shaker-report.txt

@@ -21,7 +21,7 @@ optional arguments:
                         can be specified, with values in later files taking
                         precedence. The default files used are: None.
   --debug, -d           Print debugging output (set logging level to DEBUG
-                        instead of default WARNING level).
+                        instead of default INFO level).
   --input INPUT         File to read test results from, defaults to
                         env[SHAKER_INPUT].
   --log-config-append PATH, --log_config PATH
@@ -65,6 +65,6 @@ optional arguments:
                         syslog message with APP-NAME (RFC5424). The format
                         without the APP-NAME is deprecated in K, and will be
                         removed in M, along with this option.
-  --verbose, -v         Print more verbose output (set logging level to INFO
+  --verbose, -v         If set to false, will disable INFO logging level,
-                        instead of default WARNING level).
+                        making WARNING the default.
   --version             show program's version number and exit

doc/source/tools/shaker.txt

@@ -38,7 +38,7 @@ optional arguments:
                         can be specified, with values in later files taking
                         precedence. The default files used are: None.
   --debug, -d           Print debugging output (set logging level to DEBUG
-                        instead of default WARNING level).
+                        instead of default INFO level).
   --external-net EXTERNAL_NET
                         Name or ID of external network, defaults to
                         env[SHAKER_EXTERNAL_NET]. If no value provided then
@@ -129,6 +129,6 @@ optional arguments:
                         syslog message with APP-NAME (RFC5424). The format
                         without the APP-NAME is deprecated in K, and will be
                         removed in M, along with this option.
-  --verbose, -v         Print more verbose output (set logging level to INFO
+  --verbose, -v         If set to false, will disable INFO logging level,
-                        instead of default WARNING level).
+                        making WARNING the default.
   --version             show program's version number and exit

etc/shaker.conf

@@ -4,13 +4,15 @@
 # From oslo_log
 #
 
-# Print debugging output (set logging level to DEBUG instead of default WARNING
+# Print debugging output (set logging level to DEBUG instead of default INFO
 # level). (boolean value)
 #debug = false
 
-# Print more verbose output (set logging level to INFO instead of default
+# If set to false, will disable INFO logging level, making WARNING the default.
-# WARNING level). (boolean value)
+# (boolean value)
-#verbose = false
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+#verbose = true
 
 # The name of a logging configuration file. This file is appended to any
 # existing logging configuration files. For details about logging configuration
@@ -69,7 +71,7 @@
 #logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
 
 # List of logger=LEVEL pairs. (list value)
-#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN
+#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN
 
 # Enables or disables publication of error events. (boolean value)
 #publish_errors = false

requirements.txt

@@ -2,21 +2,21 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=0.6,!=0.7,<1.0
+pbr<2.0,>=1.3
 
 iso8601>=0.1.9
-Jinja2>=2.6  # BSD License (3 clause)
+Jinja2>=2.6 # BSD License (3 clause)
-oslo.concurrency>=1.4.1         # Apache-2.0
+oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.config>=1.6.0  # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
-oslo.i18n>=1.3.0  # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=0.4.0  # Apache-2.0
+oslo.log>=1.8.0 # Apache-2.0
-oslo.serialization>=1.2.0               # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=1.2.0                       # Apache-2.0
+oslo.utils>=1.9.0 # Apache-2.0
-psutil>=1.1.1,<2.0.0
+psutil<2.0.0,>=1.1.1
-python-glanceclient>=0.15.0
+python-glanceclient>=0.18.0
-python-keystoneclient>=1.1.0
+python-keystoneclient>=1.6.0
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
-python-novaclient>=2.18.0,!=2.21.0
+python-novaclient>=2.22.0
 python-heatclient>=0.3.0
 python-subunit>=0.0.18
 PyYAML>=3.1.0

setup.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)

test-requirements.txt

@@ -4,11 +4,11 @@
 
 # Hacking already pins down pep8, pyflakes and flake8
 coverage>=3.6
-hacking>=0.8.0,<0.9
+hacking<0.11,>=0.10
-mock>=1.0
+mock>=1.2
-oslotest>=1.5.1 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 sphinxcontrib-httpdomain
 sphinx_rtd_theme
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0

tox.ini

@@ -45,7 +45,8 @@ commands = python setup.py build_sphinx
 
 [flake8]
 # E125 continuation line does not distinguish itself from next logical line
-ignore = E125
+# H405 multi line docstring summary not separated with an empty line
+ignore = E125,H405
 show-source = true
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,build