From ad1744671d2a4a4651c36c5ec1d4ad4b6371ba16 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Fri, 11 Mar 2016 13:45:45 +1100 Subject: [PATCH] Add updates from global-requirements Change-Id: I5766cb59650a9fa6fb8e2326c7986316d37bcc1c --- requirements.txt | 7 +++++-- setup.py | 2 +- test-requirements.txt | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index a92ad975..c1b72437 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ -pytz -PyYAML>=3.1.0,<=3.10 +# 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. +pytz>=2013.6 # MIT +PyYAML>=3.1.0 # MIT diff --git a/setup.py b/setup.py index d8080d05..782bb21f 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 d29aa208..cfa74412 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,5 +2,5 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # needed for doc build -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