[Checkins] SVN: zope.dublincore/trunk/ register ZDCAnnotatableAdapter only if zope.annotation is installed, leave the latter as a test dependency
Thomas Lotze
tl at gocept.com
Wed Dec 2 11:38:51 EST 2009
Log message for revision 106180:
register ZDCAnnotatableAdapter only if zope.annotation is installed, leave the latter as a test dependency
Changed:
U zope.dublincore/trunk/CHANGES.txt
U zope.dublincore/trunk/setup.py
U zope.dublincore/trunk/src/zope/dublincore/configure.zcml
-=-
Modified: zope.dublincore/trunk/CHANGES.txt
===================================================================
--- zope.dublincore/trunk/CHANGES.txt 2009-12-02 16:32:47 UTC (rev 106179)
+++ zope.dublincore/trunk/CHANGES.txt 2009-12-02 16:38:51 UTC (rev 106180)
@@ -7,6 +7,10 @@
- Removed the marker interface IZopeDublinCoreAnnotatable which doesn't seem
to be used.
+- Made the registration of ZDCAnnotatableAdapter conditional, lifting the
+ dependency on zope.annotation and thereby the ZODB, leaving it as a test
+ dependency.
+
3.5.0 (2009-09-15)
------------------
Modified: zope.dublincore/trunk/setup.py
===================================================================
--- zope.dublincore/trunk/setup.py 2009-12-02 16:32:47 UTC (rev 106179)
+++ zope.dublincore/trunk/setup.py 2009-12-02 16:38:51 UTC (rev 106180)
@@ -41,11 +41,12 @@
namespace_packages=['zope'],
include_package_data=True,
extras_require=dict(
- test=['zope.testing',]
+ test=['zope.testing',
+ 'zope.annotation',
+ ]
),
install_requires = ['setuptools',
'pytz',
- 'zope.annotation',
'zope.component',
'zope.datetime',
'zope.interface',
Modified: zope.dublincore/trunk/src/zope/dublincore/configure.zcml
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/configure.zcml 2009-12-02 16:32:47 UTC (rev 106179)
+++ zope.dublincore/trunk/src/zope/dublincore/configure.zcml 2009-12-02 16:38:51 UTC (rev 106180)
@@ -1,5 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="zope"
>
@@ -18,6 +19,7 @@
<include file="security.zcml" />
<adapter
+ zcml:condition="installed zope.annotation"
factory=".annotatableadapter.ZDCAnnotatableAdapter"
provides="zope.dublincore.interfaces.IWriteZopeDublinCore"
trusted="true"
More information about the checkins
mailing list