[Checkins] SVN: z3c.recipe.compattest/trunk/ Moved the gathering of include-dependencies from the __init__ to the update method to prevent installing dependencies before other buildout parts could do their job.

[Jan-Jaap Driessen]

Log message for revision 109417:
  Moved the gathering of include-dependencies from the __init__ to the update method to prevent installing dependencies before other buildout parts could do their job.

Changed:
  U   z3c.recipe.compattest/trunk/CHANGES.txt
  U   z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py

-=-
Modified: z3c.recipe.compattest/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.compattest/trunk/CHANGES.txt	2010-02-24 15:54:18 UTC (rev 109416)
+++ z3c.recipe.compattest/trunk/CHANGES.txt	2010-02-24 17:04:28 UTC (rev 109417)
@@ -5,9 +5,10 @@
 0.13 (unreleased)
 =================
 
-- Nothing changed yet.
+- Moved the gathering of include-dependencies from the __init__ to the update
+  method to prevent installing dependencies before other buildout parts could
+  do their job.
 
-
 0.12.1 (2009-12-15)
 ===================
 

Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py	2010-02-24 15:54:18 UTC (rev 109416)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py	2010-02-24 17:04:28 UTC (rev 109417)
@@ -29,7 +29,6 @@
             self.options.get('include-dependencies', ''), [])
         self.exclude = string2list(self.options.get('exclude', ''), [])
         self.extra_paths = self.options.get('extra-paths', '')
-        self.wanted_packages = self._wanted_packages()
 
         self.script = self.options.get('script', self.name)
 
@@ -44,14 +43,15 @@
         return self.update()
 
     def update(self):
+        wanted_packages = self._wanted_packages()
         installed = []
-        installed.extend(self._install_testrunners())
-        installed.extend(self._install_run_script())
+        installed.extend(self._install_testrunners(wanted_packages))
+        installed.extend(self._install_run_script(wanted_packages))
         return installed
 
-    def _install_testrunners(self):
+    def _install_testrunners(self, wanted_packages):
         installed = []
-        for package in self.wanted_packages:
+        for package in wanted_packages:
             ws = self._working_set(package)
             package_ = ws.find(pkg_resources.Requirement.parse(package))
             extras = '[' + ','.join(package_.extras) + ']'
@@ -66,10 +66,10 @@
             installed.extend(recipe.install())
         return installed
 
-    def _install_run_script(self):
+    def _install_run_script(self, wanted_packages):
         bindir = self.buildout['buildout']['bin-directory']
         runners = ['%s-%s' % (self.name, package) for package
-                        in self.wanted_packages]
+                        in wanted_packages]
         runners = [repr(os.path.join(bindir, runner)) for runner in runners]
 
         return zc.buildout.easy_install.scripts(