Skip to content

P
pystache_custom
Commit 2f314248 by Chris Jerdonek
Options

Merge branch 'master' into 'development': after releasing v0.5.0 to PyPI 

Conflicts:
	pystache/init.py
	setup.py
parents 302c806e 0bf6ca1f
Showing with 3 additions and 3 deletions
pystache/init.py
...@@ -11,7 +11,7 @@ from pystache.template_spec import TemplateSpec ...@@ -11,7 +11,7 @@ from pystache.template_spec import TemplateSpec
__all__ = ['__version__', 'render', 'Renderer', 'TemplateSpec'] __all__ = ['__version__', 'render', 'Renderer', 'TemplateSpec']
__version__ = '0.5.0-rc' # Also change in setup.py. __version__ = '0.5.1-alpha' # Also change in setup.py.
def render(template, context=None, **kwargs): def render(template, context=None, **kwargs):
""" """
......
setup.py
...@@ -54,7 +54,7 @@ else: ...@@ -54,7 +54,7 @@ else:
# TODO: use the logging module instead of printing. # TODO: use the logging module instead of printing.
print("Using: version %s of %s" % (repr(dist.__version__), repr(dist))) print("Using: version %s of %s" % (repr(dist.__version__), repr(dist)))
VERSION = '0.5.0-rc' # Also change in pystache/init.py. VERSION = '0.5.1-alpha' # Also change in pystache/init.py.
def publish(): def publish():
...@@ -127,7 +127,7 @@ PACKAGES = [ ...@@ -127,7 +127,7 @@ PACKAGES = [
setup(name='pystache', setup(name='pystache',
version='0.5.0-rc', version=VERSION,
license='MIT', license='MIT',
description='Mustache for Python', description='Mustache for Python',
long_description=long_description, long_description=long_description,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment