From c548c21c3faee26b0f8d60d5c3d601d533b1f2e3 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Wed, 7 Feb 2018 09:20:31 -0800
Subject: [PATCH] Fix release notes job

Recently there have been a few changes to the release notes and docs jobs.
This patch returns a blank line after the release notes ToC on the index page
and updates the release notes tox job to use the new docs requirements.txt

Change-Id: I0ab2545a670a65853a9f37564d700c945d3a5092
---
 doc/requirements.txt          | 1 +
 releasenotes/source/index.rst | 3 ++-
 test-requirements.txt         | 1 -
 tox.ini                       | 4 ++++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 7e32b9fbbc..6bfc1639f3 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -12,6 +12,7 @@ sphinx!=1.6.6,>=1.6.2 # BSD
 graphviz!=0.5.0,>=0.4 # MIT License
 openstackdocstheme>=1.18.1 # Apache-2.0
 sadisplay>=0.4.8 # BSD
+reno>=2.5.0 # Apache-2.0
 
 # This needs to be installed after above modules
 pydotplus>=2.0.2 # MIT License
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 1e61434f10..067b0ae38f 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -23,4 +23,5 @@ Octavia Release Notes
    ocata
    newton
    mitaka
-   liberty
\ No newline at end of file
+   liberty
+
diff --git a/test-requirements.txt b/test-requirements.txt
index 737df73d10..b0ac223ec4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,7 +14,6 @@ testtools>=2.2.0 # MIT
 testresources>=2.0.0 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 doc8>=0.6.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
 bandit>=1.1.0 # Apache-2.0
 tempest>=17.1.0 # Apache-2.0
 # Required for pep8 - doc8 tests
diff --git a/tox.ini b/tox.ini
index 99ce2fd289..5f91fd325a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -138,6 +138,10 @@ local-check-factory = octavia.hacking.checks.factory
 max-line-length = 79
 
 [testenv:releasenotes]
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 # If you are running the tests locally you should set the env variable