Merge branch 'development' to 'master': staging version 0.5.0-rc.

1 files changed, 67 insertions, 17 deletions

diff --git a/setup.py b/setup.py
index d625922..65d8d6f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,44 +1,94 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """
-Run the following to publish to PyPI:
+This script supports installing and distributing pystache.
+
+Below are instructions to pystache maintainers on how to push a new
+version of pystache to PyPI--
+
+    http://pypi.python.org/pypi/pystache
+
+Create a PyPI user account.  The user account will need permissions to push
+to PyPI.  A current "Package Index Owner" of pystache can grant you those
+permissions.
+
+When you have permissions, run the following (after preparing the release,
+bumping the version number in setup.py, etc):
+
+    > python setup.py publish
+
+If you get an error like the following--
+
+    Upload failed (401): You must be identified to edit package information
+
+then add a file called .pyirc to your home directory with the following
+contents:
+
+    [server-login]
+    username: <PyPI username>
+    password: <PyPI password>
+
+as described here, for example:
 
-> python setup.py publish
+    http://docs.python.org/release/2.5.2/dist/pypirc.html
 
 """
 
 import os
 import sys
 
+
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
+
 def publish():
-    """Publish to Pypi"""
-    os.system("python setup.py sdist upload")
+    """
+    Publish this package to PyPI (aka "the Cheeseshop").
+
+    """
+    os.system('python setup.py sdist upload')
+
+
+def make_long_description():
+    """
+    Return the long description for the package.
 
-if sys.argv[-1] == "publish":
+    """
+    long_description = open('README.rst').read() + '\n\n' + open('HISTORY.rst').read()
+
+    return long_description
+
+
+if sys.argv[-1] == 'publish':
     publish()
     sys.exit()
 
+long_description = make_long_description()
+
 setup(name='pystache',
-      version='0.4.1',
+      version='0.5.0-rc',
       description='Mustache for Python',
-      long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
+      long_description=long_description,
       author='Chris Wanstrath',
       author_email='chris@ozmm.org',
+      maintainer='Chris Jerdonek',
       url='http://github.com/defunkt/pystache',
       packages=['pystache'],
       license='MIT',
+      entry_points = {
+        'console_scripts': ['pystache=pystache.commands:main'],
+      },
       classifiers = (
-        "Development Status :: 4 - Beta",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2.4",
-        "Programming Language :: Python :: 2.5",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        )
-     )
-
+        'Development Status :: 4 - Beta',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.4',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+      )
+)