tox: Trivial reordering

We also add upper-constraints to the releasenotes target.

Change-Id: I468ab7ec50d8197f905aa98017909ca8997a6dcc
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

tox.ini

@@ -12,13 +12,17 @@ deps =
 commands =
   stestr run {posargs}
 
-[testenv:docs]
+[testenv:cover]
 deps =
   {[testenv]deps}
-  -r{toxinidir}/doc/requirements.txt
+  coverage>=3.6
+setenv =
+   PYTHON=coverage run --source taskflow --parallel-mode
 commands =
-  sphinx-build -E -W -b html doc/source doc/build/html
-  doc8 doc/source
+   stestr run {posargs}
+   coverage combine
+   coverage html -d cover
+   coverage xml -o cover/coverage.xml
 
 [testenv:functional]
 commands =
@@ -37,6 +41,24 @@ commands = {toxinidir}/tools/update_states.sh
 allowlist_externals =
   {toxinidir}/tools/update_states.sh
 
+[testenv:venv]
+commands = {posargs}
+
+[testenv:docs]
+deps =
+  {[testenv]deps}
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -E -W -b html doc/source doc/build/html
+  doc8 doc/source
+
+[testenv:releasenotes]
+deps =
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+
 [testenv:pep8]
 skip_install = true
 deps =
@@ -50,21 +72,6 @@ deps =
   pylint==3.2.0 # GPLv2
 commands = pylint taskflow
 
-[testenv:cover]
-deps =
-  {[testenv]deps}
-  coverage>=3.6
-setenv =
-   PYTHON=coverage run --source taskflow --parallel-mode
-commands =
-   stestr run {posargs}
-   coverage combine
-   coverage html -d cover
-   coverage xml -o cover/coverage.xml
-
-[testenv:venv]
-commands = {posargs}
-
 [flake8]
 builtins = _
 exclude = .venv,.tox,dist,doc,*egg,.git,build,tools
@@ -87,10 +94,6 @@ import_exceptions =
 # end-string."
 ignore-path = doc/*/target,doc/*/build*
 
-[testenv:releasenotes]
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if
 # system dependencies are missing, since it's used to tell you what system
@@ -101,4 +104,3 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 deps = bindep
 commands = bindep test
 usedevelop = False
-