From 0937f0d3a22fcbe92efeff464d160e565a984951 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Sat, 11 Jul 2015 11:14:02 +1200
Subject: [PATCH] Place an accurate lower bound on pbr
Without this version, markers will fail to install in a growing number
of projects.
Change global-requirements to prevent
pip -r requirements.txt; pip install .
failing with an already installed and too old for setup_requires pbr.
Change update.py to signal to setuptools the minimum version required,
giving clearer error messages in the case of downgrades during
devstack.
Change-Id: I074274b470a7a4f2c95211677b135038ab2c942c
---
global-requirements.txt | 2 +-
openstack_requirements/cmds/update.py | 2 +-
setup.py | 2 +-
upper-constraints.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/global-requirements.txt b/global-requirements.txt
index a687185da2..9321ab0e8f 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -102,7 +102,7 @@ Parsley
passlib
Paste
PasteDeploy>=1.5.0
-pbr>=0.11,<2.0
+pbr>=1.3,<2.0
pecan>=0.8.0
pexpect>=3.1,!=3.3 # ISC License
Pillow>=2.4.0 # MIT
diff --git a/openstack_requirements/cmds/update.py b/openstack_requirements/cmds/update.py
index 10bba91c87..856532da9a 100644
--- a/openstack_requirements/cmds/update.py
+++ b/openstack_requirements/cmds/update.py
@@ -62,7 +62,7 @@ except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr'],
+ setup_requires=['pbr>=1.3'],
pbr=True)
"""
diff --git a/setup.py b/setup.py
index 056c16c2b8..d8080d05c8 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr'],
+ setup_requires=['pbr>=1.3'],
pbr=True)
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 2e55fc5c47..e266de32ae 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -196,7 +196,7 @@ packaging===15.2
paramiko===1.15.2
passlib===1.6.2
pathlib===1.0.1;python_version=='2.7'
-pbr===1.2.0
+pbr===1.3.0
pecan===0.9.0
pexpect===3.2
ply===3.6