From 25eace34c9549e173bf8b43b58aae233177bff73 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:26:53 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ie9daa0246fab7df998f5a5e17b3aea762c2a45e9 --- requirements.txt | 6 +++--- setup.py | 1 - test-requirements.txt | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9f552de0..5a30d63e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ Babel>=1.3 dogpile.cache>=0.5.3 six>=1.9.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 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 ff995cbb..489c0faf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,9 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 -oslotest>=1.5.1 # Apache-2.0 -oslosphinx>=2.5.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslotest>=1.5.1 # Apache-2.0 +oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 testtools>=1.4.0 # Optional dogpile backend: MongoDB