[Zodb-checkins] CVS: ZODB3 - setup.py:1.50.4.6 MANIFEST.in:1.10.4.1
MANIFEST:1.16.4.2
Jeremy Hylton
jeremy at zope.com
Wed Jul 16 16:45:45 EDT 2003
Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv7385
Modified Files:
Tag: zodb33-devel-branch
setup.py MANIFEST.in MANIFEST
Log Message:
Remove ExtensionClass files from setup and manifest.
Fix a few other bugs in MANIFEST.in that prevented cPersistence.h from
being copied.
=== ZODB3/setup.py 1.50.4.5 => 1.50.4.6 ===
--- ZODB3/setup.py:1.50.4.5 Thu Jul 10 09:02:06 2003
+++ ZODB3/setup.py Wed Jul 16 15:45:37 2003
@@ -42,37 +42,12 @@
from distutils.command.install_lib import install_lib
from distutils.command.build_py import build_py
-# distutils doesn't currently support graceful future evolution,
-# because all commands are configured by keyword args and distutils
-# complains about keywords it doesn't know about.
-
-if not "depends" in Extension.__init__.func_code.co_varnames:
- # If it doesn't, create a local replacement that removes depends from the
- # kwargs before calling the regular constructor.
- _Extension = Extension
- class Extension(_Extension):
- def __init__(self, name, sources, **kwargs):
- if kwargs.has_key("depends"):
- 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])
-
-exts = [ExtClassExt(name) for name in
- ["ExtensionClass", "Acquisition", "ComputedAttribute", "MethodObject",
- "Missing", "MultiMapping", "Record", "ThreadLock"]]
+ print "ZODB3 3.3 requires Python 2.3 or higher"
+ sys.exit(0)
# Include directories for C extensions
-include = ['ExtensionClass/src', 'Persistence']
+include = ['Persistence']
# Set up dependencies for the BTrees package
base_btrees_depends = [
@@ -106,7 +81,7 @@
kwargs["define_macros"] = [('EXCLUDE_INTSET_SUPPORT', None)]
return Extension(name, sources, **kwargs)
-exts += [BTreeExtension(flavor) for flavor in ["OO", "IO", "OI", "II", "fs"]]
+exts = [BTreeExtension(flavor) for flavor in ["OO", "IO", "OI", "II", "fs"]]
cPersistence = Extension(name = 'Persistence.cPersistence',
include_dirs = include,
@@ -228,7 +203,7 @@
doclines = __doc__.split("\n")
setup(name="ZODB3",
- version="3.3-pre-alpha",
+ version="3.3a1",
maintainer="Zope Corporation",
maintainer_email="zodb-dev at zope.org",
url = "http://www.zope.org/Wikis/ZODB/FrontPage",
@@ -237,7 +212,7 @@
ext_modules = exts,
headers = ['Persistence/cPersistence.h'],
license = "http://www.zope.org/Resources/ZPL",
- platforms = ["yes"], #
+ platforms = ["all"],
description = doclines[0],
classifiers = filter(None, classifiers.split("\n")),
long_description = "\n".join(doclines[2:]),
=== ZODB3/MANIFEST.in 1.10 => 1.10.4.1 ===
--- ZODB3/MANIFEST.in:1.10 Fri May 30 17:09:05 2003
+++ ZODB3/MANIFEST.in Wed Jul 16 15:45:37 2003
@@ -1,7 +1,8 @@
include MANIFEST*
include *.txt
include test.py
-recursive-include ZODB *.h .c *.xml
+recursive-include Persistence *.c *.h
+recursive-include ZODB *.c *.xml
recursive-include BTrees *.h .c *.txt
recursive-include BDBStorage *.c
recursive-include ZEO *.xml *.txt
@@ -10,8 +11,6 @@
recursive-include ZConfig *.xml *.conf
include ZConfig/scripts/zconfig
graft Doc
-graft ExtensionClass
graft Tools
-graft ZEO1
graft ZConfig/doc
global-exclude .cvsignore
=== ZODB3/MANIFEST 1.16.4.1 => 1.16.4.2 ===
--- ZODB3/MANIFEST:1.16.4.1 Wed Jul 16 15:18:29 2003
+++ ZODB3/MANIFEST Wed Jul 16 15:45:37 2003
@@ -111,59 +111,15 @@
Doc/zodb/zeo.html
Doc/zodb/zodb.css
Doc/zodb/zodb.html
-ExtensionClass/LICENSE.txt
-ExtensionClass/README
-ExtensionClass/Xaq.py
-ExtensionClass/setup.py
-ExtensionClass/doc/Acquisition.html
-ExtensionClass/doc/Acquisition.stx
-ExtensionClass/doc/ExtensionClass.html
-ExtensionClass/doc/ExtensionClass.stx
-ExtensionClass/doc/Installation
-ExtensionClass/doc/Installation.html
-ExtensionClass/doc/MultiMapping.html
-ExtensionClass/doc/MultiMapping.stx
-ExtensionClass/doc/index.html
-ExtensionClass/doc/index.stx
-ExtensionClass/doc/release.notes
-ExtensionClass/doc/release.notes.html
-ExtensionClass/src/Acquisition.c
-ExtensionClass/src/Acquisition.h
-ExtensionClass/src/ComputedAttribute.c
-ExtensionClass/src/ExtensionClass.c
-ExtensionClass/src/ExtensionClass.h
-ExtensionClass/src/MethodObject.c
-ExtensionClass/src/Missing.c
-ExtensionClass/src/MultiMapping.c
-ExtensionClass/src/Record.c
-ExtensionClass/src/ThreadLock.c
-ExtensionClass/src/Xaq.py
-ExtensionClass/test/regrtest.py
-ExtensionClass/test/test_AqAlg.py
-ExtensionClass/test/test_Missing.py
-ExtensionClass/test/test_MultiMapping.py
-ExtensionClass/test/test_ThreadLock.py
-ExtensionClass/test/test_acquisition.py
-ExtensionClass/test/test_add.py
-ExtensionClass/test/test_binding.py
-ExtensionClass/test/test_explicit_acquisition.py
-ExtensionClass/test/test_method_hook.py
-ExtensionClass/test/output/test_AqAlg
-ExtensionClass/test/output/test_Missing
-ExtensionClass/test/output/test_MultiMapping
-ExtensionClass/test/output/test_ThreadLock
-ExtensionClass/test/output/test_acquisition
-ExtensionClass/test/output/test_add
-ExtensionClass/test/output/test_binding
-ExtensionClass/test/output/test_explicit_acquisition
-ExtensionClass/test/output/test_method_hook
Persistence/PersistentList.py
Persistence/PersistentMapping.py
Persistence/TimeStamp.c
Persistence/__init__.py
Persistence/cPersistence.c
+Persistence/cPersistence.h
Persistence/cPickleCache.c
Persistence/ring.c
+Persistence/ring.h
Persistence/tests/__init__.py
Persistence/tests/testPersistent.py
ThreadedAsync/LoopCallback.py
More information about the Zodb-checkins
mailing list