[Checkins] SVN: ldappas/trunk/ set dependencies in setup.py
Christian Zagrodnick
cz at gocept.com
Mon Jun 25 04:24:21 EDT 2007
Log message for revision 77031:
set dependencies in setup.py
removed external to ldapadapter
using eggified zope instance
requires ldapadapter>0.6
Changed:
_U ldappas/trunk/
A ldappas/trunk/bootstrap.py
U ldappas/trunk/buildout.cfg
D ldappas/trunk/setup.cfg
U ldappas/trunk/setup.py
A ldappas/trunk/skels/
A ldappas/trunk/skels/instance/
A ldappas/trunk/skels/instance/site.zcml
-=-
Property changes on: ldappas/trunk
___________________________________________________________________
Name: svn:externals
- bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap
ldapadapter svn://svn.zope.org/repos/main/ldapadapter/trunk
Added: ldappas/trunk/bootstrap.py
===================================================================
--- ldappas/trunk/bootstrap.py (rev 0)
+++ ldappas/trunk/bootstrap.py 2007-06-25 08:24:21 UTC (rev 77031)
@@ -0,0 +1,55 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+
+$Id$
+"""
+
+import os, shutil, sys, tempfile, urllib2
+
+tmpeggs = tempfile.mkdtemp()
+
+try:
+ import pkg_resources
+except ImportError:
+ ez = {}
+ exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+ ).read() in ez
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+
+ import pkg_resources
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+if sys.platform == 'win32':
+ cmd = '"%s"' % cmd # work around spawn lamosity on windows
+
+ws = pkg_resources.working_set
+assert os.spawnle(
+ os.P_WAIT, sys.executable, sys.executable,
+ '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
+ dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse('setuptools')).location
+ ),
+ ) == 0
+
+ws.add_entry(tmpeggs)
+ws.require('zc.buildout')
+import zc.buildout.buildout
+zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+shutil.rmtree(tmpeggs)
Property changes on: ldappas/trunk/bootstrap.py
___________________________________________________________________
Name: svn:keywords
+ Id Rev Date
Name: svn:eol-style
+ native
Modified: ldappas/trunk/buildout.cfg
===================================================================
--- ldappas/trunk/buildout.cfg 2007-06-25 07:59:03 UTC (rev 77030)
+++ ldappas/trunk/buildout.cfg 2007-06-25 08:24:21 UTC (rev 77031)
@@ -1,47 +1,36 @@
[buildout]
-develop = . ldapadapter
-parts = zope3 data instance test-ldappas test-ldapadapter
+develop = .
+parts = openldap python-ldap
+ data instance
+ test
find-links = http://download.zope.org/distribution/
+ http://sourceforge.net/project/showfiles.php?group_id=2072
-[zope3]
-recipe = zc.recipe.zope3checkout
-url = svn://svn.zope.org/repos/main/Zope3/branches/3.3
-
[data]
recipe = zc.recipe.filestorage
[instance]
-recipe = zc.recipe.zope3instance
+recipe = gocept.zope3instance
database = data
-user = faassen:test
-eggs = setuptools
- ldappas
- ldapadapter
-zcml = *
- ldappas
- ldapadapter
+admin-user = faassen
+admin-password = test
+address = 8080
+eggs = ldappas
-[test-ldappas]
+[test]
recipe = zc.recipe.testrunner
eggs = ldappas
-extra-paths = parts/zope3/src
-[test-ldapadapter]
-recipe = zc.recipe.testrunner
-eggs = ldapadapter
-extra-paths = parts/zope3/src
+[openldap]
+recipe = zc.recipe.cmmi
+url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.3.27.tgz
+extra_options= --disable-slapd --disable-backends
-# to install openldap + python-ldap in the buildout. This doesn't work yet
-
-#[openldap]
-#recipe = zc.recipe.cmmi
-#url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-stable/openldap-stable-20060823.tgz
-
-#[python-ldap]
-#recipe = zc.recipe.egg:custom
-#eggs = python-ldap == 2.2.0
-#find-links = http://localhost # /home/faassen/buildout/lpdappas
-#include-dirs = ${buildout:directory}/parts/openldap/include
-#library-dirs = $(buildout:directory}/parts/openldap/lib
-#rpath = $(buildout:directory)/parts/openldap/lib
\ No newline at end of file
+[python-ldap]
+recipe = zc.recipe.egg:custom
+egg = python-ldap
+include-dirs = ${buildout:directory}/parts/openldap/include
+ /sw/include/sasl
+library-dirs = ${buildout:directory}/parts/openldap/lib
+rpath = ${buildout:directory}/parts/openldap/lib
Deleted: ldappas/trunk/setup.cfg
===================================================================
--- ldappas/trunk/setup.cfg 2007-06-25 07:59:03 UTC (rev 77030)
+++ ldappas/trunk/setup.cfg 2007-06-25 08:24:21 UTC (rev 77031)
@@ -1,3 +0,0 @@
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
Modified: ldappas/trunk/setup.py
===================================================================
--- ldappas/trunk/setup.py 2007-06-25 07:59:03 UTC (rev 77030)
+++ ldappas/trunk/setup.py 2007-06-25 08:24:21 UTC (rev 77031)
@@ -17,7 +17,18 @@
license='ZPL 2.1',
keywords='Zope3 authentication ldap',
classifiers = ['Framework :: Zope 3'],
- install_requires=['ldapadapter'],
+ install_requires=[
+ 'ZODB3',
+ 'ldapadapter>0.6',
+ 'setuptools',
+ 'zope.annotation',
+ 'zope.app.authentication',
+ 'zope.app.component',
+ 'zope.app.container',
+ 'zope.app.onlinehelp',
+ 'zope.app.zapi',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.schema',
+ ],
)
-
-
Added: ldappas/trunk/skels/instance/site.zcml
===================================================================
--- ldappas/trunk/skels/instance/site.zcml (rev 0)
+++ ldappas/trunk/skels/instance/site.zcml 2007-06-25 08:24:21 UTC (rev 77031)
@@ -0,0 +1,14 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+ <include file="base.zcml" />
+
+ <include package="zope.app.onlinehelp" file="meta.zcml"/>
+ <include package="zope.app.onlinehelp"/>
+
+ <include package="ldapadapter" />
+ <include package="ldappas" />
+
+ <include file="securitypolicy.zcml" />
+ <include file="principals.zcml" />
+
+</configure>
Property changes on: ldappas/trunk/skels/instance/site.zcml
___________________________________________________________________
Name: svn:executable
+ *
More information about the Checkins
mailing list