From 2b739b2e9bae8840b73e5e82bf650b413664b034 Mon Sep 17 00:00:00 2001 From: Ilya Shakhat Date: Tue, 28 Feb 2017 18:49:35 +0400 Subject: [PATCH] Bump dependencies versions Sync with the current OpenStack global requirements (Okata) Change-Id: Icc6dd939fcf500a1a2442c0ad1f6904b5bd452f8 --- etc/shaker.conf | 14 +++++++++++++- requirements-agent.txt | 17 +++++++---------- requirements.txt | 28 ++++++++++++++-------------- setup-agent.cfg | 2 +- setup.cfg | 1 - shaker/engine/server.py | 2 ++ test-requirements.txt | 6 +++--- 7 files changed, 40 insertions(+), 30 deletions(-) diff --git a/etc/shaker.conf b/etc/shaker.conf index 92dd0d0..9b6b399 100644 --- a/etc/shaker.conf +++ b/etc/shaker.conf @@ -59,7 +59,7 @@ # Log output to standard error. This option is ignored if log_config_append is # set. (boolean value) -#use_stderr = true +#use_stderr = false # Format string to use for log messages with context. (string value) #logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s @@ -94,6 +94,18 @@ # value) #instance_uuid_format = "[instance: %(uuid)s] " +# Interval, number of seconds, of log rate limiting. (integer value) +#rate_limit_interval = 0 + +# Maximum number of logged messages per rate_limit_interval. (integer value) +#rate_limit_burst = 0 + +# Log level name used by rate limiting: CRITICAL, ERROR, INFO, WARNING, DEBUG +# or empty string. Logs with level greater or equal to rate_limit_except_level +# are not filtered. An empty string means that all levels are filtered. (string +# value) +#rate_limit_except_level = CRITICAL + # Enables or disables fatal status of deprecations. (boolean value) #fatal_deprecations = false diff --git a/requirements-agent.txt b/requirements-agent.txt index dba5ea5..17ef03f 100644 --- a/requirements-agent.txt +++ b/requirements-agent.txt @@ -2,14 +2,11 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 +pbr>=1.8 # Apache-2.0 -oslo.concurrency>=2.3.0 # Apache-2.0 -oslo.config>=2.6.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.12.0 # Apache-2.0 -oslo.serialization>=1.10.0 # Apache-2.0 -oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0 -psutil<2.0.0,>=1.1.1 -PyYAML>=3.1.0 -pyzmq<15.0.0,>=14.3.1 # LGPL+BSD +oslo.concurrency>=3.8.0 # Apache-2.0 +oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 +oslo.i18n>=2.1.0 # Apache-2.0 +oslo.log>=3.11.0 # Apache-2.0 +pyzmq>=16.0 # LGPL+BSD +PyYAML>=3.1.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 11cbf03..95ffcb3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,23 +4,23 @@ pbr>=1.8 # Apache-2.0 -iso8601>=0.1.9 # MIT -Jinja2>=2.8 # BSD License (3 clause) -keystoneauth1>=2.1.0 # Apache-2.0 -os-client-config>=1.13.1 # Apache-2.0 -oslo.concurrency>=3.5.0 # Apache-2.0 -oslo.config>=3.9.0 # Apache-2.0 +iso8601>=0.1.11 # MIT +Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) +keystoneauth1>=2.18.0 # Apache-2.0 +os-client-config>=1.22.0 # Apache-2.0 +oslo.concurrency>=3.8.0 # Apache-2.0 +oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 -oslo.log>=1.14.0 # Apache-2.0 +oslo.log>=3.11.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -oslo.utils>=3.5.0 # Apache-2.0 +oslo.utils>=3.18.0 # Apache-2.0 pygal pykwalify -python-glanceclient>=2.0.0 # Apache-2.0 -python-neutronclient>=4.2.0 # Apache-2.0 -python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 -python-heatclient>=0.6.0 # Apache-2.0 +python-glanceclient>=2.5.0 # Apache-2.0 +python-neutronclient>=5.1.0 # Apache-2.0 +python-novaclient>=7.1.0 # Apache-2.0 +python-heatclient>=1.6.1 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD -PyYAML>=3.1.0 # MIT -pyzmq>=15.2.0 +PyYAML>=3.10.0 # MIT +pyzmq>=16.0 # LGPL+BSD six>=1.9.0 # MIT diff --git a/setup-agent.cfg b/setup-agent.cfg index 5e6c02e..e7f6356 100644 --- a/setup-agent.cfg +++ b/setup-agent.cfg @@ -16,7 +16,7 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 + Programming Language :: Python :: 3.5 [files] packages = diff --git a/setup.cfg b/setup.cfg index 0ce8e2b..774a311 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,6 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 [files] diff --git a/shaker/engine/server.py b/shaker/engine/server.py index b87b256..c4903f3 100644 --- a/shaker/engine/server.py +++ b/shaker/engine/server.py @@ -140,6 +140,8 @@ def _under_openstack(): for param in required: if param not in cfg.CONF: return False + if not cfg.CONF.get(param): + return False return True diff --git a/test-requirements.txt b/test-requirements.txt index 28f3bcf..cafcbe3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,11 +3,11 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -coverage>=3.6 # Apache-2.0 +coverage>=4.0 # Apache-2.0 hacking>=0.12.0,!=0.13.0,<0.14 -mock>=1.2 # BSD +mock>=2.0 # BSD oslotest>=1.10.0 # Apache-2.0 -sphinx>=1.5.1 # BSD -- to avoid https://sourceforge.net/p/docutils/bugs/301/ +sphinx>=1.5.1 # BSD sphinxcontrib-httpdomain # BSD sphinx_rtd_theme testrepository>=0.0.18 # Apache-2.0/BSD