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 /setup.py | |
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
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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, |