From dd9e1c0ca4ce7ca3cfc089865c43a17326c3d8b8 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:27:16 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I5f4fbf5d2af97069483a74348e90eb20eb149697 --- requirements.txt | 4 ++-- setup.py | 1 - test-requirements.txt | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index ae17fdb..6b30b56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,12 +7,12 @@ # adding a new feature to oslo.serialization means adding a new dependency, # that is a likely indicator that the feature belongs somewhere else. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 Babel>=1.3 six>=1.9.0 msgpack-python>=0.4.0 # Only for timeutils in openstack.common - once we're using the # library version this can be removed. iso8601>=0.1.9 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 pytz>=2013.6 diff --git a/setup.py b/setup.py index 7363757..056c16c 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 ee6d133..d25ed6f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,15 +1,15 @@ # 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. -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 mock>=1.0 netaddr>=0.7.12 # this is required for the docs build jobs -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 -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 simplejson>=2.2.0 -oslo.i18n>=1.5.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 coverage>=3.6