Mercurial > piecrust2
diff piecrust/data/builder.py @ 69:cb1ed436642c
Always use version generated by `setup.py`. Better version generation.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Sat, 30 Aug 2014 08:35:26 -0700 |
parents | 99dea56238af |
children | f9f67086415c |
line wrap: on
line diff
--- a/piecrust/data/builder.py Fri Aug 29 16:42:15 2014 -0700 +++ b/piecrust/data/builder.py Sat Aug 30 08:35:26 2014 -0700 @@ -1,5 +1,6 @@ import time import logging +from piecrust import APP_VERSION from piecrust.configuration import merge_dicts from piecrust.data.assetor import Assetor from piecrust.data.debug import build_debug_info @@ -75,22 +76,16 @@ return data -try: - from piecrust.__version__ import VERSION -except ImportError: - from piecrust import APP_VERSION as VERSION - - class PieCrustData(object): debug_render = ['version', 'url', 'branding', 'debug_info'] debug_render_invoke = ['version', 'url', 'branding', 'debug_info'] debug_render_redirect = {'debug_info': '_debugRenderDebugInfo'} def __init__(self): - self.version = VERSION + self.version = APP_VERSION self.url = 'http://bolt80.com/piecrust/' self.branding = 'Baked with <em><a href="%s">PieCrust</a> %s</em>.' % ( - 'http://bolt80.com/piecrust/', VERSION) + 'http://bolt80.com/piecrust/', APP_VERSION) self._page = None self._data = None