From 5b95fe369a833356a42845cc2bfcb98b5d506124 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 30 Oct 2015 15:00:35 +0900 Subject: [PATCH] Align requirements with upstream OpenStack as part of migration --- requirements.txt | 19 +++++++++++-------- test-requirements.txt | 13 +++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4e02d4bb..426002dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,11 @@ -PyYAML>=3.10 -simplejson>=3.3.1 -netifaces>=0.8 -netaddr>=0.7.10 -Jinja2>=2.7.2 -six>=1.5.2 -dnspython -psutil +# 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. +PyYAML>=3.1.0 +simplejson>=2.2.0 +netifaces>=0.10.4 +netaddr>=0.7.12,!=0.7.16 +Jinja2>=2.6 # BSD License (3 clause) +six>=1.9.0 +dnspython>=1.12.0 +psutil>=1.1.1,<2.0.0 diff --git a/test-requirements.txt b/test-requirements.txt index ff4fb63b..3af44d73 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,8 @@ -testtools -coverage -mock -flake8==2.1.0 -# No version required +# 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. +coverage>=3.6 +mock>=1.2 +flake8>=2.2.4,<=2.4.1 +os-testr>=0.4.1 charm-tools -os-testr