[Checkins] SVN: zc.catalog/trunk/ Made some good progress to make
zc.catalog a good egg citizen. ; -)
Stephan Richter
srichter at cosmos.phy.tufts.edu
Sat Nov 3 14:31:51 EDT 2007
Log message for revision 81442:
Made some good progress to make zc.catalog a good egg citizen. ;-)
Changed:
D zc.catalog/trunk/CHANGES.txt
U zc.catalog/trunk/README.txt
U zc.catalog/trunk/buildout.cfg
U zc.catalog/trunk/setup.py
_U zc.catalog/trunk/src/
U zc.catalog/trunk/src/zc/catalog/CHANGES.txt
U zc.catalog/trunk/src/zc/catalog/browser/README.txt
U zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml
D zc.catalog/trunk/src/zc/catalog/browser/ftests.py
A zc.catalog/trunk/src/zc/catalog/browser/tests.py
U zc.catalog/trunk/src/zc/catalog/callablewrapper.txt
U zc.catalog/trunk/src/zc/catalog/extentcatalog.txt
U zc.catalog/trunk/src/zc/catalog/globber.txt
U zc.catalog/trunk/src/zc/catalog/legacy.txt
U zc.catalog/trunk/src/zc/catalog/normalizedindex.txt
U zc.catalog/trunk/src/zc/catalog/setindex.txt
U zc.catalog/trunk/src/zc/catalog/stemmer.txt
U zc.catalog/trunk/src/zc/catalog/valueindex.txt
-=-
Deleted: zc.catalog/trunk/CHANGES.txt
===================================================================
--- zc.catalog/trunk/CHANGES.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/CHANGES.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1 +0,0 @@
-Please see CHANGES.txt in the package.
Modified: zc.catalog/trunk/README.txt
===================================================================
--- zc.catalog/trunk/README.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/README.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,7 +1,3 @@
-==========
-zc.catalog
-==========
-
zc.catalog is an extension to the Zope 3 catalog, Zope 3's indexing
and search facility. zc.catalog contains a number of extensions to the
Zope 3 catalog, such as some new indexes, improved globbing and
Modified: zc.catalog/trunk/buildout.cfg
===================================================================
--- zc.catalog/trunk/buildout.cfg 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/buildout.cfg 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,10 +1,9 @@
[buildout]
develop = .
parts = test
-find-links = http://download.zope.org/distribution/
[test]
recipe = zc.recipe.testrunner
-eggs = zc.catalog
+eggs = zc.catalog [test]
defaults = "--exit-with-status".split()
Modified: zc.catalog/trunk/setup.py
===================================================================
--- zc.catalog/trunk/setup.py 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/setup.py 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,39 +1,98 @@
+##############################################################################
+#
+# Copyright (c) 2007 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Setup for zc.catalog package
+
+$Id: setup.py 81038 2007-10-24 14:34:17Z srichter $
+"""
import os
from setuptools import setup, find_packages
-setup(
- name="zc.catalog",
- version="1.2b",
- packages=find_packages('src', exclude=["*.tests", "*.ftests"]),
-
- package_dir= {'':'src'},
-
- namespace_packages=['zc'],
- package_data = {
- '': ['*.txt', '*.zcml'],
- },
- url='http://svn.zope.org/zc.catalog',
- zip_safe=False,
- author='Zope Project',
- author_email='zope3-dev at zope.org',
- description="zc.catalog contains a number of extensions to the Zope 3 catalog",
- long_description=(
- open('README.txt').read() + '\n' +
- open('src/zc/catalog/CHANGES.txt').read()),
- license='ZPL',
- keywords="zope zope3 indexing",
- classifiers = ['Framework :: Zope3'],
- install_requires=['setuptools',
- 'zope.component',
- 'zope.testing',
- 'ZODB3 >=3.8.0a1.dev-r74856', # required BTrees.family*
- 'zope.schema',
- 'zope.interface',
- 'zope.app.catalog >=3.4.0a2',
- 'pytz',
- 'zope.security',
- 'zope.publisher',
- 'zope.i18nmessageid',
- 'zope.app.container',
- ],
- )
+def read(*rnames):
+ return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
+setup(name='zc.catalog',
+ version = '1.2.0',
+ author='Zope Corporation and Contributors',
+ author_email='zope3-dev at zope.org',
+ description="Extensions to the Zope 3 Catalog",
+ long_description=(
+ read('README.txt')
+ + '\n\n' +
+ 'Detailed Dcoumentation\n' +
+ '======================\n'
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'valueindex.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'setindex.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'normalizedindex.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'extentcatalog.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'stemmer.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'legacy.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'globber.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'callablewrapper.txt')
+ + '\n\n' +
+ read('src', 'zc', 'catalog', 'browser', 'README.txt')
+ #+ '\n\n' +
+ #read('CHANGES.txt')
+ ),
+ keywords = "zope3 i18n date time duration",
+ classifiers = [
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Web Environment',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Programming Language :: Python',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'Topic :: Internet :: WWW/HTTP',
+ 'Framework :: Zope3'],
+ url='http://cheeseshop.python.org/pypi/zc.catalog',
+ license='ZPL 2.1',
+ packages=find_packages('src'),
+ package_dir = {'': 'src'},
+ namespace_packages=['zc'],
+ extras_require=dict(
+ test=['zope.app.authentication',
+ 'zope.app.intid',
+ 'zope.app.keyreference',
+ 'zope.app.securitypolicy',
+ 'zope.app.server',
+ 'zope.app.testing',
+ 'zope.app.zcmlfiles',
+ 'zope.securitypolicy',
+ 'zope.testbrowser',
+ 'zope.testing',
+ ]),
+ install_requires=['ZODB3',
+ 'pytz',
+ 'setuptools',
+ 'zope.app.catalog',
+ 'zope.app.container',
+ 'zope.component',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.publisher',
+ 'zope.schema',
+ 'zope.security',
+ 'zope.testing',
+ ],
+ include_package_data = True,
+ zip_safe = False,
+ )
Property changes on: zc.catalog/trunk/src
___________________________________________________________________
Name: svn:ignore
+ zc.catalog.egg-info
Modified: zc.catalog/trunk/src/zc/catalog/CHANGES.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/CHANGES.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/CHANGES.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -5,12 +5,14 @@
The 1.2 line supports Zope 3.4/ZODB 3.8. The 1.1 line supports Zope
3.3/ZODB 3.7.
-1.2dev
-======
+1.2.0 (2007-11-03)
+------------------
Features added
---------------
+~~~~~~~~~~~~~~
+* Updated package meta-data.
+
* zc.catalog now can use 64-bit BTrees ("L") as provided by ZODB 3.8.
* Albertas Agejavas (alga at pov.lt) included the new CallableWrapper, for
@@ -31,21 +33,23 @@
It is also potentially slightly useful as a base for other self-populating
extents.
+
1.1.1 (2007-3-17)
-=================
+-----------------
Bugs fixed
-----------
+~~~~~~~~~~
'all_of' would return all results when one of the values had no results.
Reported, with test and fix provided, by Nando Quintana.
-1.1 (2007-1-6)
-================
-Features removed
+1.1 (2007-01-06)
----------------
+Features removed
+~~~~~~~~~~~~~~~~
+
The queueing of events in the extent catalog has been entirely removed.
Subtransactions caused significant problems to the code introduced in 1.0.
Other solutions also have significant problems, and the win of this kind
@@ -65,11 +69,12 @@
* vague hand-wavy ideas for separate storages or transaction managers for the
queue. Never panned out in discussion.
-1.0 (2007-1-5)
-==============
+1.0 (2007-01-05)
+----------------
+
Bugs fixed
-----------
+~~~~~~~~~~
* adjusted extentcatalog tests to trigger (and discuss and test) the queueing
behavior.
@@ -84,10 +89,11 @@
* removed use of zapi in extentcatalog.
+
0.2 (2006-11-22)
-================
+----------------
Features added
---------------
+~~~~~~~~~~~~~~
* First release on Cheeseshop.
Modified: zc.catalog/trunk/src/zc/catalog/browser/README.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/README.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/browser/README.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,5 +1,6 @@
-zc.catalog
-==========
+==========================
+zc.catalog Browser Support
+==========================
The zc.catalog.browser package adds simple TTW addition/inspection for SetIndex
and ValueIndex.
Modified: zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml 2007-11-03 18:31:51 UTC (rev 81442)
@@ -21,7 +21,7 @@
<include package="zope.app.catalog" />
<include package="zc.catalog" />
- <subscriber handler="zc.catalog.browser.ftests.initializeIntIds" />
+ <subscriber handler="zc.catalog.browser.tests.initializeIntIds" />
<!-- Security -->
@@ -29,8 +29,7 @@
<include package="zope.app.securitypolicy" />
<securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy"
- />
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
<role
id="zope.Anonymous"
Deleted: zc.catalog/trunk/src/zc/catalog/browser/ftests.py
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/ftests.py 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/browser/ftests.py 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,62 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Functional tests for `zc.catalog.browser`.
-
-$Id$
-"""
-import doctest
-import os.path
-import unittest
-
-import transaction
-
-import zope.app.appsetup.bootstrap
-import zope.app.appsetup.interfaces
-import zope.app.intid
-import zope.app.intid.interfaces
-import zope.app.testing.functional
-
-
-here = os.path.dirname(os.path.realpath(__file__))
-
-ZcCatalogLayer = zope.app.testing.functional.ZCMLLayer(
- os.path.join(here, "ftesting.zcml"), __name__, "ZcCatalogLayer")
-
-
- at zope.component.adapter(
- zope.app.appsetup.interfaces.IDatabaseOpenedWithRootEvent)
-#
-def initializeIntIds(event):
- db, connection, root, root_folder = (
- zope.app.appsetup.bootstrap.getInformationFromEvent(event))
- sm = root_folder.getSiteManager()
- intids = zope.app.intid.IntIds()
- sm["default"]["test-int-ids"] = intids
- sm.registerUtility(
- intids,
- zope.app.intid.interfaces.IIntIds)
- transaction.commit()
- connection.close()
-
-
-def test_suite():
- suite = zope.app.testing.functional.FunctionalDocFileSuite(
- "README.txt",
- optionflags=doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE)
- suite.layer = ZcCatalogLayer
- return suite
-
-
-if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
Copied: zc.catalog/trunk/src/zc/catalog/browser/tests.py (from rev 81441, zc.catalog/trunk/src/zc/catalog/browser/ftests.py)
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/tests.py (rev 0)
+++ zc.catalog/trunk/src/zc/catalog/browser/tests.py 2007-11-03 18:31:51 UTC (rev 81442)
@@ -0,0 +1,62 @@
+##############################################################################
+#
+# Copyright (c) 2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Functional tests for `zc.catalog.browser`.
+
+$Id$
+"""
+import doctest
+import os.path
+import unittest
+
+import transaction
+
+import zope.app.appsetup.bootstrap
+import zope.app.appsetup.interfaces
+import zope.app.intid
+import zope.app.intid.interfaces
+import zope.app.testing.functional
+
+
+here = os.path.dirname(os.path.realpath(__file__))
+
+ZcCatalogLayer = zope.app.testing.functional.ZCMLLayer(
+ os.path.join(here, "ftesting.zcml"), __name__, "ZcCatalogLayer")
+
+
+ at zope.component.adapter(
+ zope.app.appsetup.interfaces.IDatabaseOpenedWithRootEvent)
+#
+def initializeIntIds(event):
+ db, connection, root, root_folder = (
+ zope.app.appsetup.bootstrap.getInformationFromEvent(event))
+ sm = root_folder.getSiteManager()
+ intids = zope.app.intid.IntIds()
+ sm["default"]["test-int-ids"] = intids
+ sm.registerUtility(
+ intids,
+ zope.app.intid.interfaces.IIntIds)
+ transaction.commit()
+ connection.close()
+
+
+def test_suite():
+ suite = zope.app.testing.functional.FunctionalDocFileSuite(
+ "README.txt",
+ optionflags=doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE)
+ suite.layer = ZcCatalogLayer
+ return suite
+
+
+if __name__ == "__main__":
+ unittest.main(defaultTest="test_suite")
Modified: zc.catalog/trunk/src/zc/catalog/callablewrapper.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/callablewrapper.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/callablewrapper.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,5 +1,6 @@
-CallableWrapper
-===============
+================
+Callable Wrapper
+================
If we want to index some value that is easily derivable from a
document, we have to define an interface with this value as an
Modified: zc.catalog/trunk/src/zc/catalog/extentcatalog.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/extentcatalog.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/extentcatalog.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,3 +1,7 @@
+==============
+Extent Catalog
+==============
+
An extent catalog is very similar to a normal catalog except that it
only indexes items addable to its extent. The extent is both a filter
and a set that may be merged with other result sets. The filtering is
Modified: zc.catalog/trunk/src/zc/catalog/globber.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/globber.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/globber.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,3 +1,7 @@
+=======
+Globber
+=======
+
The globber takes a query and makes any term that isn't already a glob into
something that ends in a star. It was originally envisioned as a *very* low-
rent stemming hack. The author now questions its value, and hopes that the new
Modified: zc.catalog/trunk/src/zc/catalog/legacy.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/legacy.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/legacy.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,5 +1,6 @@
+=======================
Support for legacy data
------------------------
+=======================
Prior to the introduction of btree "families" and the
``BTrees.Interfaces.IBTreeFamily`` interface, the indexes defined by
Modified: zc.catalog/trunk/src/zc/catalog/normalizedindex.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/normalizedindex.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/normalizedindex.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,3 +1,7 @@
+================
+Normalized Index
+================
+
The index module provides a normalizing wrapper, a DateTime normalizer, and
a set index and a value index normalized with the DateTime normalizer.
Modified: zc.catalog/trunk/src/zc/catalog/setindex.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/setindex.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/setindex.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,3 +1,7 @@
+=========
+Set Index
+=========
+
The setindex is an index similar to, but more general than a traditional
keyword index. The values indexed are expected to be iterables; the index
allows searches for documents that contain any of a set of values; all of a set
Modified: zc.catalog/trunk/src/zc/catalog/stemmer.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/stemmer.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/stemmer.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,3 +1,7 @@
+=======
+Stemmer
+=======
+
The stemmer uses Andreas Jung's stemmer code, which is a Python wrapper of
M. F. Porter's Snowball project (http://snowball.tartarus.org/index.php).
It is designed to be used as part of a pipeline in a zope/index/text/
Modified: zc.catalog/trunk/src/zc/catalog/valueindex.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/valueindex.txt 2007-11-03 18:00:23 UTC (rev 81441)
+++ zc.catalog/trunk/src/zc/catalog/valueindex.txt 2007-11-03 18:31:51 UTC (rev 81442)
@@ -1,3 +1,7 @@
+===========
+Value Index
+===========
+
The valueindex is an index similar to, but more flexible than a standard Zope
field index. The index allows searches for documents that contain any of a
set of values; between a set of values; any (non-None) values; and any empty
More information about the Checkins
mailing list