Commit ae2bbf31 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

use mysqlclient egg that is a fork of MySQL-python.

parent 2b990f89
......@@ -4,7 +4,7 @@ extends =
../rpy2/buildout.cfg
../pulp/buildout.cfg
../git/buildout.cfg
../mysql-python/buildout.cfg
../python-mysqlclient/buildout.cfg
parts =
manpy
......@@ -32,7 +32,7 @@ eggs = dream
environment = manpy-env
setup-eggs =
${scipy:egg}
${mysql-python:egg}
${python-mysqlclient:egg}
initialization =
${pulp:initialization}
${rpy2:initialization}
[buildout]
extends =
../mariadb/buildout.cfg
../openssl/buildout.cfg
../zlib/buildout.cfg
parts =
python-mysqlclient
[python-mysqlclient-env]
PATH =${mariadb:location}/bin:%(PATH)s
[python-mysqlclient]
recipe = zc.recipe.egg:custom
egg = mysqlclient
environment = python-mysqlclient-env
library-dirs =
${zlib:location}/lib/
${openssl:location}/lib/
rpath =
${mariadb:location}/lib/
${zlib:location}/lib/
${openssl:location}/lib/
......@@ -40,7 +40,7 @@ in software.cfg, replace instance-recipe-egg part by
[instance-recipe-egg]
recipe = zc.recipe.egg
eggs =
${mysql-python:egg}
${python-mysqlclient:egg}
${instance-recipe:egg}
slapos.toolbox[lampconfigure]
......
......@@ -177,7 +177,7 @@ def import_dump(args):
def promise(args):
# This is not a dependency of slapos.cookbook, because it shall be runned
# in a python environment having mysql-python
# in a python environment having mysqlclient
import MySQLdb
user = args['user']
......
......@@ -48,7 +48,7 @@ scipy = 0.13.3
simpy = 3.0.5
zope.dottedname = 4.1.0
tablib = 0.10.0
MySQL-python = 1.2.5
mysqlclient = 1.3.7
# indirect dependancies
cp.recipe.cmd = 0.5
......
......@@ -13,7 +13,7 @@ extends =
#LXML
../../component/lxml-python/buildout.cfg
#END LXML
../../component/mysql-python/buildout.cfg
../../component/python-mysqlclient/buildout.cfg
../../component/pycrypto-python/buildout.cfg
parts =
......@@ -37,7 +37,7 @@ setup = ${neoppod-repository:location}
[neoppod]
recipe = zc.recipe.egg
eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
${mysql-python:egg}
${python-mysqlclient:egg}
ZODB3
ZODB3-patches =
${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch#c5fe331b1e3a930446f93ab4f6e97c6e
......@@ -110,7 +110,6 @@ url = ${:_profile_base_location_}/my.cnf.in
md5sum = febd3ed58043ce1367b86cf6e4e69700
[versions]
MySQL-python = 1.2.5
slapos.recipe.template = 2.9
# patched egg
ZODB3 = 3.10.5+SlapOSPatched001
......@@ -123,6 +122,7 @@ feedparser = 5.2.1
GitPython = 1.0.2
gitdb = 0.6.4
lockfile = 0.10.2
mysqlclient = 1.3.7
paramiko = 1.16.0
pycrypto = 2.6.1
smmap = 0.9.0
......@@ -10,7 +10,7 @@ parts =
extends =
../../component/boinc/buildout.cfg
../../component/mysql-python/buildout.cfg
../../component/python-mysqlclient/buildout.cfg
../../component/gzip/buildout.cfg
../../component/apache/buildout.cfg
../../component/apache-php/buildout.cfg
......@@ -25,7 +25,7 @@ extends =
[instance-egg]
recipe = zc.recipe.egg
eggs =
${mysql-python:egg}
${python-mysqlclient:egg}
slapos.toolbox
#Because Boinc deamon and Boinc sheduler(with apache) work side by side, we deploy
......@@ -64,10 +64,10 @@ app-list = {}
[versions]
pycrypto = 2.6
MySQL-python = 1.2.4
apache-libcloud = 0.12.4
async = 0.6.1
gitdb = 0.5.4
mysqlclient = 1.3.7
plone.recipe.command = 1.1
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.40.4
......
......@@ -472,7 +472,7 @@ initialization =
eggs =
${numpy:egg}
${matplotlib:egg}
${mysql-python:egg}
${python-mysqlclient:egg}
${lxml-python:egg}
${pandas:egg}
${pillow-python:egg}
......@@ -618,7 +618,7 @@ scripts +=
[versions]
# See ../../software/neoppod/software-common.cfg for versions common with NEO:
# neoppod, MySQL-python, slapos.recipe.template & [slapos-deps-eggs]
# neoppod, python-mysqlclient, slapos.recipe.template & [slapos-deps-eggs]
# patched eggs
Acquisition = 2.13.8+SlapOSPatched001
......
......@@ -25,7 +25,7 @@ extends =
../component/zlib/buildout.cfg
../component/stunnel/buildout.cfg
../component/pycrypto-python/buildout.cfg
../component/mysql-python/buildout.cfg
../component/python-mysqlclient/buildout.cfg
../stack/slapos.cfg
[eggs]
......@@ -39,10 +39,10 @@ keep-compile-dir = false
[versions]
# Generated automatically by buildout-versions
MySQL-python = 1.2.3
apache-libcloud = 0.9.1
async = 0.6.1
gitdb = 0.5.4
mysqlclient = 1.3.7
plone.recipe.command = 1.1
slapos.recipe.template = 2.3
slapos.toolbox = 0.40.4
......
......@@ -7,7 +7,7 @@ parts =
apache-php
mariadb
mydumper
mysql-python
python-mysqlclient
rdiff-backup
dropbear
eggs
......@@ -40,7 +40,7 @@ extends =
../../component/lxml-python/buildout.cfg
../../component/mariadb/buildout.cfg
../../component/mydumper/buildout.cfg
../../component/mysql-python/buildout.cfg
../../component/python-mysqlclient/buildout.cfg
../../component/perl/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/sqlite3/buildout.cfg
......@@ -181,10 +181,10 @@ eggs =
slapos.toolbox[lampconfigure]
[versions]
MySQL-python = 1.2.4
apache-libcloud = 0.12.3
async = 0.6.1
gitdb = 0.5.4
mysqlclient = 1.3.7
pycrypto = 2.6
rdiff-backup = 1.0.5
slapos.recipe.template = 2.4.2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment