From 6735d24b9d55756d8e317261ebd2bf6ff1349206 Mon Sep 17 00:00:00 2001 From: Nikolay Mahotkin Date: Tue, 28 Apr 2015 17:52:26 +0300 Subject: [PATCH] Updating requirements to master * Update requirements and test-requirements according to global-requirements in master branch * requirements are sorted in alphabetical order * Fixed pep8 errors from new hacking Change-Id: I207ed7b4a357b911557a1a041c0f17923a95b43e --- mistral/actions/action_generator.py | 2 +- mistral/actions/generator_factory.py | 2 +- mistral/actions/openstack/actions.py | 2 +- .../tests/unit/utils/test_inspect_utils.py | 2 +- mistral/utils/javascript.py | 2 +- mistral/yaql_utils.py | 2 +- requirements.txt | 53 +++++++++---------- test-requirements.txt | 24 ++++----- 8 files changed, 44 insertions(+), 45 deletions(-) diff --git a/mistral/actions/action_generator.py b/mistral/actions/action_generator.py index e4f128a4..e38eb43f 100644 --- a/mistral/actions/action_generator.py +++ b/mistral/actions/action_generator.py @@ -28,4 +28,4 @@ class ActionGenerator(object): return: list of actions dicts containing name, class, description and parameter info. """ - pass \ No newline at end of file + pass diff --git a/mistral/actions/generator_factory.py b/mistral/actions/generator_factory.py index 88adaa82..4afc7eae 100644 --- a/mistral/actions/generator_factory.py +++ b/mistral/actions/generator_factory.py @@ -23,4 +23,4 @@ def all_generators(): generators.HeatActionGenerator, generators.NeutronActionGenerator, generators.CinderActionGenerator - ] \ No newline at end of file + ] diff --git a/mistral/actions/openstack/actions.py b/mistral/actions/openstack/actions.py index 8e092188..9165932a 100644 --- a/mistral/actions/openstack/actions.py +++ b/mistral/actions/openstack/actions.py @@ -214,4 +214,4 @@ class CinderAction(base.OpenStackAction): @classmethod def _get_fake_client(cls): - return cls._client_class() \ No newline at end of file + return cls._client_class() diff --git a/mistral/tests/unit/utils/test_inspect_utils.py b/mistral/tests/unit/utils/test_inspect_utils.py index 9c4d1d19..8af4a9ec 100644 --- a/mistral/tests/unit/utils/test_inspect_utils.py +++ b/mistral/tests/unit/utils/test_inspect_utils.py @@ -35,4 +35,4 @@ class InspectUtilsTest(base.BaseTest): action_class = std_actions.SSHAction parameters_str = i_u.get_arg_list_as_str(action_class.__init__) - self.assertEqual("cmd, host, username, password", parameters_str) \ No newline at end of file + self.assertEqual("cmd, host, username, password", parameters_str) diff --git a/mistral/utils/javascript.py b/mistral/utils/javascript.py index e3233471..67d98e4b 100644 --- a/mistral/utils/javascript.py +++ b/mistral/utils/javascript.py @@ -50,4 +50,4 @@ EVALUATOR = V8Evaluator def evaluate(script, context): - return EVALUATOR.evaluate(script, context) \ No newline at end of file + return EVALUATOR.evaluate(script, context) diff --git a/mistral/yaql_utils.py b/mistral/yaql_utils.py index a3e7374d..46593edf 100644 --- a/mistral/yaql_utils.py +++ b/mistral/yaql_utils.py @@ -48,4 +48,4 @@ def _generator_length(a): def to_str(value): - return str(value()) \ No newline at end of file + return str(value()) diff --git a/requirements.txt b/requirements.txt index d234e768..59aebb52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,33 @@ alembic>=0.7.2 -pbr>=0.6,!=0.7,<1.0 -eventlet>=0.15.0 -PyYAML>=3.1.0 -pecan>=0.8.0 -WSME>=0.6 amqplib>=0.6.1 # This is not in global requirements (master branch) argparse Babel>=1.3 -iso8601>=0.1.9 -posix_ipc croniter>=0.3.4 # MIT License -requests>=1.2.1,!=2.4.0 -kombu>=2.4.8 -oslo.config>=1.4.0,<1.10.0 # Apache-2.0 -oslo.db>=1.0.0 # Apache-2.0 -oslo.messaging>=1.4.0 -oslo.utils>=1.2.0,<1.5.0 # Apache-2.0 -paramiko>=1.13.0 -ply==3.4 -python-cinderclient>=1.1.0 -python-heatclient>=0.2.9 -python-keystoneclient>=0.10.0 -python-neutronclient>=2.3.6,<3 -python-novaclient>=2.18.0 -python-glanceclient>=0.14.0 -networkx>=1.8 -six>=1.7.0 -SQLAlchemy>=0.9.7,<=0.9.99 -stevedore>=1.0.0 # Apache-2.0 -yaql==0.2.6 # This is not in global requirements +eventlet>=0.17.3 +iso8601>=0.1.9 jsonschema>=2.0.0,<3.0.0 +keystonemiddleware>=1.5.0 +kombu>=3.0.7 mock>=1.0 -keystonemiddleware>=1.0.0 +networkx>=1.8 +oslo.config>=1.11.0 # Apache-2.0 +oslo.db>=1.7.0 # Apache-2.0 +oslo.messaging>=1.8.0 +oslo.utils>=1.4.0 # Apache-2.0 +paramiko>=1.13.0 +pbr>=0.6,!=0.7,<1.0 +pecan>=0.8.0 +posix_ipc +python-cinderclient>=1.1.0 +python-glanceclient>=0.15.0 +python-heatclient>=0.3.0 +python-keystoneclient>=1.1.0 +python-neutronclient>=2.3.11,<3 +python-novaclient>=2.22.0 +PyYAML>=3.1.0 +requests>=2.2.0,!=2.4.0 +six>=1.9.0 +SQLAlchemy>=0.9.7,<=0.9.99 +stevedore>=1.3.0 # Apache-2.0 +WSME>=0.6 +yaql==0.2.6 # This is not in global requirements diff --git a/test-requirements.txt b/test-requirements.txt index 4db8eab5..447e4eec 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,16 +1,16 @@ -hacking>=0.9.2,<0.10 coverage>=3.6 -pyflakes==0.8.1 -pylint==0.25.2 -sphinx>=1.1.2,!=1.2.0,<1.3 -unittest2 -oslotest -oslosphinx -sphinxcontrib-pecanwsme>=0.8 -sphinxcontrib-httpdomain docutils==0.9.1 fixtures>=0.3.14 -nose -testrepository>=0.0.18 -testtools>=0.9.34 +hacking>=0.10.0,<0.11 lockfile>=0.8 +nose +oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslotest>=1.5.1,<1.6.0 # Apache-2.0 +pyflakes==0.8.1 +pylint>=1.3.0 # GNU GPL v2 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +sphinxcontrib-httpdomain +sphinxcontrib-pecanwsme>=0.8 +testrepository>=0.0.18 +testtools>=0.9.36,!=1.2.0 +unittest2