[Zodb-checkins] CVS: ZODB3 - setup.py:1.50.6.10 README.txt:1.19.6.7

Jeremy Hylton jeremy at zope.com
Tue Jan 20 10:55:04 EST 2004


Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv399

Modified Files:
      Tag: Zope-2_7-branch
	setup.py README.txt 
Log Message:
the usual


=== ZODB3/setup.py 1.50.6.9 => 1.50.6.10 ===
--- ZODB3/setup.py:1.50.6.9	Tue Nov 18 15:57:48 2003
+++ ZODB3/setup.py	Tue Jan 20 10:55:03 2004
@@ -56,13 +56,6 @@
                 del kwargs["depends"]
             _Extension.__init__(self, name, sources, **kwargs)
 
-if sys.version_info < (2, 3):
-    _setup = setup
-    def setup(**kwargs):
-        if kwargs.has_key("classifiers"):
-            del kwargs["classifiers"]
-        _setup(**kwargs)
-
 def ExtClassExt(name):
     """Return an Extension object for something in ExtensionClass/src."""
     return Extension(name=name, sources=["ExtensionClass/src/%s.c" % name])
@@ -133,13 +126,11 @@
                     sources = ['ZODB/winlock.c']
                     )
 
-exts += [cPersistence, cPickleCache, TimeStamp, coptimizations, winlock]
+bsddbhelper = Extension(name = 'BDBStorage._helper',
+                        sources = ['BDBStorage/_helper.c'])
 
-# Don't build the helper unless using at least Python 2.2
-if sys.version_info >= (2, 2) or "sdist" in sys.argv:
-    bsddbhelper = Extension(name = 'BDBStorage._helper',
-                            sources = ['BDBStorage/_helper.c'])
-    exts += [bsddbhelper]
+exts += [cPersistence, cPickleCache, TimeStamp, coptimizations, winlock,
+         bsddbhelper]
 
 packages = ["BDBStorage", "BDBStorage.tests",
             "BTrees", "BTrees.tests",
@@ -156,10 +147,6 @@
             ]
 package_dir = {'BDBStorage': 'BDBStorage'}
 
-# include in a source distribution and
-if sys.version_info < (2, 3) or "sdist" in sys.argv:
-    packages.append("logging")
-
 scripts = ["Tools/fsdump.py",
            "Tools/fsrefs.py",
            "Tools/fstail.py",
@@ -223,7 +210,7 @@
 doclines = __doc__.split("\n")
 
 setup(name="ZODB3",
-      version="3.2.1b1",
+      version="3.2.1c1",
       maintainer="Zope Corporation",
       maintainer_email="zodb-dev at zope.org",
       url = "http://www.zope.org/Wikis/ZODB/FrontPage",


=== ZODB3/README.txt 1.19.6.6 => 1.19.6.7 ===
--- ZODB3/README.txt:1.19.6.6	Tue Nov 18 15:57:48 2003
+++ ZODB3/README.txt	Tue Jan 20 10:55:03 2004
@@ -1,5 +1,5 @@
-ZODB3 3.2.1 beta 1
-==================
+ZODB3 3.2.1 release candidate 1
+===============================
 
 Introduction
 ------------
@@ -31,8 +31,7 @@
 -------------
 
 ZODB 3.2.1 is known to work with Python 2.2 and 2.3.  For best
-results, we recommend using Python 2.3.2 or Python 2.2.3.  Note that
-2.2.1 does not work.
+results, we recommend using Python 2.3.2.
 
 This version of ZODB can be used with Zope, but you must replace the
 version of ZODB that comes packaged with Zope.  It should be possible,




More information about the Zodb-checkins mailing list