From 9dd534a5df028467704b1d884296af14aaffefc3 Mon Sep 17 00:00:00 2001 From: kgriffs Date: Tue, 31 Dec 2013 09:32:37 -0600 Subject: [PATCH] chore: Sync local (marconi) requirements with global reqs This gets us the latest Falcon, with its associated bug fixes, esp. wrt accept header parsing. Also fixed some hacking violations to get this to pass the gate. Change-Id: Ic7bfc8210947f37078d034fc2f56cc04b2d88392 --- marconi/queues/storage/mongodb/catalogue.py | 3 ++- marconi/queues/storage/mongodb/shards.py | 3 ++- marconi/queues/transport/wsgi/driver.py | 3 ++- marconi/queues/transport/wsgi/public/driver.py | 16 ++++++++++------ requirements.txt | 6 +++--- test-requirements.txt | 4 ++-- .../transport/wsgi/test_queue_lifecycle.py | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/marconi/queues/storage/mongodb/catalogue.py b/marconi/queues/storage/mongodb/catalogue.py index 8527325d4..31bc74e9b 100644 --- a/marconi/queues/storage/mongodb/catalogue.py +++ b/marconi/queues/storage/mongodb/catalogue.py @@ -24,7 +24,8 @@ Serves to construct an association between a project + queue -> shard """ import marconi.openstack.common.log as logging -from marconi.queues.storage import base, errors +from marconi.queues.storage import base +from marconi.queues.storage import errors from marconi.queues.storage.mongodb import utils diff --git a/marconi/queues/storage/mongodb/shards.py b/marconi/queues/storage/mongodb/shards.py index 0dd5c6e4f..6f42880b6 100644 --- a/marconi/queues/storage/mongodb/shards.py +++ b/marconi/queues/storage/mongodb/shards.py @@ -27,7 +27,8 @@ Schema: import functools from marconi.common import utils as common_utils -from marconi.queues.storage import base, errors +from marconi.queues.storage import base +from marconi.queues.storage import errors from marconi.queues.storage.mongodb import utils SHARDS_INDEX = [ diff --git a/marconi/queues/transport/wsgi/driver.py b/marconi/queues/transport/wsgi/driver.py index 33ba86a97..e5b530476 100644 --- a/marconi/queues/transport/wsgi/driver.py +++ b/marconi/queues/transport/wsgi/driver.py @@ -27,7 +27,8 @@ from marconi.common.transport.wsgi import helpers from marconi.openstack.common.gettextutils import _ import marconi.openstack.common.log as logging from marconi.queues import transport -from marconi.queues.transport import auth, validation +from marconi.queues.transport import auth +from marconi.queues.transport import validation _WSGI_OPTIONS = [ cfg.StrOpt('bind', default='127.0.0.1', diff --git a/marconi/queues/transport/wsgi/public/driver.py b/marconi/queues/transport/wsgi/public/driver.py index 157f2dcdb..766810784 100644 --- a/marconi/queues/transport/wsgi/public/driver.py +++ b/marconi/queues/transport/wsgi/public/driver.py @@ -12,15 +12,19 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -"""marconi-queues (public): handles all the routes for queuing, -messaging, and claiming. +"""marconi-queues public interface. + +Handles all the routes for queuing, messaging, and claiming. """ - from marconi.common.transport.wsgi import health -from marconi.queues.transport.wsgi import ( - claims, driver, messages, metadata, queues, stats, v1, -) +from marconi.queues.transport.wsgi import claims +from marconi.queues.transport.wsgi import driver +from marconi.queues.transport.wsgi import messages +from marconi.queues.transport.wsgi import metadata +from marconi.queues.transport.wsgi import queues +from marconi.queues.transport.wsgi import stats +from marconi.queues.transport.wsgi import v1 class Driver(driver.DriverBase): diff --git a/requirements.txt b/requirements.txt index 47111f6d3..62578485e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,14 +2,14 @@ pbr>=0.5.21,<1.0 Babel>=1.3 netaddr>=0.7.6 -falcon>=0.1.6,<0.1.7 +falcon>=0.1.6,<0.2.0 jsonschema>=1.3.0,!=1.4.0 iso8601>=0.1.8 msgpack-python pymongo>=2.4 python-keystoneclient>=0.4.1 -python-memcached +python-memcached>=1.48 WebOb>=1.2.3,<1.3 -stevedore>=0.10 +stevedore>=0.12 six>=1.4.1 oslo.config>=1.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index c1e68d949..55edf5d17 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,5 @@ # Metrics and style -hacking>=0.5.6,<0.8 +hacking>=0.8.0,<0.9 # Packaging mock>=1.0 @@ -8,7 +8,7 @@ mock>=1.0 ddt>=0.4.0 discover fixtures>=0.3.14 -httpretty>=0.6.3 +httpretty>=0.7.1 python-subunit testrepository>=0.0.17 testtools>=0.9.32 diff --git a/tests/unit/queues/transport/wsgi/test_queue_lifecycle.py b/tests/unit/queues/transport/wsgi/test_queue_lifecycle.py index 6111eefbe..a6b8e8c1d 100644 --- a/tests/unit/queues/transport/wsgi/test_queue_lifecycle.py +++ b/tests/unit/queues/transport/wsgi/test_queue_lifecycle.py @@ -357,7 +357,7 @@ class QueueFaultyDriverTests(base.TestBaseFaulty): result = self.simulate_get(path + '/metadata', '480924') result_doc = json.loads(result[0]) self.assertEqual(self.srmock.status, falcon.HTTP_503) - self.assertNotEquals(result_doc, json.loads(doc)) + self.assertNotEqual(result_doc, json.loads(doc)) self.simulate_get(path + '/stats', '480924') self.assertEqual(self.srmock.status, falcon.HTTP_503)