[Checkins] SVN: Grokstar/trunk/ Updated Grokstar to use z3c.autoinclude and eggbasket

Vincent Fretin vincent.fretin at gmail.com
Mon Aug 11 13:24:51 EDT 2008


Log message for revision 89675:
  Updated Grokstar to use z3c.autoinclude and eggbasket

Changed:
  U   Grokstar/trunk/bootstrap.py
  U   Grokstar/trunk/buildout.cfg
  U   Grokstar/trunk/src/grokstar/configure.zcml
  A   Grokstar/trunk/versions.cfg

-=-
Modified: Grokstar/trunk/bootstrap.py
===================================================================
--- Grokstar/trunk/bootstrap.py	2008-08-11 17:08:18 UTC (rev 89674)
+++ Grokstar/trunk/bootstrap.py	2008-08-11 17:24:49 UTC (rev 89675)
@@ -17,28 +17,38 @@
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
 
-$Id: bootstrap.py 69908 2006-08-31 21:53:00Z jim $
+$Id: bootstrap.py 85041 2008-03-31 15:57:30Z andreasjung $
 """
 
 import os, shutil, sys, tempfile, urllib2
 
 tmpeggs = tempfile.mkdtemp()
 
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                     ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+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
+    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
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
 
-ws = pkg_resources.working_set
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws  = pkg_resources.working_set
 assert os.spawnle(
-    os.P_WAIT, sys.executable, sys.executable,
-    '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
+    os.P_WAIT, sys.executable, quote (sys.executable),
+    '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
     dict(os.environ,
          PYTHONPATH=
          ws.find(pkg_resources.Requirement.parse('setuptools')).location
@@ -50,3 +60,7 @@
 import zc.buildout.buildout
 zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
 shutil.rmtree(tmpeggs)
+
+# grokproject specific addition to standard bootstrap.py:
+# Install eggbasket too.
+zc.buildout.buildout.main(sys.argv[1:] + ['install', 'eggbasket'])

Modified: Grokstar/trunk/buildout.cfg
===================================================================
--- Grokstar/trunk/buildout.cfg	2008-08-11 17:08:18 UTC (rev 89674)
+++ Grokstar/trunk/buildout.cfg	2008-08-11 17:24:49 UTC (rev 89675)
@@ -1,20 +1,18 @@
 [buildout]
 develop = .
-parts = app data zopectl test
-find-links = http://download.zope.org/distribution/
+parts = eggbasket app data zopectl test
 newest = false
-extends= http://grok.zope.org/releaseinfo/grok-0.13.cfg
+extends = versions.cfg
+# eggs will be installed in the default buildout location
+# (see .buildout/default.cfg in your home directory)
+# unless you specify an eggs-directory option here.
+
 versions = versions
 
-[data]
-recipe = zc.recipe.filestorage
-
 [app]
 recipe = zc.zope3recipes>=0.5.3:application
 eggs = Grokstar
-site.zcml = <include package="zope.sendmail" file="meta.zcml" />
-            <include package="grokstar" />
-            <include package="zope.sendmail" />
+site.zcml = <include package="grokstar" />
             <include package="zope.app.twisted" />
 
             <unauthenticatedPrincipal id="zope.anybody"
@@ -45,6 +43,10 @@
             <grant role="zope.Manager"
                    principal="zope.manager" />
 
+[data]
+recipe = zc.recipe.filestorage
+
+# this section named so that the start/stop script is called bin/zopectl
 [zopectl]
 recipe = zc.zope3recipes:instance
 address = 8086
@@ -55,3 +57,8 @@
 recipe = zc.recipe.testrunner
 eggs = grokstar
 defaults = ['--tests-pattern', '^f?tests$', '-v']
+
+[eggbasket]
+recipe = z3c.recipe.eggbasket
+eggs = grok
+url = http://grok.zope.org/releaseinfo/grok-eggs-0.13.tgz

Modified: Grokstar/trunk/src/grokstar/configure.zcml
===================================================================
--- Grokstar/trunk/src/grokstar/configure.zcml	2008-08-11 17:08:18 UTC (rev 89674)
+++ Grokstar/trunk/src/grokstar/configure.zcml	2008-08-11 17:24:49 UTC (rev 89675)
@@ -1,6 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:grok="http://namespaces.zope.org/grok">
   <include package="grok" />
+  <includeDependencies package="." /> 
   <include package=".mail" />
   <grok:grok package="." />
 </configure>

Added: Grokstar/trunk/versions.cfg
===================================================================
--- Grokstar/trunk/versions.cfg	                        (rev 0)
+++ Grokstar/trunk/versions.cfg	2008-08-11 17:24:49 UTC (rev 89675)
@@ -0,0 +1,123 @@
+# This file contains a list of versions of the various grok modules that
+# belong together.
+# It was downloaded from http://grok.zope.org/releaseinfo/grok-0.13.cfg
+# when this project was created.
+
+[versions]
+grok = 0.13
+ClientForm = 0.2.7
+Pygments = 0.8.1
+RestrictedPython = 3.4.2
+ZConfig = 2.5.1
+ZODB3 = 3.8
+docutils = 0.4
+martian = 0.10
+grokcore.component = 1.4
+mechanize = 0.1.7b
+pytz = 2007k
+simplejson = 1.7.1
+z3c.autoinclude = 0.2.2
+z3c.flashmessage = 1.0
+z3c.testsetup = 0.2.1
+zc.catalog = 1.2
+zdaemon = 2.0.1
+zodbcode = 3.4
+zope.annotation = 3.4
+zope.app.apidoc = 3.4.3
+zope.app.applicationcontrol = 3.4.1
+zope.app.appsetup = 3.4.1
+zope.app.authentication = 3.4.1
+zope.app.basicskin = 3.4
+zope.app.broken = 3.4
+zope.app.catalog = 3.5.1
+zope.app.component = 3.4.1
+zope.app.container = 3.5.3
+zope.app.content = 3.4
+zope.app.debug = 3.4
+zope.app.dependable = 3.4
+zope.app.error = 3.5.1
+zope.app.exception = 3.4.1
+zope.app.file = 3.4.2
+zope.app.folder = 3.4
+zope.app.form = 3.4.1
+zope.app.generations = 3.4.1
+zope.app.http = 3.4.1
+zope.app.i18n = 3.4.4
+zope.app.interface = 3.4
+zope.app.intid = 3.4.1
+zope.app.keyreference = 3.4.1
+zope.app.locales = 3.4.1
+zope.app.onlinehelp = 3.4.1
+zope.app.pagetemplate = 3.4
+zope.app.preference = 3.4.1
+zope.app.principalannotation = 3.4
+zope.app.publication = 3.4.3
+zope.app.publisher = 3.4.1
+zope.app.renderer = 3.4
+zope.app.rotterdam = 3.4.1
+zope.app.schema = 3.4
+zope.app.security = 3.4
+zope.app.securitypolicy = 3.4.6
+zope.app.server = 3.4
+zope.app.session = 3.5.1
+zope.app.skins = 3.4
+zope.app.testing = 3.4.1
+zope.app.tree = 3.4
+zope.app.twisted = 3.4
+zope.app.wsgi = 3.4
+zope.app.zapi = 3.4
+zope.app.zcmlfiles = 3.4.3
+zope.app.zopeappgenerations = 3.4
+zope.cachedescriptors = 3.4
+zope.component = 3.4
+zope.configuration = 3.4
+zope.contentprovider = 3.4
+zope.contenttype = 3.4
+zope.copypastemove = 3.4
+zope.datetime = 3.4
+zope.deferredimport = 3.4
+zope.deprecation = 3.4
+zope.dottedname = 3.4.2
+zope.dublincore = 3.4
+zope.error = 3.5.1
+zope.event = 3.4
+zope.exceptions = 3.4
+zope.filerepresentation = 3.4
+zope.formlib = 3.4
+zope.hookable = 3.4
+zope.i18n = 3.4
+zope.i18nmessageid = 3.4.3
+zope.index = 3.4.1
+zope.interface = 3.4.1
+zope.lifecycleevent = 3.4
+zope.location = 3.4
+zope.minmax = 1.1
+zope.modulealias = 3.4
+zope.pagetemplate = 3.4
+zope.proxy = 3.4
+zope.publisher = 3.4.2
+zope.schema = 3.4
+zope.security = 3.4
+zope.securitypolicy = 3.4
+zope.server = 3.4.1
+zope.session = 3.4.1
+zope.size = 3.4
+zope.structuredtext = 3.4
+zope.tal = 3.4.1
+zope.tales = 3.4
+zope.testbrowser = 3.4.2
+zope.testing = 3.5.1
+zope.thread = 3.4
+zope.traversing = 3.4.0
+zope.viewlet = 3.4.2
+
+
+# Here we pin the recipes used in the buildout.cfg
+lovely.recipe = 0.3.1b5
+z3c.recipe.eggbasket = 0.3.1
+zc.buildout = 1.0.6
+zc.recipe.egg = 1.1.0b1
+zc.recipe.filestorage = 1.0.1
+zc.recipe.testrunner = 1.0.0
+zc.zodbrecipes = 0.4.0
+zc.zope3recipes = 0.7.0



More information about the Checkins mailing list