openstack/watcher
Code Issues Proposed changes

Invoke version_string in watcher/version.py directly

Browse Source 
There is already define version_string in version.py
So we don't need generate version in other files, just call it.

Change-Id: I7d8294860523eedad92e213ad00569829e120c39
This commit is contained in:
zhuzeyu 2017-09-27 18:01:04 +08:00 committed by Zeyu Zhu
parent fa7749ac8f
commit be69ebd8bd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ext/term.py
View File

@ -22,7 +22,7 @@ from docutils import nodes
from docutils.parsers import rst from docutils.parsers import rst
from docutils import statemachine from docutils import statemachine
from watcher.version import version_info from watcher.version import version_string
class BaseWatcherDirective(rst.Directive): class BaseWatcherDirective(rst.Directive):
@ -169,4 +169,4 @@ class WatcherFunc(BaseWatcherDirective):
def setup(app): def setup(app):
app.add_directive('watcher-term', WatcherTerm) app.add_directive('watcher-term', WatcherTerm)
app.add_directive('watcher-func', WatcherFunc) app.add_directive('watcher-func', WatcherFunc)
return {'version': version_info.version_string()} return {'version': version_string}

2
doc/source/conf.py
View File

@ -72,7 +72,7 @@ copyright = u'OpenStack Foundation'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = watcher_version.version_info.release_string() release = watcher_version.version_info.release_string()
# The short X.Y version. # The short X.Y version.
version = watcher_version.version_info.version_string() version = watcher_version.version_string
# A list of ignored prefixes for module index sorting. # A list of ignored prefixes for module index sorting.
modindex_common_prefix = ['watcher.'] modindex_common_prefix = ['watcher.']

2
releasenotes/source/conf.py
View File

@ -63,7 +63,7 @@ copyright = u'2016, Watcher developers'
# The short X.Y version. # The short X.Y version.
version = watcher_version.version_info.release_string() version = watcher_version.version_info.release_string()
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = watcher_version.version_info.version_string() release = watcher_version.version_string
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

2
watcher/version.py
View File

@ -16,4 +16,4 @@
import pbr.version import pbr.version
version_info = pbr.version.VersionInfo('python-watcher') version_info = pbr.version.VersionInfo('python-watcher')
version_string = version_info.version_string version_string = version_info.version_string()