Update upper-constraints consumption

In order to deal with horizon going into the upper-constraints file so
that horizon plugins can consume it normally, we need to align the
constraints invocation in horizon's tox.ini. This means putting the -C
argument into the dependencies list rather than the pip install line so
that it doesn't get appended to tox installing horizon itself.

While we're in here, move nosehtmloutput into test-requirements so that
we don't need to do .[test] which also doesn't work with constraints.

Needed-By: https://review.openstack.org/550475
Change-Id: I736f79010c2d34e25d41d967a38128c2263ed13f

setup.cfg

@@ -22,10 +22,6 @@ classifier =
     Programming Language :: Python :: 3.5
     Topic :: Internet :: WWW/HTTP
 
-[extras]
-test =
-  nosehtmloutput>=0.0.3 # Apache-2.0
-
 [global]
 setup-hooks =
     openstack_dashboard.hooks.setup_hook

test-requirements.txt

@@ -19,6 +19,7 @@ nodeenv>=0.9.4 # BSD
 nose>=1.3.7 # LGPL
 nose-exclude>=0.3.0 # LGPL
 nosexcover>=1.0.10 # BSD
+nosehtmloutput>=0.0.3 # Apache-2.0
 openstack.nose-plugin>=0.7 # Apache-2.0
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0

tox.ini

@@ -4,7 +4,7 @@ minversion = 2.3.2
 skipsdist = True
 
 [testenv]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install {opts} {packages}
 usedevelop = True
 setenv =
   VIRTUAL_ENV={envdir}
@@ -14,9 +14,10 @@ setenv =
 whitelist_externals =
   bash
   find
-deps = .[test]
-  -r{toxinidir}/requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
 commands =
   horizon: {envpython} {toxinidir}/manage.py test --settings=horizon.test.settings {posargs}
   py27: {[unit_tests]commands}