diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-04-11 01:50:14 -0700 |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-04-11 01:50:14 -0700 |
| commit | 2f314248b9472513a9594e2ed4d2550a16c04c13 (patch) | |
| tree | 49e2f5b299250c30c5140f1115a1aabc27aea60f | |
| parent | 302c806ecd296dafdcd449350b001040c27b86c9 (diff) | |
| parent | 0bf6ca1f6ce57d1ecfbfffd6c5e5ce9478ba7387 (diff) | |
| download | pystache-2f314248b9472513a9594e2ed4d2550a16c04c13.tar.gz | |
Merge branch 'master' into 'development': after releasing v0.5.0 to PyPI
Conflicts:
pystache/init.py
setup.py
| -rw-r--r-- | pystache/init.py | 2 | ||||
| -rw-r--r-- | setup.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pystache/init.py b/pystache/init.py index a25ca4b..ba8b709 100644 --- a/pystache/init.py +++ b/pystache/init.py @@ -11,7 +11,7 @@ from pystache.template_spec import 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): """ @@ -54,7 +54,7 @@ else: # TODO: use the logging module instead of printing. 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(): @@ -127,7 +127,7 @@ PACKAGES = [ setup(name='pystache', - version='0.5.0-rc', + version=VERSION, license='MIT', description='Mustache for Python', long_description=long_description, |