[Checkins] SVN: grokproject/trunk/ update pypi page descriptions

[Jan-Wijbrand Kolman]

Log message for revision 117833:
  update pypi page descriptions

Changed:
  U   grokproject/trunk/CHANGES.txt
  U   grokproject/trunk/setup.py

-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt	2010-10-25 06:44:08 UTC (rev 117832)
+++ grokproject/trunk/CHANGES.txt	2010-10-25 06:44:20 UTC (rev 117833)
@@ -4,6 +4,15 @@
 2.1 (unreleased)
 ------------------
 
+**NOTE: As a result of these changes, ``grokproject`` will no longer
+support building projects based on Grok versions earlier than 1.2!**
+
+- Remove the ``--grokversion`` and ``--grok-release-url`` commandline options,
+  in favor of the ``-version-url`` option. This URL should point to a buildout
+  ``*.cfg`` file containing version "pins" for all the packages involved. The
+  default URL is still looked up by way of
+  http://grok.zope.org/releaseinfo/current.
+
 - The newly created project will use the test layer and test browser from
   ``zope.app.wsgi.testlayer``.
 
@@ -12,12 +21,9 @@
   bootstrapping from grokproject and prevents potential zc.buildout version
   conflicts.
 
-- Update to use z3c.recipe.scripts as part of the upgrade to zc.buildout-
-  1.5.2.
+- Update to use z3c.recipe.scripts instead of zc.recipe.egg as part of the
+  upgrade to zc.buildout-1.5.2.
 
-**NOTE: As a result of these changes, ``grokproject`` will no longer
-support building projects based on Grok versions earlier than 1.2!**
-
 2.0.1 (2010-05-30)
 ------------------
 

Modified: grokproject/trunk/setup.py
===================================================================
--- grokproject/trunk/setup.py	2010-10-25 06:44:08 UTC (rev 117832)
+++ grokproject/trunk/setup.py	2010-10-25 06:44:20 UTC (rev 117833)
@@ -1,38 +1,38 @@
 from setuptools import setup, find_packages
 
-description = '''
-===========
-Grokproject
-===========
+_description = (
+    "Script that creates a Grok project directory, installs Grok, the Grok "
+    "Toolkit and the Zope Toolkit and sets up a complete skeleton for "
+    "a new Grok web application."
+    )
 
-Grokproject provides an easy way to get started with a `Grok
-<http://pypi.python.org/pypi/grok>`_ web application
-
-.. contents::
-
-Description
-===========
-'''
 long_description = (
-    description +
+    "===========\n"
+    "Grokproject\n"
+    "===========\n"
+    "\n"
+    "%s\n"
+    "\n"
+    ".. contents::\n"
+    "\n"
+    "Description\n"
+    "===========\n"
+    "\n" +
     open('README.txt').read() +
     '\n' +
     open('CHANGES.txt').read()
-    )
+    ) % _description
 
 setup(
     name='grokproject',
     version='2.0.2dev',
     author='Grok Team',
     author_email='grok-dev at zope.org',
-    url='https://launchpad.net/grok',
+    url='http://grok.zope.org',
     download_url='http://pypi.python.org/pypi/grokproject',
-    description="""
-    Script that sets up a grok project directory, installs Zope 3 and grok and
-    creates a template for a grok application.""",
+    description=_description,
     long_description=long_description,
     license='ZPL',
-
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
@@ -40,6 +40,6 @@
     extras_require=dict(tests=['zope.testing',]),
     test_suite='tests.test_suite',
     entry_points={
-    'console_scripts': ['grokproject = grokproject:main'],
-    'paste.paster_create_template': ['grok = grokproject:GrokProject']},
+        'console_scripts': ['grokproject = grokproject:main'],
+        'paste.paster_create_template': ['grok = grokproject:GrokProject']},
     )