Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
slapos
Commits
ae2bbf31
Commit
ae2bbf31
authored
Feb 29, 2016
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use mysqlclient egg that is a fork of MySQL-python.
parent
2b990f89
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
41 additions
and
18 deletions
+41
-18
component/manpy/buildout.cfg
component/manpy/buildout.cfg
+2
-2
component/python-mysqlclient/buildout.cfg
component/python-mysqlclient/buildout.cfg
+23
-0
slapos/recipe/README.lamp.txt
slapos/recipe/README.lamp.txt
+1
-1
slapos/recipe/mysql/__init__.py
slapos/recipe/mysql/__init__.py
+1
-1
software/dream/software.cfg
software/dream/software.cfg
+1
-1
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+3
-3
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+3
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/lamp.cfg
stack/lamp.cfg
+2
-2
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-3
No files found.
component/manpy/buildout.cfg
View file @
ae2bbf31
...
@@ -4,7 +4,7 @@ extends =
...
@@ -4,7 +4,7 @@ extends =
../rpy2/buildout.cfg
../rpy2/buildout.cfg
../pulp/buildout.cfg
../pulp/buildout.cfg
../git/buildout.cfg
../git/buildout.cfg
../
mysql-python
/buildout.cfg
../
python-mysqlclient
/buildout.cfg
parts =
parts =
manpy
manpy
...
@@ -32,7 +32,7 @@ eggs = dream
...
@@ -32,7 +32,7 @@ eggs = dream
environment = manpy-env
environment = manpy-env
setup-eggs =
setup-eggs =
${scipy:egg}
${scipy:egg}
${
mysql-python
:egg}
${
python-mysqlclient
:egg}
initialization =
initialization =
${pulp:initialization}
${pulp:initialization}
${rpy2:initialization}
${rpy2:initialization}
component/python-mysqlclient/buildout.cfg
0 → 100644
View file @
ae2bbf31
[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/
slapos/recipe/README.lamp.txt
View file @
ae2bbf31
...
@@ -40,7 +40,7 @@ in software.cfg, replace instance-recipe-egg part by
...
@@ -40,7 +40,7 @@ in software.cfg, replace instance-recipe-egg part by
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs =
eggs =
${
mysql-python
:egg}
${
python-mysqlclient
:egg}
${instance-recipe:egg}
${instance-recipe:egg}
slapos.toolbox[lampconfigure]
slapos.toolbox[lampconfigure]
...
...
slapos/recipe/mysql/__init__.py
View file @
ae2bbf31
...
@@ -177,7 +177,7 @@ def import_dump(args):
...
@@ -177,7 +177,7 @@ def import_dump(args):
def
promise
(
args
):
def
promise
(
args
):
# This is not a dependency of slapos.cookbook, because it shall be runned
# 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 mysql
client
import
MySQLdb
import
MySQLdb
user
=
args
[
'user'
]
user
=
args
[
'user'
]
...
...
software/dream/software.cfg
View file @
ae2bbf31
...
@@ -48,7 +48,7 @@ scipy = 0.13.3
...
@@ -48,7 +48,7 @@ scipy = 0.13.3
simpy = 3.0.5
simpy = 3.0.5
zope.dottedname = 4.1.0
zope.dottedname = 4.1.0
tablib = 0.10.0
tablib = 0.10.0
MySQL-python = 1.2.5
mysqlclient = 1.3.7
# indirect dependancies
# indirect dependancies
cp.recipe.cmd = 0.5
cp.recipe.cmd = 0.5
...
...
software/neoppod/software-common.cfg
View file @
ae2bbf31
...
@@ -13,7 +13,7 @@ extends =
...
@@ -13,7 +13,7 @@ extends =
#LXML
#LXML
../../component/lxml-python/buildout.cfg
../../component/lxml-python/buildout.cfg
#END LXML
#END LXML
../../component/
mysql-python
/buildout.cfg
../../component/
python-mysqlclient
/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
parts =
parts =
...
@@ -37,7 +37,7 @@ setup = ${neoppod-repository:location}
...
@@ -37,7 +37,7 @@ setup = ${neoppod-repository:location}
[neoppod]
[neoppod]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
${
mysql-python
:egg}
${
python-mysqlclient
:egg}
ZODB3
ZODB3
ZODB3-patches =
ZODB3-patches =
${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch#c5fe331b1e3a930446f93ab4f6e97c6e
${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch#c5fe331b1e3a930446f93ab4f6e97c6e
...
@@ -110,7 +110,6 @@ url = ${:_profile_base_location_}/my.cnf.in
...
@@ -110,7 +110,6 @@ url = ${:_profile_base_location_}/my.cnf.in
md5sum = febd3ed58043ce1367b86cf6e4e69700
md5sum = febd3ed58043ce1367b86cf6e4e69700
[versions]
[versions]
MySQL-python = 1.2.5
slapos.recipe.template = 2.9
slapos.recipe.template = 2.9
# patched egg
# patched egg
ZODB3 = 3.10.5+SlapOSPatched001
ZODB3 = 3.10.5+SlapOSPatched001
...
@@ -123,6 +122,7 @@ feedparser = 5.2.1
...
@@ -123,6 +122,7 @@ feedparser = 5.2.1
GitPython = 1.0.2
GitPython = 1.0.2
gitdb = 0.6.4
gitdb = 0.6.4
lockfile = 0.10.2
lockfile = 0.10.2
mysqlclient = 1.3.7
paramiko = 1.16.0
paramiko = 1.16.0
pycrypto = 2.6.1
pycrypto = 2.6.1
smmap = 0.9.0
smmap = 0.9.0
stack/boinc/buildout.cfg
View file @
ae2bbf31
...
@@ -10,7 +10,7 @@ parts =
...
@@ -10,7 +10,7 @@ parts =
extends =
extends =
../../component/boinc/buildout.cfg
../../component/boinc/buildout.cfg
../../component/
mysql-python
/buildout.cfg
../../component/
python-mysqlclient
/buildout.cfg
../../component/gzip/buildout.cfg
../../component/gzip/buildout.cfg
../../component/apache/buildout.cfg
../../component/apache/buildout.cfg
../../component/apache-php/buildout.cfg
../../component/apache-php/buildout.cfg
...
@@ -25,7 +25,7 @@ extends =
...
@@ -25,7 +25,7 @@ extends =
[instance-egg]
[instance-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs =
eggs =
${
mysql-python
:egg}
${
python-mysqlclient
:egg}
slapos.toolbox
slapos.toolbox
#Because Boinc deamon and Boinc sheduler(with apache) work side by side, we deploy
#Because Boinc deamon and Boinc sheduler(with apache) work side by side, we deploy
...
@@ -64,10 +64,10 @@ app-list = {}
...
@@ -64,10 +64,10 @@ app-list = {}
[versions]
[versions]
pycrypto = 2.6
pycrypto = 2.6
MySQL-python = 1.2.4
apache-libcloud = 0.12.4
apache-libcloud = 0.12.4
async = 0.6.1
async = 0.6.1
gitdb = 0.5.4
gitdb = 0.5.4
mysqlclient = 1.3.7
plone.recipe.command = 1.1
plone.recipe.command = 1.1
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.40.4
slapos.toolbox = 0.40.4
...
...
stack/erp5/buildout.cfg
View file @
ae2bbf31
...
@@ -472,7 +472,7 @@ initialization =
...
@@ -472,7 +472,7 @@ initialization =
eggs =
eggs =
${numpy:egg}
${numpy:egg}
${matplotlib:egg}
${matplotlib:egg}
${
mysql-python
:egg}
${
python-mysqlclient
:egg}
${lxml-python:egg}
${lxml-python:egg}
${pandas:egg}
${pandas:egg}
${pillow-python:egg}
${pillow-python:egg}
...
@@ -618,7 +618,7 @@ scripts +=
...
@@ -618,7 +618,7 @@ scripts +=
[versions]
[versions]
# See ../../software/neoppod/software-common.cfg for versions common with NEO:
# 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
# patched eggs
Acquisition = 2.13.8+SlapOSPatched001
Acquisition = 2.13.8+SlapOSPatched001
...
...
stack/lamp.cfg
View file @
ae2bbf31
...
@@ -25,7 +25,7 @@ extends =
...
@@ -25,7 +25,7 @@ extends =
../component/zlib/buildout.cfg
../component/zlib/buildout.cfg
../component/stunnel/buildout.cfg
../component/stunnel/buildout.cfg
../component/pycrypto-python/buildout.cfg
../component/pycrypto-python/buildout.cfg
../component/
mysql-python
/buildout.cfg
../component/
python-mysqlclient
/buildout.cfg
../stack/slapos.cfg
../stack/slapos.cfg
[eggs]
[eggs]
...
@@ -39,10 +39,10 @@ keep-compile-dir = false
...
@@ -39,10 +39,10 @@ keep-compile-dir = false
[versions]
[versions]
# Generated automatically by buildout-versions
# Generated automatically by buildout-versions
MySQL-python = 1.2.3
apache-libcloud = 0.9.1
apache-libcloud = 0.9.1
async = 0.6.1
async = 0.6.1
gitdb = 0.5.4
gitdb = 0.5.4
mysqlclient = 1.3.7
plone.recipe.command = 1.1
plone.recipe.command = 1.1
slapos.recipe.template = 2.3
slapos.recipe.template = 2.3
slapos.toolbox = 0.40.4
slapos.toolbox = 0.40.4
...
...
stack/lamp/buildout.cfg
View file @
ae2bbf31
...
@@ -7,7 +7,7 @@ parts =
...
@@ -7,7 +7,7 @@ parts =
apache-php
apache-php
mariadb
mariadb
mydumper
mydumper
mysql-python
python-mysqlclient
rdiff-backup
rdiff-backup
dropbear
dropbear
eggs
eggs
...
@@ -40,7 +40,7 @@ extends =
...
@@ -40,7 +40,7 @@ extends =
../../component/lxml-python/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/mariadb/buildout.cfg
../../component/mariadb/buildout.cfg
../../component/mydumper/buildout.cfg
../../component/mydumper/buildout.cfg
../../component/
mysql-python
/buildout.cfg
../../component/
python-mysqlclient
/buildout.cfg
../../component/perl/buildout.cfg
../../component/perl/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/sqlite3/buildout.cfg
../../component/sqlite3/buildout.cfg
...
@@ -181,10 +181,10 @@ eggs =
...
@@ -181,10 +181,10 @@ eggs =
slapos.toolbox[lampconfigure]
slapos.toolbox[lampconfigure]
[versions]
[versions]
MySQL-python = 1.2.4
apache-libcloud = 0.12.3
apache-libcloud = 0.12.3
async = 0.6.1
async = 0.6.1
gitdb = 0.5.4
gitdb = 0.5.4
mysqlclient = 1.3.7
pycrypto = 2.6
pycrypto = 2.6
rdiff-backup = 1.0.5
rdiff-backup = 1.0.5
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment