From bf6489704f81763ddbc3bd0b980e86aa3a11f3b2 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 23 Dec 2015 00:36:03 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I88c641fba64b0c14aea9971b4ce1e34c47754e33 --- requirements.txt | 4 ++-- setup.py | 5 ++--- test-requirements.txt | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 19d3ae53..1825dfe3 100644 --- a/requirements.txt +++ b/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. -pbr>=0.6,!=0.7,<1.0 -requests>=2.2.0,!=2.4.0 +pbr>=1.6 +requests!=2.9.0,>=2.8.1 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 55037e6c..782bb21f --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# Copyright (c) 2015 Rackspace US, Inc. +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,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 4e7c4f06..fbb24592 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,10 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 # this is required for the docs build jobs -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 reno>=0.1.1 # Apache2 -oslosphinx>=2.5.0 # Apache-2.0 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0