Gaaaa. Some changes meant for trunk didn't get checked in until I

switched to the 3.11.0a1 tag.

setup.py

@@ -11,16 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Zope Object Database: object database and persistence
-
-The Zope Object Database provides an object-oriented database for
-Python that provides a high-degree of transparency. Applications can
-take advantage of object database features with few, if any, changes
-to application logic.  ZODB includes features such as a plugable storage
-interface, rich transaction support, and undo.
-"""
-
-VERSION = "3.11.0dev"
+VERSION = "3.11.0a1"
 
 from ez_setup import use_setuptools
 use_setuptools()
@@ -37,85 +28,37 @@
 Intended Audience :: Developers
 License :: OSI Approved :: Zope Public License
 Programming Language :: Python
+Programming Language :: Python :: 2.6
+Programming Language :: Python :: 2.7
 Topic :: Database
 Topic :: Software Development :: Libraries :: Python Modules
 Operating System :: Microsoft :: Windows
 Operating System :: Unix
 Framework :: ZODB
 """
 
-
-def alltests():
-    import logging
-    import pkg_resources
-    import unittest
-
-    class NullHandler(logging.Handler):
-        level = 50
-
-        def emit(self, record):
-            pass
-
-    logging.getLogger().addHandler(NullHandler())
-
-    suite = unittest.TestSuite()
-    base = pkg_resources.working_set.find(
-        pkg_resources.Requirement.parse('ZODB')).location
-    for dirpath, dirnames, filenames in os.walk(base):
-        if os.path.basename(dirpath) == 'tests':
-            for filename in filenames:
-                if filename.endswith('.py') and filename.startswith('test'):
-                    mod = __import__(
-                        _modname(dirpath, base, os.path.splitext(filename)[0]),
-                        {}, {}, ['*'])
-                    suite.addTest(mod.test_suite())
-        elif 'tests.py' in filenames:
-            continue
-            mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*'])
-            suite.addTest(mod.test_suite())
-    return suite
-
-doclines = __doc__.split("\n")
-
-def read_file(*path):
-    base_dir = os.path.dirname(__file__)
-    file_path = (base_dir, ) + tuple(path)
-    return file(os.path.join(*file_path)).read()
-
-long_description = str(
-    ("\n".join(doclines[2:]) + "\n\n" +
-     ".. contents::\n\n" +
-     read_file("README.txt")  + "\n\n" +
-     read_file("CHANGES.txt")
-    ).decode('latin-1').replace(u'L\xf6wis', '|Lowis|')
-    )+ '''\n\n.. |Lowis| unicode:: L \\xf6 wis\n'''
+long_description = (
+    open('README.txt').read()
+    + '\n' +
+    open('CHANGES.txt').read()
+    )
 
 tests_require = ['ZEO [test]', 'ZODB [test]', 'persistent [test]'],
 
-setup(name="ZODB",
+setup(name="ZODB3",
       version=VERSION,
       maintainer="Zope Foundation and Contributors",
       maintainer_email="zodb-dev@zope.org",
       license = "ZPL 2.1",
       platforms = ["any"],
-      description = doclines[0],
-      classifiers = filter(None, classifiers.split("\n")),
+      description = long_description.split('\n', 2)[1],
       long_description = long_description,
-      test_suite="__main__.alltests", # to support "setup.py test"
-      tests_require = tests_require,
-      extras_require = dict(test=tests_require),
-      install_requires = ['ZEO', 'ZODB', 'persistent', 'transaction'],
+      classifiers = filter(None, classifiers.split("\n")),
+      install_requires = [
+          'ZEO >=4.0.0dev, <4.1dev',
+          'ZODB >=4.0.0dev, <4.1dev',
+          'persistent >=4.0.0dev, <4.1dev',
+          'BTrees >=4.0.0dev, <4.1dev',
+          'transaction'],
       zip_safe = False,
-      entry_points = """
-      [console_scripts]
-      fsdump = ZODB.FileStorage.fsdump:main
-      fsoids = ZODB.scripts.fsoids:main
-      fsrefs = ZODB.scripts.fsrefs:main
-      fstail = ZODB.scripts.fstail:Main
-      repozo = ZODB.scripts.repozo:main
-      zeopack = ZEO.scripts.zeopack:main
-      runzeo = ZEO.runzeo:main
-      zeopasswd = ZEO.zeopasswd:main
-      zeoctl = ZEO.zeoctl:main
-      """,
       )