[Zodb-checkins] SVN: ZODB/trunk/ merged the tseaver-persistent_as_egg branch to complete the persistent separation

[jim]

Log message for revision 128002:
  merged the tseaver-persistent_as_egg branch to complete the persistent separation

Changed:
  U   ZODB/trunk/buildout.cfg
  U   ZODB/trunk/setup.py

-=-
Modified: ZODB/trunk/buildout.cfg
===================================================================
--- ZODB/trunk/buildout.cfg	2012-10-14 13:20:31 UTC (rev 128001)
+++ ZODB/trunk/buildout.cfg	2012-10-14 19:42:25 UTC (rev 128002)
@@ -7,11 +7,11 @@
 
 [versions]
 zc.recipe.testrunner = 1.3.0
-persistent = 4.0.0
 
 [test]
 recipe = zc.recipe.testrunner
 eggs =
+    persistent
     ZODB3 [test]
 initialization =
   import os, tempfile

Modified: ZODB/trunk/setup.py
===================================================================
--- ZODB/trunk/setup.py	2012-10-14 13:20:31 UTC (rev 128001)
+++ ZODB/trunk/setup.py	2012-10-14 19:42:25 UTC (rev 128002)
@@ -189,6 +189,10 @@
       test_suite="__main__.alltests", # to support "setup.py test"
       tests_require = ['zope.testing', manuel_version],
       extras_require = dict(test=['zope.testing', manuel_version]),
+      # XXX: We don't really want to install these headers;  we would
+      #      prefer just including them so that folks can build from an sdist.
+      headers = ['include/persistent/cPersistence.h',
+                 'include/persistent/ring.h'],
       install_requires = [
         transaction_version,
         'persistent',