[Checkins] SVN: plone.z3cform/trunk/ Move out Plone-specific
subpackages to ``plone.app.z3cform``. These
Daniel Nouri
daniel.nouri at gmail.com
Tue Jul 15 15:26:53 EDT 2008
Log message for revision 88386:
Move out Plone-specific subpackages to ``plone.app.z3cform``. These
are:
- wysywig: Kupu/Plone integration
- queryselect: use z3c.formwidget.query with Archetypes
Clean up testing code and development ``buildout.cfg`` to not pull in
Plone anymore.
Changed:
U plone.z3cform/trunk/buildout.cfg
U plone.z3cform/trunk/docs/HISTORY.txt
D plone.z3cform/trunk/plone/z3cform/queryselect/
U plone.z3cform/trunk/plone/z3cform/testing.zcml
U plone.z3cform/trunk/plone/z3cform/tests.py
D plone.z3cform/trunk/plone/z3cform/wysiwyg/
D plone.z3cform/trunk/setup.cfg
U plone.z3cform/trunk/setup.py
-=-
Modified: plone.z3cform/trunk/buildout.cfg
===================================================================
--- plone.z3cform/trunk/buildout.cfg 2008-07-15 16:56:52 UTC (rev 88385)
+++ plone.z3cform/trunk/buildout.cfg 2008-07-15 19:26:51 UTC (rev 88386)
@@ -2,8 +2,6 @@
parts =
zope2
instance
- plone
- PILwoTK
test
develop =
@@ -15,13 +13,14 @@
[zope2]
recipe = plone.recipe.zope2install
-url = ${plone:zope2-url}
+url = http://www.zope.org/Products/Zope/2.10.6/Zope-2.10.6-final.tgz
fake-zope-eggs = true
# requiring zope.testing for z2testrunner
# requiring zope.component for zope.i18n >= 3.4 which is needed for z3c.form
-skip-fake-eggs = zope.testing
- zope.component
- zope.i18n
+skip-fake-eggs =
+ zope.component
+ zope.i18n
+ zope.testing
[instance]
recipe = plone.recipe.zope2instance
@@ -29,27 +28,13 @@
user = admin:admin
verbose-security = on
debug-mode = on
-products =
- ${buildout:directory}/parts/plone
-
eggs =
- ${plone:eggs}
- PILwoTK
- zope.testing
plone.z3cform
- zope.i18n
+ zope.testing==3.5.1
zcml =
plone.z3cform
-[plone]
-recipe = plone.recipe.plone
-
-[PILwoTK]
-recipe = zc.recipe.egg
-find-links =
- http://download.zope.org/distribution/
-
[zopepy]
recipe = zc.recipe.egg
eggs = ${instance:eggs}
Modified: plone.z3cform/trunk/docs/HISTORY.txt
===================================================================
--- plone.z3cform/trunk/docs/HISTORY.txt 2008-07-15 16:56:52 UTC (rev 88385)
+++ plone.z3cform/trunk/docs/HISTORY.txt 2008-07-15 19:26:51 UTC (rev 88386)
@@ -4,6 +4,20 @@
0.3 - unreleased
----------------
+* Move out Plone-specific subpackages to ``plone.app.z3cform``. These
+ are:
+
+ - wysywig: Kupu/Plone integration
+
+ - queryselect: use z3c.formwidget.query with Archetypes
+
+ Clean up testing code and development ``buildout.cfg`` to not pull
+ in Plone anymore.
+ [nouri]
+
+* Relicensed under the ZPL 2.1 and moved into the Zope repository.
+ [nouri]
+
* Add German translation.
[saily]
Modified: plone.z3cform/trunk/plone/z3cform/testing.zcml
===================================================================
--- plone.z3cform/trunk/plone/z3cform/testing.zcml 2008-07-15 16:56:52 UTC (rev 88385)
+++ plone.z3cform/trunk/plone/z3cform/testing.zcml 2008-07-15 19:26:51 UTC (rev 88386)
@@ -8,8 +8,8 @@
<include file="configure.zcml" package="Products.Five"/>
<include file="meta.zcml" package="z3c.form"/>
<include file="configure.zcml" package="z3c.form"/>
+
<includeOverrides file="overrides.zcml" package="plone.z3cform"/>
-
<include file="configure.zcml" package="plone.z3cform"/>
</configure>
Modified: plone.z3cform/trunk/plone/z3cform/tests.py
===================================================================
--- plone.z3cform/trunk/plone/z3cform/tests.py 2008-07-15 16:56:52 UTC (rev 88385)
+++ plone.z3cform/trunk/plone/z3cform/tests.py 2008-07-15 19:26:51 UTC (rev 88386)
@@ -1,15 +1,16 @@
+import os
import unittest
-from zope.testing import doctest
+from zope.testing import doctest
from zope import component
from zope import interface
+from zope.component import testing
+from zope.app.testing.functional import ZCMLLayer
import zope.traversing.adapters
import zope.traversing.namespace
-from zope.component import testing
import zope.publisher.interfaces.browser
import z3c.form.testing
-import plone.z3cform
-import os
+
import plone.z3cform.templates
def create_eventlog(event=interface.Interface):
@@ -49,48 +50,27 @@
(None, None, None, None, None, None),
z3c.form.interfaces.IErrorViewSnippet)
-from zope.app.testing.functional import ZCMLLayer
-testingZCMLPath = os.path.join(os.path.dirname(__file__), 'testing.zcml')
-fullZ3CFormLayer = ZCMLLayer(testingZCMLPath,
- 'plone.z3cform',
- 'fullZ3CFormLayer')
+testing_zcml_path = os.path.join(os.path.dirname(__file__), 'testing.zcml')
+testing_zcml_layer = ZCMLLayer(
+ testing_zcml_path, 'plone.z3cform', 'testing_zcml_layer')
def test_suite():
- fullZ3CForm = doctest.DocFileSuite('base.txt')
- fullZ3CForm.layer = fullZ3CFormLayer
+ base_txt = doctest.DocFileSuite('base.txt')
+ base_txt.layer = testing_zcml_layer
- fieldsets = doctest.DocFileSuite('fieldsets/README.txt')
- fieldsets.layer = fullZ3CFormLayer
+ fieldsets_txt = doctest.DocFileSuite('fieldsets/README.txt')
+ fieldsets_txt.layer = testing_zcml_layer
return unittest.TestSuite([
+ base_txt, fieldsets_txt,
doctest.DocFileSuite(
'crud/README.txt',
setUp=testing.setUp, tearDown=testing.tearDown,
),
- fullZ3CForm,
-
- fieldsets,
-
- doctest.DocFileSuite(
- 'wysiwyg/README.txt',
- setUp=testing.setUp, tearDown=testing.tearDown,
- ),
-
- doctest.DocFileSuite(
- 'queryselect/README.txt',
- setUp=testing.setUp, tearDown=testing.tearDown,
- ),
-
doctest.DocTestSuite(
'plone.z3cform.crud.crud',
setUp=testing.setUp, tearDown=testing.tearDown,
),
-
- doctest.DocTestSuite(
- 'plone.z3cform.wysiwyg.widget',
- setUp=testing.setUp, tearDown=testing.tearDown,
- ),
-
])
Deleted: plone.z3cform/trunk/setup.cfg
===================================================================
--- plone.z3cform/trunk/setup.cfg 2008-07-15 16:56:52 UTC (rev 88385)
+++ plone.z3cform/trunk/setup.cfg 2008-07-15 19:26:51 UTC (rev 88386)
@@ -1,3 +0,0 @@
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
Modified: plone.z3cform/trunk/setup.py
===================================================================
--- plone.z3cform/trunk/setup.py 2008-07-15 16:56:52 UTC (rev 88385)
+++ plone.z3cform/trunk/setup.py 2008-07-15 19:26:51 UTC (rev 88386)
@@ -1,29 +1,28 @@
from setuptools import setup, find_packages
import os
-version = '0.3'
+version = '0.3dev'
def description():
join = lambda *paths: os.path.join('plone', 'z3cform', *paths)
return (open('README.txt').read() + '\n' +
- open(join('wysiwyg', 'README.txt')).read() + '\n' +
- open(join('queryselect', 'README.txt')).read() + '\n' +
open(join('crud', 'README.txt')).read() + '\n' +
+ open(join('fieldsets', 'README.txt')).read() + '\n' +
open(os.path.join('docs', 'HISTORY.txt')).read() + '\n')
setup(name='plone.z3cform',
version=version,
- description="A library that allows use of z3c.form with Zope 2 (and Plone)",
+ description="A library that allows use of z3c.form with Zope 2 "
+ "(and Plone)",
long_description=description(),
- # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
"Framework :: Plone",
"Framework :: Zope2",
"Programming Language :: Python",
"Topic :: Software Development :: Libraries :: Python Modules",
],
- keywords='zope plone forms',
+ keywords='zope cmf form widget',
author='Daniel Nouri and contributors',
author_email='daniel.nouri at gmail.com',
url='http://pypi.python.org/pypi/plone.z3cform',
@@ -33,12 +32,12 @@
include_package_data=True,
zip_safe=False,
- # If the dependency to z3c.form gives you trouble within a Zope
- # 2 environment, try the `fakezope2eggs` recipe
+ # If in Zope 2, z3c.form or another Zope 3 package starts
+ # pulling incompatible dependencies, use the "fake zope eggs"
+ # feature of plone.recipe.zope2install.
install_requires=[
'setuptools',
'z3c.form',
- 'z3c.formwidget.query',
'zope.i18n>=3.4'
],
)
More information about the Checkins
mailing list