From c52cf302c1ef290ec760ad914d55f78ef0c9242d Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 20 Jan 2016 16:25:42 -0500 Subject: [PATCH] Sync from global requirements Change-Id: Ice48f30a818ee2d745078e17a58be021090e529a --- requirements.txt | 12 ++++++------ setup.py | 2 +- test-requirements.txt | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index c9510c747..dfdfd1cfe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ # 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 -Jinja2>=2.6 # BSD License (3 clause) -pbr<2.0,>=1.6 -Babel>=1.3 +PyYAML>=3.1.0 # MIT +Jinja2>=2.8 # BSD License (3 clause) +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD oslo.config>=3.2.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 -six>=1.9.0 -PyMySQL>=0.6.2 # MIT License +six>=1.9.0 # MIT +PyMySQL>=0.6.2 # MIT License diff --git a/setup.py b/setup.py index d8080d05c..782bb21f0 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index e5d4165a1..f8d957bc9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,13 +4,13 @@ hacking<0.11,>=0.10.0 -coverage>=3.6 -discover -python-subunit>=0.0.18 +coverage>=3.6 # Apache-2.0 +discover # BSD +python-subunit>=0.0.18 # Apache-2.0/BSD reno>=0.1.1 # Apache2 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # 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