From 9e18831b399996a683185b6b2ecb9f866504e6d2 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Sat, 26 Dec 2015 21:00:14 +0900 Subject: [PATCH] Updated from global requirements The commit is generated by the following command in requirements repository: python update.py ../i18n The automatic job is now under review in https://review.openstack.org/256976 Change-Id: I1ff2a375c9b251a218e512687e2c77150634e7cf --- setup.py | 4 ++-- test-requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 62f38a5..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index f301cdd..3d0f6b0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,5 +2,5 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -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!=3.4.0,>=2.5.0 # Apache-2.0