From c4b1db00f416f0cf7362faf545f9fad8b34291c3 Mon Sep 17 00:00:00 2001 From: Adam Reznechek Date: Wed, 1 Mar 2017 13:40:18 -0600 Subject: [PATCH] Bump to match latest global requirements This bumps all reqs to match the latest upstream from global requirements master. Change-Id: Ib7c6644bc57235cf35bc66faa5d361cfc75285f1 --- requirements.txt | 10 +++++----- test-requirements.txt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 210b532..7ccfe94 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ # 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. -amqp<2.0,>=1.4.0 # LGPL -pbr>=1.8 # Apache-2.0 +amqp>=1.4.0 # LGPL +pbr>=2.0.0 # Apache-2.0 Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT @@ -12,8 +12,8 @@ six>=1.9.0 # MIT oslo.log>=3.11.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.service>=1.10.0 # Apache-2.0 -oslo.utils>=3.18.0 # Apache-2.0 +oslo.utils>=3.20.0 # Apache-2.0 oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 pypowervm -setuptools!=24.0.0,>=16.0 # PSF/ZPL -neutron-lib>=1.1.0 # Apache-2.0 +setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,>=16.0 # PSF/ZPL +neutron-lib>=1.2.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 2ef7eb6..6b7de08 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +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.11.0 +hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bashate>=0.2 # Apache-2.0 coverage>=4.0 # Apache-2.0 @@ -13,6 +13,6 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT oslotest>=1.10.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0 -sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +sphinx>=1.5.1 # BSD oslosphinx>=4.7.0 # Apache-2.0 mock>=2.0 # BSD