From d5526e37bd17a4701af6db6a1b0663a9bc26ba6a Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 15 Jul 2015 17:04:11 -0400 Subject: [PATCH] Sync with global requirements Change-Id: I031b442ad3b5b4c2f7726c9a93acf3cfd5c38f55 --- requirements.txt | 15 +++++++++------ setup.py | 3 +-- test-requirements.txt | 8 ++++---- 3 files changed, 14 insertions(+), 12 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 02c103d35..907163ed8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,11 @@ -PyYAML -jinja2 -pip>=7.0 -pbr>=0.6,!=0.7,<1.0 +# 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) +pip>=6.0 +pbr<2.0,>=1.3 Babel>=1.3 -oslo.config>=1.11.0 -oslo.log>=1.2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.log>=1.6.0 # Apache-2.0 six>=1.9.0 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 736375744..d8080d05c --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 8592bde2b..3e77e7a26 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,9 +7,9 @@ hacking<0.11,>=0.10.0 coverage>=3.6 discover python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.2.0 # Apache-2.0 -oslotest>=1.2.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.7.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0