[Erp5-report] r37602 leonardo - in /erp5/trunk/utils/erp5.recipe.standaloneinstance: ./ src...

[nobody at svn.erp5.org]

Author: leonardo
Date: Fri Aug  6 15:34:47 2010
New Revision: 37602

URL: http://svn.erp5.org?rev=37602&view=rev
Log:
mimic the extras layout in erp5.recipe.testrunner, so MySQLdb can be pulled automatically when needed

Modified:
    erp5/trunk/utils/erp5.recipe.standaloneinstance/CHANGES.txt
    erp5/trunk/utils/erp5.recipe.standaloneinstance/setup.py
    erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py

Modified: erp5/trunk/utils/erp5.recipe.standaloneinstance/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.standaloneinstance/CHANGES.txt?rev=37602&r1=37601&r2=37602&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.standaloneinstance/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.standaloneinstance/CHANGES.txt [utf8] Fri Aug  6 15:34:47 2010
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.4.2 (2010-06-10)
+----------------
+
+ - Provide [standalone] extras_require to pull in
+   erp5.recipe.mysqldatabase[standalone] and only import
+   erp5.recipe.mysqldatabase if really needed
+   [Leonardo Rochael Almeida]
+
 0.4.1 (2010-06-10)
 ----------------
 

Modified: erp5/trunk/utils/erp5.recipe.standaloneinstance/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.standaloneinstance/setup.py?rev=37602&r1=37601&r2=37602&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.standaloneinstance/setup.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.standaloneinstance/setup.py [utf8] Fri Aug  6 15:34:47 2010
@@ -34,6 +34,9 @@ setup(
         'plone.recipe.zope2instance',
         'erp5.recipe.mysqldatabase',
     ],
+    extras_require=dict(
+        standalone = ['erp5.recipe.mysqldatabase[standalone]'],
+    ),
     zip_safe=False,
     entry_points = {'zc.buildout': ['default = %s:Recipe' % name]},
     )

Modified: erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py?rev=37602&r1=37601&r2=37602&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] Fri Aug  6 15:34:47 2010
@@ -17,7 +17,6 @@ import os, sys, subprocess, socket
 from string import Template
 import zc.buildout
 import plone.recipe.zope2instance
-import erp5.recipe.mysqldatabase
 
 class WithMinusTemplate(Template):
   idpattern = '[_a-z][-_a-z0-9]*'
@@ -62,6 +61,7 @@ class Recipe(plone.recipe.zope2instance.
 
     if options.get('mysql_create_database', 'false').lower() == 'true':
        # Use mysqldatabase recipe for Create the mysql database.
+       import erp5.recipe.mysqldatabase
        erp5.recipe.mysqldatabase.Recipe(self.buildout, self.name, self.options).install()