From d53a948613f7e372e225798f6c8cbd6b8cae478a Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 22 Jul 2015 04:54:15 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ied94f58eb41fa8a0b35018cafbde879a8cbbf17e --- requirements.txt | 4 ++-- setup.py | 3 +-- test-requirements.txt | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index f4c0231..76948ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ # 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. -pbr>=0.11,<2.0 +pbr<2.0,>=1.3 pep8==1.5.7 pyflakes==0.8.1 -flake8==2.4.0 +flake8<=2.4.1,>=2.2.4 mccabe==0.2.1 # MIT License six>=1.9.0 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 7363757..d8080d0 --- 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"); @@ -26,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 19a0cb9..1395262 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,18 +3,18 @@ # process, which may cause wedges in the gate later. coverage>=3.6 discover -fixtures>=0.3.14 -mock>=1.0 +fixtures>=1.3.1 +mock>=1.2 python-subunit>=0.0.18 -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 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 # hacking doesn't use this anywhere, but nova imports this in nova/__init__.py # since eventlet is such a common universal import, add it to the hacking test # virtualenv, so importing things like 'nova.hacking.checks.factory' will just # work. # See https://bugs.launchpad.net/hacking/+bug/1403270 -eventlet>=0.17.3 +eventlet>=0.17.4