diff --git a/doc/source/conf.py b/doc/source/conf.py index 9eb5ca2f..88cd7682 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -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. diff --git a/requirements.txt b/requirements.txt index dbfbdb01..f2333c0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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