[Checkins] SVN: grokproject/trunk/grokproject/ include-site-packages = false for buildout.cfg in generated projects

[Jan-Wijbrand Kolman]

Log message for revision 117725:
  include-site-packages = false for buildout.cfg in generated projects

Changed:
  U   grokproject/trunk/grokproject/template/buildout.cfg_tmpl
  U   grokproject/trunk/grokproject/utils.py

-=-
Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2010-10-18 15:23:27 UTC (rev 117724)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2010-10-18 16:05:47 UTC (rev 117725)
@@ -2,6 +2,7 @@
 extends = ${version_info_url}
 extends-cache = extends-cache
 find-links = ${find_links_url}
+include-site-packages = false
 develop = .
 parts =
     app

Modified: grokproject/trunk/grokproject/utils.py
===================================================================
--- grokproject/trunk/grokproject/utils.py	2010-10-18 15:23:27 UTC (rev 117724)
+++ grokproject/trunk/grokproject/utils.py	2010-10-18 16:05:47 UTC (rev 117725)
@@ -119,7 +119,9 @@
         tmpdir = tempfile.mkdtemp()
         sys.path.append(tmpdir)
         setuptools.command.easy_install.main(
-            extra_args + ['-mNxd', tmpdir, 'zc.buildout'])
+            extra_args + ['-mNxd', tmpdir, 'zc.buildout==1.5.1'])
+        setuptools.command.easy_install.main(
+            extra_args + ['-mNxd', tmpdir, 'setuptools==0.6c11'])
 
         # Add downloaded buildout to PYTHONPATH by requiring it
         # through setuptools (this dance is necessary because the
@@ -127,6 +129,7 @@
         ws = pkg_resources.working_set
         ws.add_entry(tmpdir)
         ws.require('zc.buildout')
+        ws.require('setuptools')
 
         import zc.buildout.buildout
         zc.buildout.buildout.main(extra_args + ['bootstrap'])