From 5feedfb8ba1a46488f52ba081c5e5cedf6bedb16 Mon Sep 17 00:00:00 2001 From: Ekaterina Chernova Date: Mon, 16 Feb 2015 18:19:48 +0300 Subject: [PATCH] Update from global requirements Change-Id: I955c2945de793ee7f3ce4eb9688e43ec63a6b8e2 --- murano/common/engine.py | 2 +- murano/common/exceptions.py | 2 +- murano/common/helpers/token_sanitizer.py | 2 +- murano/policy/congress_rules.py | 2 +- murano/tests/functional/api/base.py | 2 +- murano/tests/unit/api/base.py | 4 ++-- murano/tests/unit/policy/test_congress_rules.py | 2 +- requirements.txt | 8 ++++---- test-requirements.txt | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/murano/common/engine.py b/murano/common/engine.py index 2f1b542f8..8f3092470 100644 --- a/murano/common/engine.py +++ b/murano/common/engine.py @@ -82,7 +82,7 @@ def get_rpc_service(): return RPC_SERVICE -class Environment: +class Environment(object): def __init__(self, object_id): self.object_id = object_id diff --git a/murano/common/exceptions.py b/murano/common/exceptions.py index 2d34ec070..b9049eed8 100644 --- a/murano/common/exceptions.py +++ b/murano/common/exceptions.py @@ -18,4 +18,4 @@ class TimeoutException(Exception): class PolicyViolationException(Exception): - pass \ No newline at end of file + pass diff --git a/murano/common/helpers/token_sanitizer.py b/murano/common/helpers/token_sanitizer.py index 229374b9d..acb7742cc 100644 --- a/murano/common/helpers/token_sanitizer.py +++ b/murano/common/helpers/token_sanitizer.py @@ -16,7 +16,7 @@ import types -class TokenSanitizer(): +class TokenSanitizer(object): """Helper class for cleaning some object from different passwords/tokens. Simply searches attribute with `look a like` name as one of the token and replace it value with message. diff --git a/murano/policy/congress_rules.py b/murano/policy/congress_rules.py index 0beae4fe0..6468c59c0 100644 --- a/murano/policy/congress_rules.py +++ b/murano/policy/congress_rules.py @@ -209,4 +209,4 @@ class StateRule(object): self.state = state def __str__(self): - return 'murano:states+("{0}", "{1}")'.format(self.obj_id, self.state) \ No newline at end of file + return 'murano:states+("{0}", "{1}")'.format(self.obj_id, self.state) diff --git a/murano/tests/functional/api/base.py b/murano/tests/functional/api/base.py index 8182d4cb2..ed287adbf 100644 --- a/murano/tests/functional/api/base.py +++ b/murano/tests/functional/api/base.py @@ -293,4 +293,4 @@ class NegativeTestCase(TestCase): @classmethod def purge_creds(cls): - cls.isolated_creds.clear_isolated_creds() \ No newline at end of file + cls.isolated_creds.clear_isolated_creds() diff --git a/murano/tests/unit/api/base.py b/murano/tests/unit/api/base.py index 47d53469c..3b95c2a48 100644 --- a/murano/tests/unit/api/base.py +++ b/murano/tests/unit/api/base.py @@ -42,7 +42,7 @@ def test_with_middleware(self, middleware, func, req, *args, **kwargs): return resp -class FakeLogMixin: +class FakeLogMixin(object): """Allow logs to be tested (rather than just disabling logging. This is taken from heat """ @@ -88,7 +88,7 @@ class MuranoApiTestCase(base.MuranoWithDBTestCase, FakeLogMixin): timeutils.utcnow.override_time = None def _stub_uuid(self, values=[]): - class FakeUUID: + class FakeUUID(object): def __init__(self, v): self.hex = v diff --git a/murano/tests/unit/policy/test_congress_rules.py b/murano/tests/unit/policy/test_congress_rules.py index d77b1e1dd..a144c26d8 100644 --- a/murano/tests/unit/policy/test_congress_rules.py +++ b/murano/tests/unit/policy/test_congress_rules.py @@ -226,4 +226,4 @@ class TestCongressRules(unittest.TestCase): self.assertTrue( 'murano:states+("c86104748a0c4907b4c5981e6d3bce9f", "pending")' - in rules_str) \ No newline at end of file + in rules_str) diff --git a/requirements.txt b/requirements.txt index 66568e2bb..abf0bd34a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,8 @@ pbr>=0.6,!=0.7,<1.0 Babel>=1.3 SQLAlchemy>=0.9.7,<=0.9.99 -alembic>=0.6.4 -eventlet>=0.15.2 +alembic>=0.7.2 +eventlet>=0.16.1 PasteDeploy>=1.5.0 Routes>=1.12.3,!=2.0 WebOb>=1.2.3 @@ -24,9 +24,8 @@ keystonemiddleware>=1.0.0 Paste jsonschema>=2.0.0,<3.0.0 -python-keystoneclient>=0.11.1 +python-keystoneclient>=1.1.0 python-heatclient>=0.2.9 -python-congressclient>=1.0.2 python-neutronclient>=2.3.6,<3 oslo.db>=1.1.0 # Apache-2.0 oslo.config>=1.4.0 # Apache-2.0 @@ -39,3 +38,4 @@ oslo.i18n>=1.3.0 yaql>=0.2.3,<0.3 python-muranoclient>=0.5.5 python-mistralclient>=0.1.1 +python-congressclient>=1.0.2 \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index 4e43a239b..65dbd5bef 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # 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.10.0,<0.11 coverage>=3.6 discover @@ -10,7 +10,7 @@ mock>=1.0 oslotest>=1.2.0 # Apache-2.0 posix_ipc sqlalchemy-migrate>=0.9.1,!=0.9.2 -tempest-lib +tempest-lib>=0.2.0 testrepository>=0.0.18 testresources>=0.2.4 testscenarios>=0.4