[Checkins] SVN: zope.dublincore/trunk/ Add missing dependencies, get rid of zope.app.testing and other testing dependencies.
Dan Korostelev
nadako at gmail.com
Tue Sep 15 06:29:48 EDT 2009
Log message for revision 104029:
Add missing dependencies, get rid of zope.app.testing and other testing dependencies.
Change .browser ZCML configuration condition from zope.app.publisher to zope.browserpage.
Specify i18n domain in configure.zcml, because we use message IDs for permission titles.
Remove unused imports, fix one test that was inactive because of being overriden by another one by a mistake.
Change version to 3.5.0.
Changed:
U zope.dublincore/trunk/CHANGES.txt
U zope.dublincore/trunk/buildout.cfg
U zope.dublincore/trunk/setup.py
U zope.dublincore/trunk/src/zope/dublincore/browser/configure.zcml
U zope.dublincore/trunk/src/zope/dublincore/configure.zcml
U zope.dublincore/trunk/src/zope/dublincore/property.py
U zope.dublincore/trunk/src/zope/dublincore/tests/test_annotatableadapter.py
U zope.dublincore/trunk/src/zope/dublincore/tests/test_creatorannotator.py
U zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py
-=-
Modified: zope.dublincore/trunk/CHANGES.txt
===================================================================
--- zope.dublincore/trunk/CHANGES.txt 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/CHANGES.txt 2009-09-15 10:29:47 UTC (rev 104029)
@@ -1,13 +1,21 @@
Changes
=======
-3.4.3 (unreleased)
+3.5.0 (unreleased)
------------------
-- Removed use of zope.app.component in testing.
+- Add missing dependencies.
-- Include browser configuration only if zope.app.publisher is installed.
+- Get rid of any testing dependencies beyond zope.testing.
+- Include browser ZCML configuration only if zope.browserpage is installed.
+
+- Specify i18n domain in package's ``configure.zcml``, because we use message
+ IDs for permission titles.
+
+- Remove unused imports, fix one test that was inactive because of being
+ overriden by another one by a mistake.
+
3.4.2 (2009-01-31)
------------------
Modified: zope.dublincore/trunk/buildout.cfg
===================================================================
--- zope.dublincore/trunk/buildout.cfg 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/buildout.cfg 2009-09-15 10:29:47 UTC (rev 104029)
@@ -1,7 +1,11 @@
[buildout]
develop = .
-parts = test
+parts = test pydev
[test]
recipe = zc.recipe.testrunner
eggs = zope.dublincore [test]
+
+[pydev]
+recipe = pb.recipes.pydev
+eggs = zope.dublincore
Modified: zope.dublincore/trunk/setup.py
===================================================================
--- zope.dublincore/trunk/setup.py 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/setup.py 2009-09-15 10:29:47 UTC (rev 104029)
@@ -28,7 +28,7 @@
setup(
name="zope.dublincore",
- version = '3.4.3dev',
+ version = '3.5.0dev',
url='http://pypi.python.org/pypi/zope.dublincore',
license='ZPL 2.1',
description='Zope Dublin Core implementation',
@@ -41,17 +41,17 @@
namespace_packages=['zope'],
include_package_data=True,
extras_require=dict(
- test=[
- 'zope.testing',
- 'zope.security',
- 'zope.app.testing',
- ]
+ test=['zope.testing',]
),
install_requires = ['setuptools',
+ 'pytz',
'zope.annotation',
'zope.component',
'zope.datetime',
'zope.interface',
+ 'zope.location',
+ 'zope.schema',
+ 'zope.security',
],
zip_safe = False
)
Modified: zope.dublincore/trunk/src/zope/dublincore/browser/configure.zcml
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/browser/configure.zcml 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/src/zope/dublincore/browser/configure.zcml 2009-09-15 10:29:47 UTC (rev 104029)
@@ -2,7 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:zcml="http://namespaces.zope.org/zcml"
- zcml:condition="installed zope.app.publisher"
+ zcml:condition="installed zope.browserpage"
i18n_domain="zope"
>
Modified: zope.dublincore/trunk/src/zope/dublincore/configure.zcml
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/configure.zcml 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/src/zope/dublincore/configure.zcml 2009-09-15 10:29:47 UTC (rev 104029)
@@ -1,4 +1,7 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ i18n_domain="zope"
+ >
<permission
id="zope.app.dublincore.view"
Modified: zope.dublincore/trunk/src/zope/dublincore/property.py
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/property.py 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/src/zope/dublincore/property.py 2009-09-15 10:29:47 UTC (rev 104029)
@@ -12,14 +12,10 @@
#
##############################################################################
"""
-$Id: $
+$Id$
"""
__docformat__ = 'restructuredtext'
-
-import re,os
-
from zope import schema
-from zope import interface
from zope.dublincore.interfaces import IZopeDublinCore
from zope.dublincore.zopedublincore import SequenceProperty
Modified: zope.dublincore/trunk/src/zope/dublincore/tests/test_annotatableadapter.py
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/tests/test_annotatableadapter.py 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/src/zope/dublincore/tests/test_annotatableadapter.py 2009-09-15 10:29:47 UTC (rev 104029)
@@ -80,7 +80,6 @@
self.assertEqual(adapter._mapping, {})
def test_ctor_w_existing_DC_annotations(self):
- from zope.dublincore.annotatableadapter import DCkey
DCDATA = {'title': 'TITLE'}
self._registerAnnotations(DCDATA)
context = self._makeContext()
Modified: zope.dublincore/trunk/src/zope/dublincore/tests/test_creatorannotator.py
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/tests/test_creatorannotator.py 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/src/zope/dublincore/tests/test_creatorannotator.py 2009-09-15 10:29:47 UTC (rev 104029)
@@ -94,7 +94,7 @@
self._callFUT(event)
self.assertEqual(context.creators, ('bharney', 'phred',))
- def test_w_request_w_existing_creator_nomatch(self):
+ def test_w_request_w_existing_creator_match(self):
context, event = self._makeContextAndEvent()
context.creators = ('bharney', 'phred')
self._setPrincipal('phred')
Modified: zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py
===================================================================
--- zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py 2009-09-15 10:27:12 UTC (rev 104028)
+++ zope.dublincore/trunk/src/zope/dublincore/tests/test_property.py 2009-09-15 10:29:47 UTC (rev 104029)
@@ -13,7 +13,7 @@
##############################################################################
"""Test the Dublin Core Property implementation
-$Id: $
+$Id$
"""
__docformat__ = "reStructuredText"
@@ -23,24 +23,21 @@
from zope import component
from zope.testing.doctestunit import DocFileSuite
+from zope.testing import cleanup
-from zope.app.testing import setup, placelesssetup
-from zope.dublincore import annotatableadapter
+from zope.annotation.attribute import AttributeAnnotations
from zope.dublincore import testing
-from zope.dublincore.interfaces import IWriteZopeDublinCore
def setUp(test):
- setup.placefulSetUp()
- setup.setUpAnnotations()
+ cleanup.setUp()
+ component.provideAdapter(AttributeAnnotations)
testing.setUpDublinCore()
def tearDown(test):
- setup.placefulTearDown()
+ cleanup.tearDown()
-
def test_suite():
-
return unittest.TestSuite(
(
DocFileSuite('../property.txt',
@@ -49,6 +46,3 @@
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
More information about the checkins
mailing list