[Checkins] SVN: lovely.mount/trunk/ - buildoutify/eggify
Fred L. Drake, Jr.
fdrake at gmail.com
Thu Mar 22 11:23:28 EDT 2007
Log message for revision 73453:
- buildoutify/eggify
- move harness for all tests to tests.py
- avoid deprecation warning for ZCML including zope.app package directly
Changed:
_U lovely.mount/trunk/
A lovely.mount/trunk/buildout.cfg
A lovely.mount/trunk/setup.cfg
A lovely.mount/trunk/setup.py
A lovely.mount/trunk/src/lovely/__init__.py
U lovely.mount/trunk/src/lovely/mount/ftesting.zcml
D lovely.mount/trunk/src/lovely/mount/ftests.py
U lovely.mount/trunk/src/lovely/mount/tests.py
-=-
Property changes on: lovely.mount/trunk
___________________________________________________________________
Name: svn:ignore
+ .installed.cfg
bin
build
develop-eggs
eggs
parts
Added: lovely.mount/trunk/buildout.cfg
===================================================================
--- lovely.mount/trunk/buildout.cfg 2007-03-22 15:17:24 UTC (rev 73452)
+++ lovely.mount/trunk/buildout.cfg 2007-03-22 15:23:27 UTC (rev 73453)
@@ -0,0 +1,8 @@
+[buildout]
+develop = .
+parts = test
+find-links = http://download.zope.org/distribution/
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = lovely.mount [test]
Property changes on: lovely.mount/trunk/buildout.cfg
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: lovely.mount/trunk/setup.cfg
===================================================================
--- lovely.mount/trunk/setup.cfg 2007-03-22 15:17:24 UTC (rev 73452)
+++ lovely.mount/trunk/setup.cfg 2007-03-22 15:23:27 UTC (rev 73453)
@@ -0,0 +1,2 @@
+[egg_info]
+tag_svn_revision = 1
Property changes on: lovely.mount/trunk/setup.cfg
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: lovely.mount/trunk/setup.py
===================================================================
--- lovely.mount/trunk/setup.py 2007-03-22 15:17:24 UTC (rev 73452)
+++ lovely.mount/trunk/setup.py 2007-03-22 15:23:27 UTC (rev 73453)
@@ -0,0 +1,23 @@
+#!python
+from setuptools import setup, find_packages
+
+setup(name='lovely.mount',
+ version='0.1',
+ author="Stephan Richter, Jodok Batlogg",
+ author_email="srichter at cosmos.phy.tufts.edu, jodok.batlogg at lovelysystems.com",
+ description="Database mounts for zope 3",
+ license = "ZPL 2.1",
+ keywords = "zope3 web20 zope database mount",
+ url='svn://svn.zope.org/repos/main/lovely.mount',
+
+ packages=find_packages('src'),
+ include_package_data=True,
+ package_dir = {'':'src'},
+ namespace_packages=['lovely'],
+ install_requires=['setuptools',
+ 'zope.interface',
+ 'zope.component',
+ ],
+ extras_require={"test": ["zope.app.testing"]},
+ dependency_links=['http://download.zope.org/distribution'],
+ )
Property changes on: lovely.mount/trunk/setup.py
___________________________________________________________________
Name: svn:mime-type
+ text/x-python
Name: svn:eol-style
+ native
Added: lovely.mount/trunk/src/lovely/__init__.py
===================================================================
--- lovely.mount/trunk/src/lovely/__init__.py 2007-03-22 15:17:24 UTC (rev 73452)
+++ lovely.mount/trunk/src/lovely/__init__.py 2007-03-22 15:23:27 UTC (rev 73453)
@@ -0,0 +1,7 @@
+# This directory is a Python namespace package.
+try:
+ import pkg_resources
+ pkg_resources.declare_namespace(__name__)
+except ImportError:
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
Property changes on: lovely.mount/trunk/src/lovely/__init__.py
___________________________________________________________________
Name: svn:mime-type
+ text/x-python
Name: svn:eol-style
+ native
Modified: lovely.mount/trunk/src/lovely/mount/ftesting.zcml
===================================================================
--- lovely.mount/trunk/src/lovely/mount/ftesting.zcml 2007-03-22 15:17:24 UTC (rev 73452)
+++ lovely.mount/trunk/src/lovely/mount/ftesting.zcml 2007-03-22 15:23:27 UTC (rev 73453)
@@ -1,14 +1,20 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:meta="http://namespaces.zope.org/meta"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="zope">
<!-- Turn on the devmode which is needed for sample data generation -->
<meta:provides feature="devmode" />
- <include package="zope.app" />
- <include package="zope.app" file="ftesting.zcml"/>
-
+ <configure zcml:condition="installed zope.app.zcmlfiles">
+ <include package="zope.app.zcmlfiles" />
+ <include package="zope.app.zcmlfiles" file="ftesting.zcml"/>
+ </configure>
+ <configure zcml:condition="not-installed zope.app.zcmlfiles">
+ <include package="zope.app" />
+ <include package="zope.app" file="ftesting.zcml"/>
+ </configure>
<include package="zope.app.securitypolicy" file="meta.zcml" />
<include package="zope.app.server" />
Deleted: lovely.mount/trunk/src/lovely/mount/ftests.py
===================================================================
--- lovely.mount/trunk/src/lovely/mount/ftests.py 2007-03-22 15:17:24 UTC (rev 73452)
+++ lovely.mount/trunk/src/lovely/mount/ftests.py 2007-03-22 15:23:27 UTC (rev 73453)
@@ -1,27 +0,0 @@
-import unittest
-from zope.app.testing import functional
-from ZODB.interfaces import IDatabase
-from zope import component
-import ZODB.tests.util
-functional.defineLayer('TestLayer', 'ftesting.zcml')
-
-def setUp(test):
- databases = test.globs['getRootFolder']()._p_jar.db().databases
- db2 = ZODB.tests.util.DB(databases=databases, database_name='2')
-
- for name, db in databases.items():
- component.provideUtility(db, IDatabase, name=name)
-
-
-def test_suite():
- suite = unittest.TestSuite()
- suites = (
- functional.FunctionalDocFileSuite('browser/README.txt', setUp=setUp),
- )
- for s in suites:
- s.layer=TestLayer
- suite.addTest(s)
- return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: lovely.mount/trunk/src/lovely/mount/tests.py
===================================================================
--- lovely.mount/trunk/src/lovely/mount/tests.py 2007-03-22 15:17:24 UTC (rev 73452)
+++ lovely.mount/trunk/src/lovely/mount/tests.py 2007-03-22 15:23:27 UTC (rev 73453)
@@ -23,6 +23,7 @@
from zope import component
from zope.app.folder import rootFolder
from zope.app.publication.zopepublication import ZopePublication
+from zope.app.testing import functional
from zope.app.testing import setup
from zope.testing.doctestunit import DocFileSuite
from ZODB.interfaces import IDatabase
@@ -61,8 +62,22 @@
test.db2.close()
+# Functional tests:
+
+functional.defineLayer('LovelyMountLayer', 'ftesting.zcml')
+
+def setUpFunctional(test):
+ databases = test.globs['getRootFolder']()._p_jar.db().databases
+ db2 = ZODB.tests.util.DB(databases=databases, database_name='2')
+
+ for name, db in databases.items():
+ component.provideUtility(db, IDatabase, name=name)
+
+
def test_suite():
-
+ ftests = functional.FunctionalDocFileSuite(
+ 'browser/README.txt', setUp=setUpFunctional)
+ ftests.layer = LovelyMountLayer
return unittest.TestSuite(
(
DocFileSuite('README.txt',
@@ -74,6 +89,7 @@
tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
),
+ ftests,
))
if __name__ == '__main__':
More information about the Checkins
mailing list