From 64cf2dd3b1d5a67c4008947e9653ddc282688040 Mon Sep 17 00:00:00 2001 From: Timur Nurlygayanov Date: Tue, 8 Dec 2015 18:24:39 +0300 Subject: [PATCH] Synced requirements with global requirements We have issues with coverage job and during the debugging of coverage script I found the issue with incorrect requirements and incorrect tox version. After this fix coverage script will work fine. Change-Id: I4731dd735abc6ea13a084952688c3b0257f6d7e1 Closes-Bug: #1523959 --- requirements.txt | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index a06304c9..d97eaec3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,8 +8,8 @@ stevedore>=1.5.0 # Apache-2.0 alembic>=0.8.0 eventlet>=0.17.4 PasteDeploy>=1.5.0 -Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' -Routes!=2.0,>=1.12.3;python_version!='2.7' +Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7' +Routes>=1.12.3,!=2.0;python_version!='2.7' retrying!=1.3.0,>=1.2.3 # Apache-2.0 WebOb>=1.2.3 kombu>=3.0.7 diff --git a/tox.ini b/tox.ini index 5fe8c7ee..b3d034fe 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = py27,pep8 -minversion = 1.6 +minversion = 1.8 skipsdist = True [testenv]