Merge "Synced requirements with global requirements"

2015-12-10 09:30:05 +00:00 · 2015-12-10 09:30:05 +00:00 · 4f27b7a457
commit 4f27b7a457
parent 67970f3a5d 64cf2dd3b1
2 changed files with 3 additions and 3 deletions
--- 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
--- a/tox.ini
+++ b/tox.ini
@ -1,6 +1,6 @@
 [tox]
 envlist = py27,pep8
-minversion = 1.6
+minversion = 1.8
 skipsdist = True

 [testenv]