From 921e531adfa58a3ac470caa01842943d93b1385d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 15 Jun 2016 09:15:32 +0200 Subject: [PATCH] Fix releasenotes generation Fix several problems, tox -e releasenotes did not run at all. Fixes: * Fix version import so that release note building works. * There's no stable/mitaka branch for watcher, so remove the mitaka file, otherwise release notes build will fail. * Add _static directory with empty placeholder for sphinx to run. Change-Id: Ia4dd2f7a7743dfd7f7022be04552c401ade9953f --- releasenotes/source/_static/.placeholder | 0 releasenotes/source/conf.py | 1 + releasenotes/source/index.rst | 11 +++-------- releasenotes/source/mitaka.rst | 6 ------ 4 files changed, 4 insertions(+), 14 deletions(-) create mode 100644 releasenotes/source/_static/.placeholder delete mode 100644 releasenotes/source/mitaka.rst diff --git a/releasenotes/source/_static/.placeholder b/releasenotes/source/_static/.placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 504c6c0a1..2d87f2a52 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -12,6 +12,7 @@ # serve to show the default. import sys, os +from watcher import version as watcher_version # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index da61992b0..be1db65c0 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -1,15 +1,10 @@ -.. watcher documentation master file, created by - sphinx-quickstart on Fri Jun 3 11:37:52 2016. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to watcher's documentation! -=================================== +Welcome to watcher's Release Notes documentation! +================================================= Contents: .. toctree:: :maxdepth: 1 - mitaka + unreleased.rst diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst deleted file mode 100644 index 0dc585c85..000000000 --- a/releasenotes/source/mitaka.rst +++ /dev/null @@ -1,6 +0,0 @@ -============================= - Mitaka Series Release Notes -============================= - -.. release-notes:: - :branch: origin/stable/mitaka