From a29166ebb8b8de6e6d4a7d39e2b885f267d92d2c Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 7 Jul 2015 09:39:18 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Iaeaca2e9eda607290f18fbb805f1cd90c9af0444 --- requirements-py3.txt | 28 ---------------- requirements.txt | 32 +++++++++---------- setup.py | 1 - test-requirements-py3.txt | 26 --------------- test-requirements.txt | 12 +++---- tox.ini | 8 ----- zaqar/api/handler.py | 2 +- zaqar/api/v1_1/request.py | 2 +- zaqar/common/errors.py | 2 +- zaqar/storage/mongodb/options.py | 2 +- zaqar/storage/redis/scripting.py | 2 +- zaqar/tests/unit/transport/websocket/utils.py | 2 +- 12 files changed, 28 insertions(+), 91 deletions(-) delete mode 100644 requirements-py3.txt mode change 100755 => 100644 setup.py delete mode 100644 test-requirements-py3.txt diff --git a/requirements-py3.txt b/requirements-py3.txt deleted file mode 100644 index da163723c..000000000 --- a/requirements-py3.txt +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -pbr>=0.6,!=0.7,<1.0 - -Babel>=1.3 -netaddr>=0.7.12 -falcon>=0.1.6,<0.2.0 -jsonschema>=2.0.0,<3.0.0 -iso8601>=0.1.9 -keystonemiddleware>=1.5.0 -msgpack-python>=0.4.0 -posix_ipc -pymongo>=3.0.2 -# python-memcached has no Py3k support for now -# python-memcached>=1.48 -WebOb>=1.2.3 -stevedore>=1.3.0,<1.4.0 # Apache-2.0 -six>=1.9.0 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.log>=1.0.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 -SQLAlchemy>=0.9.7,<=0.9.99 -enum34 -autobahn>=0.10.1 # MIT License -requests>=2.2.0,!=2.4.0 -taskflow>=0.7.1,<0.8.0 diff --git a/requirements.txt b/requirements.txt index aa41150d9..c5752346c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,29 +1,29 @@ # 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. -pbr>=0.6,!=0.7,<1.0 +pbr<2.0,>=0.11 Babel>=1.3 netaddr>=0.7.12 -falcon>=0.1.6,<0.2.0 -jsonschema>=2.0.0,<3.0.0 +falcon<0.2.0,>=0.1.6 +jsonschema!=2.5.0,<3.0.0,>=2.0.0 iso8601>=0.1.9 keystonemiddleware>=1.5.0 msgpack-python>=0.4.0 -posix_ipc +posix-ipc python-memcached>=1.48 WebOb>=1.2.3 -stevedore>=1.3.0,<1.4.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 six>=1.9.0 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 -oslo.context>=0.2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.log>=1.0.0 # Apache-2.0 -oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 -SQLAlchemy>=0.9.7,<=0.9.99 -enum34 +oslo.config>=1.11.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +SQLAlchemy<1.1.0,>=0.9.7 +enum34;python_version=='2.7' or python_version=='2.6' trollius>=1.0 -autobahn>=0.10.1 # MIT License -requests>=2.2.0,!=2.4.0 -taskflow>=0.7.1,<0.8.0 +autobahn>=0.10.1 # MIT License +requests>=2.5.2 +taskflow>=0.11.0 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 736375744..056c16c2b --- a/setup.py +++ b/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"); diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt deleted file mode 100644 index fcf1a9326..000000000 --- a/test-requirements-py3.txt +++ /dev/null @@ -1,26 +0,0 @@ -# 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. -# Metrics and style -hacking>=0.8.0,<0.9 - -# Packaging -mock>=1.0 - -# Backends -redis>=2.10.0 - -# Unit testing -ddt>=0.4.0 -discover -fixtures>=0.3.14 -python-subunit>=0.0.18 -testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 - -# Documentation -# NOTE(vkmc) sphinx modules are commented out as a workaround for bug #1403510 -# sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -# oslosphinx>=2.2.0 # Apache-2.0 -openstack-doc-tools>=0.23 - diff --git a/test-requirements.txt b/test-requirements.txt index 3c43dfa9e..cf221df69 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # Metrics and style -hacking>=0.9.2,<0.10 +hacking<0.11,>=0.10.0 # Packaging mock>=1.0 @@ -13,15 +13,15 @@ pymongo>=3.0.2 # Unit testing coverage>=3.6 -ddt>=0.4.0 +ddt>=0.7.0 discover -fixtures>=0.3.14 +fixtures>=1.3.1 python-subunit>=0.0.18 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 # Documentation -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 openstack-doc-tools>=0.23 diff --git a/tox.ini b/tox.ini index ba2e2453c..51c238d32 100644 --- a/tox.ini +++ b/tox.ini @@ -19,14 +19,6 @@ setenv = ZAQAR_TEST_MONGODB=1 ZAQAR_TEST_SLOW=1 {[testenv]setenv} -[testenv:py33] -deps = -r{toxinidir}/requirements-py3.txt - -r{toxinidir}/test-requirements-py3.txt - -[testenv:py34] -deps = -r{toxinidir}/requirements-py3.txt - -r{toxinidir}/test-requirements-py3.txt - [testenv:pypy] setenv = JIT_FLAG=--jit off {[testenv]setenv} diff --git a/zaqar/api/handler.py b/zaqar/api/handler.py index c83550ef0..56447a42b 100644 --- a/zaqar/api/handler.py +++ b/zaqar/api/handler.py @@ -26,4 +26,4 @@ class Handler(object): def process_request(self, req): # FIXME(vkmc): Control API version - return getattr(self.v1_1_endpoints, req._action)(req) \ No newline at end of file + return getattr(self.v1_1_endpoints, req._action)(req) diff --git a/zaqar/api/v1_1/request.py b/zaqar/api/v1_1/request.py index 875472e36..f3e6017ba 100644 --- a/zaqar/api/v1_1/request.py +++ b/zaqar/api/v1_1/request.py @@ -589,4 +589,4 @@ class RequestSchema(api.Api): 'required': ['action', 'headers', 'body'], 'admin': True, }, - } \ No newline at end of file + } diff --git a/zaqar/common/errors.py b/zaqar/common/errors.py index 69f496895..34bc146c9 100644 --- a/zaqar/common/errors.py +++ b/zaqar/common/errors.py @@ -27,4 +27,4 @@ class InvalidAction(Exception): class ConfigurationError(Exception): - """An invalid value was used for a Zaqar configuration option.""" \ No newline at end of file + """An invalid value was used for a Zaqar configuration option.""" diff --git a/zaqar/storage/mongodb/options.py b/zaqar/storage/mongodb/options.py index 0283290f0..627d9b52d 100644 --- a/zaqar/storage/mongodb/options.py +++ b/zaqar/storage/mongodb/options.py @@ -144,4 +144,4 @@ def _config_options(): for management and message storage. """ return [(MANAGEMENT_MONGODB_GROUP, MANAGEMENT_MONGODB_OPTIONS), - (MESSAGE_MONGODB_GROUP, MESSAGE_MONGODB_OPTIONS)] \ No newline at end of file + (MESSAGE_MONGODB_GROUP, MESSAGE_MONGODB_OPTIONS)] diff --git a/zaqar/storage/redis/scripting.py b/zaqar/storage/redis/scripting.py index 0d343d952..af6b6f4e3 100644 --- a/zaqar/storage/redis/scripting.py +++ b/zaqar/storage/redis/scripting.py @@ -37,4 +37,4 @@ def _read_script(script_name): filename = os.path.join(folder, 'scripts', script_name + '.lua') with open(filename, 'r') as script_file: - return script_file.read() \ No newline at end of file + return script_file.read() diff --git a/zaqar/tests/unit/transport/websocket/utils.py b/zaqar/tests/unit/transport/websocket/utils.py index 9ecf06282..14f1a08fc 100644 --- a/zaqar/tests/unit/transport/websocket/utils.py +++ b/zaqar/tests/unit/transport/websocket/utils.py @@ -16,4 +16,4 @@ import json def create_request(action, body, headers): - return json.dumps({"action": action, "body": body, "headers": headers}) \ No newline at end of file + return json.dumps({"action": action, "body": body, "headers": headers})