From c301a0f294e92638a7f17ae94bafb79626c70480 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 21 Sep 2016 09:56:13 -0700 Subject: [PATCH] Sync with global requirements Change-Id: Id5eb0d454cfb25cac98be6d8554c89007f08a5c5 --- requirements.txt | 22 +++++++++++----------- setup.py | 2 +- test-requirements.txt | 18 +++++++++--------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8a5db577..c96dae30 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,17 +2,17 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 +pbr>=1.6 # Apache-2.0 -cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0 -futures>=3.0 # BSD -docker-py>=1.6.0,<1.8.0 # Apache-2.0 +cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0 +futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD +docker-py<1.8.0,>=1.6.0 # Apache-2.0 GitPython>=1.0.1 # BSD License (3 clause) -Jinja2>=2.8 # BSD License (3 clause) -jsonschema>=2.0.0,<3.0.0,!=2.5.0 # MIT -PyYAML>=3.1.0 # MIT -six>=1.9.0 # MIT +Jinja2>=2.8 # BSD License (3 clause) +jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT +PyYAML>=3.1.0 # MIT +six>=1.9.0 # MIT +keystoneauth1>=2.10.0 # Apache-2.0 pykube -keystoneauth1>=2.7.0 # Apache-2.0 -python-neutronclient>=4.2.0 # Apache-2.0 -python-novaclient>=2.29.0,!=2.33.0 # Apache-2.0 +python-neutronclient>=5.1.0 # Apache-2.0 +python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 056c16c2..782bb21f 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 8b7036c8..24332582 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,15 +2,15 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking<0.11,>=0.10.0 +hacking<0.12,>=0.11.0 # Apache-2.0 bashate>=0.2 # Apache-2.0 -coverage>=3.6 -fixtures>=3.0.0 # Apache-2.0/BSD -python-subunit>=0.0.18 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx>=2.5.0 # Apache-2.0 +coverage>=3.6 # Apache-2.0 +fixtures>=3.0.0 # Apache-2.0/BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +sphinx!=1.3b1,<1.3,>=1.2.1 # BSD +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT