[Erp5-report] r37229 leonardo - /erp5/trunk/utils/erp5.recipe.mysqldatabase/

[nobody at svn.erp5.org]

Author: leonardo
Date: Wed Jul 21 22:24:40 2010
New Revision: 37229

URL: http://svn.erp5.org?rev=37229&view=rev
Log:
Add [standalone] variant for automatic inclusion of MySQL-python dependency

Modified:
    erp5/trunk/utils/erp5.recipe.mysqldatabase/CHANGES.txt
    erp5/trunk/utils/erp5.recipe.mysqldatabase/README.txt
    erp5/trunk/utils/erp5.recipe.mysqldatabase/setup.py

Modified: erp5/trunk/utils/erp5.recipe.mysqldatabase/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.mysqldatabase/CHANGES.txt?rev=37229&r1=37228&r2=37229&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.mysqldatabase/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.mysqldatabase/CHANGES.txt [utf8] Wed Jul 21 22:24:40 2010
@@ -1,8 +1,16 @@
 Changelog
 =========
 
+1.0.3 (unreleased)
+------------------
+
+- Add 'extra' variant named [standalone] that specifies the MySQL-python
+  dependency so that parts running with a naked python can make this
+  recipe work by specifying "recipe = erp5.recipe.mysqldatabase[standalone]"
+  [Leonardo Rochael Almeida]
+
 1.0.2 (2010-07-15)
-----------------
+------------------
 
 - Bugfix: do not specify MySQL-python as requirement, because in used
   environment it triggers installation of this egg, despite the fact that
@@ -10,7 +18,7 @@ Changelog
   [Lukasz Nowak]
 
 1.0.1 (2010-04-15)
-----------------
+------------------
 
 - Initial eggified version
   [Lukasz Nowak]

Modified: erp5/trunk/utils/erp5.recipe.mysqldatabase/README.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.mysqldatabase/README.txt?rev=37229&r1=37228&r2=37229&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.mysqldatabase/README.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.mysqldatabase/README.txt [utf8] Wed Jul 21 22:24:40 2010
@@ -47,3 +47,18 @@ mysql_superpassword
 mysql_force_recreation
   If "true" the database is recreated (Dropped and created), even this
   exists before. By default uses false. 
+
+Variants
+========
+
+Notice that this recipe uses, but doesn't require, MySQL-python, which must
+be installed in the python that is used to run buildout. If you want buildout
+to install MySQL-python for you, you need to select the proper recipe variant,
+like this:
+
+  [default-database]
+  recipe = erp5.recipe.mysqldatabase[standalone]
+  ...
+
+This is a temporary state, to work-around the current 'software-home' setup
+in default buildout to use a locally compiled mysql egg.

Modified: erp5/trunk/utils/erp5.recipe.mysqldatabase/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.mysqldatabase/setup.py?rev=37229&r1=37228&r2=37229&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.mysqldatabase/setup.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.mysqldatabase/setup.py [utf8] Wed Jul 21 22:24:40 2010
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 name = "erp5.recipe.mysqldatabase"
-version = '1.0.2'
+version = '1.0.3'
 
 def read(name):
     return open(name).read()
@@ -29,6 +29,9 @@ setup(
     install_requires = ['zc.recipe.egg',
       # 'MySQL-python' disabled, as is being installed even if available
       ],
+    extras_require=dict(
+      standalone=['MySQL-python'],
+      ),
     namespace_packages = ['erp5', 'erp5.recipe'],
     entry_points = {'zc.buildout': ['default = %s:Recipe' % name]},
     )