From 0b2602b6b499e4f4a4e9ff775988201cff3ccb57 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Sat, 23 Aug 2014 16:49:01 -0700 Subject: [PATCH] Bump minimum required version for simplejson to 2.2.0 oslo-incubator commit ad248f6 adds usage of the namedtuple_as_object kwarg to simplejson's json.dumps. oslo-incubator's test-requirements requires simplejson >= 2.0.9 but namedtuple_as_object wasn't available until 2.2.0. This is important for anyone doing keystone database migrations on RHEL 6.5 with simplejson since the migrations will fail if you don't have a new enough simplejson (keystone is using this code now). Change-Id: I59f4e9c42ad83a305d810e52e440ff51ff5b7f0e Closes-Bug: #1361230 --- global-requirements.txt | 2 +- tests/files/gr-base.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/global-requirements.txt b/global-requirements.txt index 3ac54415f3..09fd5db118 100644 --- a/global-requirements.txt +++ b/global-requirements.txt @@ -119,7 +119,7 @@ requests-kerberos>=0.5 # MIT rfc3986>=0.2.0 # Apache-2.0 Routes>=1.12.3,!=2.0 rtslib-fb>=2.1.39 -simplejson>=2.0.9 +simplejson>=2.2.0 six>=1.7.0 sockjs-tornado>=1.0.0,<2.0.0 # The SQLA requirement looks weird, but it's here for a reason. The diff --git a/tests/files/gr-base.txt b/tests/files/gr-base.txt index 365f64cd14..858b63c987 100644 --- a/tests/files/gr-base.txt +++ b/tests/files/gr-base.txt @@ -68,7 +68,7 @@ qpid-python requests>=1.1,<1.2.3 Routes>=1.12.3 setuptools_git>=0.4 -simplejson>=2.0.9 +simplejson>=2.2.0 six sockjs-tornado>=1.0.0,<2.0.0 SQLAlchemy>=0.7,<=0.7.99