summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2017-11-17 10:08:48 +0100
committerAndreas Jaeger <aj@suse.com>2017-11-17 11:38:49 +0100
commitd27d5a705326daeef9005942930c8b059e42f9fc (patch)
tree370ac7acc334da06d5eb33e379381dd2c42855c3
parent42b743e7dd60c8a328b7380140ee8012256f1b7a (diff)
downloadceilometermiddleware-d27d5a705326daeef9005942930c8b059e42f9fc.tar.gz
Remove setting of version/release from releasenotes
Release notes are version independent, so remove version/release values. We've found that projects now require the service package to be installed in order to build release notes, and this is entirely due to the current convention of pulling in the version information. Release notes should not need installation in order to build, so this unnecessary version setting needs to be removed. Also, use openstackdocstheme for releasenotes. This is needed for new release notes publishing, see I56909152975f731a9d2c21b2825b972195e48ee8 and the discussion starting at http://lists.openstack.org/pipermail/openstack-dev/2017-November/124480.html . Change-Id: I1357eda2330c095bdc1e3a3697faabfbca4b6a8e
-rw-r--r--releasenotes/source/conf.py27
-rw-r--r--test-requirements.txt1
2 files changed, 12 insertions, 16 deletions
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 8292e3a..667a130 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -21,8 +21,6 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import pbr.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
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -37,7 +35,7 @@ import pbr.version
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
- 'oslosphinx',
+ 'openstackdocstheme',
'reno.sphinxext',
]
@@ -62,20 +60,17 @@ description = 'Ceilometer Middleware publishes traffic measures for Swift.'
title = 'Ceilometer Middleware Release Notes'
target_name = 'ceilometermiddleware'
-# The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = 'https://git.openstack.org/cgit/openstack/' + \
- target_name
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version_info = pbr.version.VersionInfo(target_name)
+# Release notes do not need a version number in the title, they
+# cover multiple releases.
# The full version, including alpha/beta/rc tags.
-release = version_info.version_string_with_vcs()
+release = ''
# The short X.Y version.
-version = version_info.canonical_version_string()
+version = ''
+
+# openstackdocstheme options
+repository_name = 'openstack/ceilometermiddleware'
+bug_project = 'ceilometermiddleware'
+bug_tag = ''
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -120,7 +115,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'default'
+html_theme = 'openstackdocs'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
index 89ce1d1..18a9dda 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@ coverage>=3.6 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+openstackdocstheme>=1.17.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
mock>=1.2 # BSD