openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix sphinx-build to not depend on diskimage-builder"

This commit is contained in:
Jenkins 2016-06-28 08:34:05 +00:00 committed by Gerrit Code Review
parent 9dd267239d 8b3419b0a9
commit 3d85df1518
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/conf.py
View File

@ -27,11 +27,13 @@ copyright = u'2015-2016, Various Authors'
# built documents.
#
from diskimage_builder import version as dib_version
import pbr.version
version_info = pbr.version.VersionInfo('diskimage-builder')
# The short X.Y version.
release = dib_version.version_info.release_string()
release = version_info.release_string()
# The full version, including alpha/beta/rc tags.
version = dib_version.version_info.version_string()
version = version_info.version_string()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

1
requirements.txt
View File

@ -7,3 +7,4 @@ pbr>=1.6 # Apache-2.0
PyYAML>=3.1.0 # MIT
flake8<2.6.0,>=2.5.4 # MIT
six>=1.9.0 # MIT
oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0