[Checkins] SVN: ldapadapter/trunk/ Preparing for a ZTK compatible release.
Martijn Faassen
faassen at startifact.com
Tue Jan 25 11:46:10 EST 2011
Log message for revision 119916:
Preparing for a ZTK compatible release.
Changed:
U ldapadapter/trunk/CHANGES.txt
U ldapadapter/trunk/buildout.cfg
U ldapadapter/trunk/setup.py
D ldapadapter/trunk/src/ldapadapter/SETUP.cfg
U ldapadapter/trunk/src/ldapadapter/browser/configure.zcml
U ldapadapter/trunk/src/ldapadapter/configure.zcml
D ldapadapter/trunk/src/ldapadapter/ldapadapter-configure.zcml
U ldapadapter/trunk/src/ldapadapter/tests/fakeldap.py
U ldapadapter/trunk/src/ldapadapter/tests/test_field.py
U ldapadapter/trunk/src/ldapadapter/tests/test_ldapadapter.py
U ldapadapter/trunk/src/ldapadapter/utility.py
-=-
Modified: ldapadapter/trunk/CHANGES.txt
===================================================================
--- ldapadapter/trunk/CHANGES.txt 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/CHANGES.txt 2011-01-25 16:46:10 UTC (rev 119916)
@@ -2,11 +2,21 @@
ldapadapter changes
===================
-0.7.1 - (unreleased)
-====================
+0.8 - (unreleased)
+==================
- * ...
+* Update to work with ZTK.
+* Newer version of openldap installed for testing purposes.
+
+* The UI stuff in ldapadapter.browser is now deprecrated. Should you
+ still need it, ZCML include ldapadapter.browser's ``configure.zcml``
+ manually; it is not pulled in automatically anymore.
+
+* Remove some old installation cruft.
+
+* zest.releaser support in buildout.
+
0.7 - 04.07.2008
================
Modified: ldapadapter/trunk/buildout.cfg
===================================================================
--- ldapadapter/trunk/buildout.cfg 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/buildout.cfg 2011-01-25 16:46:10 UTC (rev 119916)
@@ -2,6 +2,7 @@
develop = .
parts = openldap python-ldap
test
+ releaser
find-links = http://download.zope.org/distribution/
http://sourceforge.net/project/showfiles.php?group_id=2072
@@ -12,7 +13,7 @@
[openldap]
recipe = zc.recipe.cmmi
-url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.3.27.tgz
+url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.23.tgz
extra_options= --disable-slapd --disable-backends
[python-ldap]
@@ -22,3 +23,7 @@
/sw/include/sasl
library-dirs = ${buildout:directory}/parts/openldap/lib
rpath = ${buildout:directory}/parts/openldap/lib
+
+[releaser]
+recipe = z3c.recipe.scripts
+eggs = zest.releaser
Modified: ldapadapter/trunk/setup.py
===================================================================
--- ldapadapter/trunk/setup.py 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/setup.py 2011-01-25 16:46:10 UTC (rev 119916)
@@ -2,19 +2,19 @@
setup(
name='ldapadapter',
- version='0.7.1dev',
- author='Zope 3 developers',
- author_email='zope3-dev at zope.org',
+ version='0.8dev',
+ author='Zope developers',
+ author_email='zope-dev at zope.org',
url='http://svn.zope.org/ldapadapter',
description="""\
-LDAP connection for Zope 3. Connects Zope 3 to an LDAP server.
+LDAP connection for Zope Toolkit. Connects to an LDAP server.
""",
packages=find_packages('src'),
package_dir = {'': 'src'},
include_package_data = True,
zip_safe=False,
license='ZPL 2.1',
- keywords='Zope3 authentication ldap',
+ keywords='Zope3 ZTK authentication ldap',
classifiers = ['Framework :: Zope 3'],
install_requires=[
'setuptools',
@@ -23,8 +23,8 @@
'zope.interface',
'zope.component',
'zope.schema',
- 'zope.app.container',
- 'zope.app.component',
+ 'zope.container',
+ 'zope.componentvocabulary',
'zope.security',
'zope.i18nmessageid',
],
Deleted: ldapadapter/trunk/src/ldapadapter/SETUP.cfg
===================================================================
--- ldapadapter/trunk/src/ldapadapter/SETUP.cfg 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/SETUP.cfg 2011-01-25 16:46:10 UTC (rev 119916)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
- ldapadapter-*.zcml
-</data-files>
Modified: ldapadapter/trunk/src/ldapadapter/browser/configure.zcml
===================================================================
--- ldapadapter/trunk/src/ldapadapter/browser/configure.zcml 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/browser/configure.zcml 2011-01-25 16:46:10 UTC (rev 119916)
@@ -3,6 +3,8 @@
xmlns="http://namespaces.zope.org/browser"
i18n_domain="ldapadapter">
+ <!-- the UI for ldapadapter is deprecated -->
+
<!-- LDAPAdapter -->
<addform
name="AddLDAPAdapter.html"
Modified: ldapadapter/trunk/src/ldapadapter/configure.zcml
===================================================================
--- ldapadapter/trunk/src/ldapadapter/configure.zcml 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/configure.zcml 2011-01-25 16:46:10 UTC (rev 119916)
@@ -38,6 +38,6 @@
for="ldapadapter.interfaces.ILDAPAdapter"
/>
- <include package=".browser" />
+ <!-- not loading browser automatically anymore; that code is deprecated -->
</configure>
Deleted: ldapadapter/trunk/src/ldapadapter/ldapadapter-configure.zcml
===================================================================
--- ldapadapter/trunk/src/ldapadapter/ldapadapter-configure.zcml 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/ldapadapter-configure.zcml 2011-01-25 16:46:10 UTC (rev 119916)
@@ -1 +0,0 @@
-<include package="ldapadapter" />
\ No newline at end of file
Modified: ldapadapter/trunk/src/ldapadapter/tests/fakeldap.py
===================================================================
--- ldapadapter/trunk/src/ldapadapter/tests/fakeldap.py 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/tests/fakeldap.py 2011-01-25 16:46:10 UTC (rev 119916)
@@ -16,7 +16,6 @@
$Id$
"""
-import sha
import base64
from copy import deepcopy
Modified: ldapadapter/trunk/src/ldapadapter/tests/test_field.py
===================================================================
--- ldapadapter/trunk/src/ldapadapter/tests/test_field.py 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/tests/test_field.py 2011-01-25 16:46:10 UTC (rev 119916)
@@ -19,11 +19,9 @@
import sys
-import unittest
+import unittest, doctest
-from zope.testing import doctest
-
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite('../field.py'),
Modified: ldapadapter/trunk/src/ldapadapter/tests/test_ldapadapter.py
===================================================================
--- ldapadapter/trunk/src/ldapadapter/tests/test_ldapadapter.py 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/tests/test_ldapadapter.py 2011-01-25 16:46:10 UTC (rev 119916)
@@ -17,8 +17,8 @@
"""
__docformat__ = "reStructuredText"
import sys
-import unittest
-from zope.testing import doctest, doctestunit
+import unittest, doctest
+from pprint import pprint
def setUp(test):
@@ -48,7 +48,7 @@
return unittest.TestSuite((
doctest.DocFileSuite('../README.txt',
setUp=setUp, tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
+ globs={'pprint': pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
))
Modified: ldapadapter/trunk/src/ldapadapter/utility.py
===================================================================
--- ldapadapter/trunk/src/ldapadapter/utility.py 2011-01-25 16:32:16 UTC (rev 119915)
+++ ldapadapter/trunk/src/ldapadapter/utility.py 2011-01-25 16:46:10 UTC (rev 119916)
@@ -19,8 +19,8 @@
import ldap
import persistent
import zope.interface
-from zope.app.container.contained import Contained
-from zope.app.component.vocabulary import UtilityVocabulary
+from zope.container.contained import Contained
+from zope.componentvocabulary.vocabulary import UtilityVocabulary
from ldapadapter import interfaces
More information about the checkins
mailing list