Merge "Do not list neutron in requirements.txt"

requirements.txt

@@ -35,4 +35,7 @@ oslo.utils>=1.0.0                       # Apache-2.0
 
 python-novaclient>=2.18.0
 
--e git+https://git.openstack.org/openstack/neutron#egg=neutron
+# This project does depend on neutron as a library, but the
+# openstack tooling does not play nicely with projects that
+# are not publicly available in pypi.
+# -e git+https://git.openstack.org/openstack/neutron#egg=neutron

tox.ini

@@ -9,8 +9,10 @@ skipsdist = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 usedevelop = True
-install_command = pip install -r requirements.txt -U {opts} {packages}
-deps = -r{toxinidir}/test-requirements.txt
+install_command = pip install -U {opts} {packages}
+deps = -egit+https://git.openstack.org/openstack/neutron#egg=neutron
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh
 commands =
   sh tools/pretty_tox.sh '{posargs}'