From bad768ed9ad925c92fcc5dd4560024303dc07a77 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 3 Dec 2016 21:41:58 +0100 Subject: [PATCH] Sync oslo/test-requirements with global-requirements As an initial step to make monasca-agent coinstallable we need to converge to use the OpenStack global-requirements Change-Id: Icdaa769b114f83af3cff2274bd20ea6d74b8f944 --- requirements.txt | 6 +++++- test-requirements.txt | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index b61866b1..7f62a1d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +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. + requests>=2.10.0 # Apache-2.0 oslo.concurrency>=3.8.0 # Apache-2.0 @@ -12,7 +16,7 @@ httplib2>=0.7.5 # MIT netaddr>=0.7.13,!=0.7.16 # BSD ntplib>=0.3.2,<0.4 psutil<3.1.0 -pymongo>=3.0.2,<=3.2.2,!=3.1 +pymongo>=3.0.2,!=3.1 python-memcached>=1.56 # PSF python-monascaclient>=1.1.0 # Apache-2.0 redis>=2.10.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 703b4b8d..55d36af3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +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.12.0,<0.13 # Apache-2.0 -flake8>=2.5.4,<2.6.0 # MIT -nose +flake8<2.6.0,>=2.5.4 # MIT +nose # LGPL mock>=2.0 # BSD