- Updated test dependencies so tests run with current z3c.form vers…

…ions.

- Added doctests to ``long_description`` so they show up on PyPI.

CHANGES.txt

@@ -1,33 +1,41 @@
-=======
-CHANGES
-=======
-
-0.5.3dev (unreleased)
----------------------
-
-- ... 
-
-  there is still an issue in README.txt sample, the samples are using
-  nested <form> tags. Fix the sample and use real subform templates.
-
-- use registerType from zope.browserpage instead from zope.app.pagetemplate
-
-- adjust test output
-
-
-0.5.2 (2009-10-19)
-------------------
-
-- Fix my bug introduced in 0.5.1
-
-
-0.5.1 (2009-10-19)
-------------------
-
-- Added ``allowEdit`` property to ``SubFormTable``
-
-
-0.5.0 (2009-02-22)
-------------------
-
-- Initial Release
+========
+ Issues
+========
+
+- There is still an issue in README.txt sample, the samples are using nested
+  ``<form>`` tags. Fix the sample and use real subform templates.
+
+
+=======
+CHANGES
+=======
+
+0.5.3dev (unreleased)
+---------------------
+
+- Using ``registerType`` from `zope.browserpage` instead from
+  `zope.app.pagetemplate`
+
+- Adjusted test output.
+
+- Updated test dependencies so tests run with current `z3c.form` versions.
+
+- Added doctests to ``long_description`` so they show up on PyPI.
+
+
+0.5.2 (2009-10-19)
+------------------
+
+- Fixed my bug introduced in 0.5.1.
+
+
+0.5.1 (2009-10-19)
+------------------
+
+- Added ``allowEdit`` property to ``SubFormTable``
+
+
+0.5.0 (2009-02-22)
+------------------
+
+- Initial release.

setup.py

@@ -19,7 +19,8 @@
 from setuptools import setup, find_packages
 
 def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+    content = open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+    return content + '\n\n'
 
 setup (
     name='z3c.tabular',
@@ -28,9 +29,10 @@ def read(*rnames):
     author_email = "zope3-dev@zope.org",
     description = "Table with form support based on z3c.form and z3c.table for Zope3",
     long_description=(
-        read('README.txt')
-        + '\n\n' +
-        read('CHANGES.txt')
+        read('README.txt') +
+        '.. contents::\n\n' +
+        read('CHANGES.txt') +
+        read('src', 'z3c', 'tabular', 'README.txt')
         ),
     license = "ZPL 2.1",
     keywords = "zope3 z3c tabular data form table contents",
@@ -51,11 +53,11 @@ def read(*rnames):
     namespace_packages = ['z3c'],
     extras_require = dict(
         test = [
+            'z3c.form[test]',
             'z3c.macro',
-            'z3c.table',
             'z3c.testing',
-            'zope.app.testing',
             'zope.app.publisher',
+            'zope.app.testing',
             'zope.browserpage',
             'zope.publisher',
             'zope.testing',