From b5b1936338606f8e7ec554d766a865041e32b435 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@vmware.com>
Date: Tue, 23 Jun 2015 03:24:02 -0700
Subject: [PATCH] Sort our neutron requirements

This will be moved to the tox.ini instead of the in the test-req.
This is due to the fact that the requirements validations will fail
if the neutron is part of the test-requirements.

Change-Id: I5b5141b8740937059beeb1b66a1064be788337d8
---
 test-requirements.txt | 2 --
 tox.ini               | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 70298295f9..ff0669bc52 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
--e git://git.openstack.org/openstack/neutron.git#egg=neutron
-
 hacking>=0.9.2,<0.10
 
 coverage>=3.6
diff --git a/tox.ini b/tox.ini
index ce205a3364..f5f91687b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 usedevelop = True
 install_command = pip install -U {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+deps = -egit+https://git.openstack.org/openstack/neutron#egg=neutron
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh
 commands =