From e4d0e5be8d0d154eaec1ae0bb156d1c7485043b9 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Sat, 4 Jul 2015 14:12:55 +0000 Subject: [PATCH] Revert "uncap pbr and sqla requirements" This reverts commit 35832555c5ede7148bedbfec0d79351d90a93b53 The non-voting pep8 job was failing due a VersionConflict with pbr, so this shouldn't have been merged. Change-Id: I4917b92121cac524fd89575f30d72d7319cbe20c --- requirements.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index d475532..4d60d8b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,9 @@ -# 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. -pbr>=0.11,<2.0 +pbr>=0.6,!=0.7,<1.0 # never put a cap on this, *ever*, sqla versions are handled via # tox, and if SQLA is capped it will only make it so we aren't testing # against all the versions we are compatible with. -SQLAlchemy>=0.7.8,!=0.9.5 +SQLAlchemy>=0.7.8,!=0.9.5,<=1.0.99 decorator six>=1.7.0 sqlparse