From a9f6a2ed7644ee1130121ea2236c05ab7054a1e2 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:27:02 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I408cd890c231afb98e2f34930a7beaa0b93c7df5 --- requirements.txt | 12 ++++++------ setup.py | 1 - test-requirements.txt | 14 +++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4d9d1e1e..34352950 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,16 +2,16 @@ # 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<2.0,>=0.11 alembic>=0.7.2 Babel>=1.3 iso8601>=0.1.9 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 -SQLAlchemy>=0.9.7,<1.1.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +SQLAlchemy<1.1.0,>=0.9.7 sqlalchemy-migrate>=0.9.6 -stevedore>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 six>=1.9.0 testresources>=0.2.4 testscenarios>=0.4 diff --git a/setup.py b/setup.py index 73637574..056c16c2 100644 --- 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"); diff --git a/test-requirements.txt b/test-requirements.txt index 320463fc..1baa6644 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,18 +2,18 @@ # 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 coverage>=3.6 discover -doc8 # Apache-2.0 +doc8 # Apache-2.0 fixtures>=0.3.14 -PyMySQL>=0.6.2 # MIT License +PyMySQL>=0.6.2 # MIT License psycopg2 python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 tempest-lib>=0.5.0