From 211cf2f084a9772d9c9c731ec12cc9012588d2ee Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:28:48 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I4d8e9524d47977e3d985f48988d1a5b1b9ae6cf0 --- requirements.txt | 14 +++++++------- setup.py | 1 - test-requirements.txt | 14 +++++++------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index a2ce9064e..f45114411 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. # See: https://bugs.launchpad.net/pbr/+bug/1384919 for why this is here... -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 # Packages needed for using this library. @@ -17,7 +17,7 @@ six>=1.9.0 enum34 # For reader/writer + interprocess locks. -fasteners>=0.7 # Apache-2.0 +fasteners>=0.7 # Apache-2.0 # Very nice graph library networkx>=1.8 @@ -26,20 +26,20 @@ networkx>=1.8 contextlib2>=0.4.0 # PSF License # Used for backend storage engine loading. -stevedore>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 # Backport for concurrent.futures which exists in 3.2+ futures>=3.0 # Used for structured input validation -jsonschema>=2.0.0,<3.0.0,!=2.5.0 +jsonschema!=2.5.0,<3.0.0,>=2.0.0 # For common utilities -oslo.utils>=1.6.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 # For lru caches and such cachetools>=1.0.0 # MIT License # For deprecation of things -debtcollector>=0.3.0 # Apache-2.0 +debtcollector>=0.3.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 736375744..056c16c2b 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 f25f6d406..62711500e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,9 +3,9 @@ # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 mock>=1.0 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 testscenarios>=0.4 # Used for testing the WBE engine. @@ -13,17 +13,17 @@ kombu>=3.0.7 # Used for testing zookeeper & backends. zake>=0.1.6 # Apache-2.0 -kazoo>=1.3.1,!=2.1 +kazoo!=2.1,>=1.3.1 # Used for testing database persistence backends. -SQLAlchemy>=0.9.7,<1.1.0 +SQLAlchemy<1.1.0,>=0.9.7 alembic>=0.7.2 psycopg2 -PyMySQL>=0.6.2 # MIT License +PyMySQL>=0.6.2 # MIT License # Used for making sure we still work with eventlet. eventlet>=0.17.3 # Docs build jobs need these packages. -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0