Commit 61ce36c3 authored by Łukasz Nowak's avatar Łukasz Nowak

Merge remote-tracking branch 'origin/master' into erp5-generic

parents d8a84110 5179aa88
...@@ -122,7 +122,7 @@ meld3 = 0.6.7 ...@@ -122,7 +122,7 @@ meld3 = 0.6.7
netaddr = 0.7.6 netaddr = 0.7.6
setuptools = 0.6c12dev-r88846 setuptools = 0.6c12dev-r88846
slapos.core = 0.20 slapos.core = 0.20
slapos.libnetworkcache = 0.10 slapos.libnetworkcache = 0.11
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2 zc.recipe.egg = 1.3.2
......
...@@ -26,7 +26,6 @@ parts = ...@@ -26,7 +26,6 @@ parts =
subversion subversion
zip zip
git git
checkrecipe
# Separate from site eggs # Separate from site eggs
allowed-eggs-from-site-packages = allowed-eggs-from-site-packages =
...@@ -45,105 +44,8 @@ allow-hosts = ...@@ -45,105 +44,8 @@ allow-hosts =
psutil.googlecode.com psutil.googlecode.com
www.dabeaz.com www.dabeaz.com
develop =
${:parts-directory}/slapos.cookbook-repository
${:parts-directory}/erp5.util-repository
[checkrecipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
[slapos.cookbook-repository]
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
repository = http://git.erp5.org/repos/slapos.git
branch = master
revision = 33e2a6315965925b3585d3dcbe246055bb852cba
command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
[erp5.util-repository]
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
repository = http://git.erp5.org/repos/erp5.git
branch = master
revision = 917d196176e6291d3046abb6177
command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-009
Jinja2 = 2.6
Werkzeug = 0.8.1
buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0
lxml = 2.3.2
meld3 = 0.6.7
plone.recipe.command = 1.1
slapos.core = 0.19
slapos.libnetworkcache = 0.10
slapos.recipe.template = 2.2
# Required by:
# slapos.core==0.19
Flask = 0.8
# Required by:
# slapos.cookbook==0.35
PyXML = 0.8.5
# Required by:
# hexagonit.recipe.cmmi==1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# slapos.cookbook==0.35
netaddr = 0.7.6
# Required by:
# slapos.core==0.19
netifaces = 0.6
# Required by:
# erp5.util==0.3-dev
# slapos.cookbook==0.35
# slapos.core==0.19
# slapos.libnetworkcache==0.10
# zc.buildout==1.5.3-dev-SlapOS-009
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.core==0.19
supervisor = 3.0a10
# Required by:
# slapos.cookbook==0.35
xml-marshaller = 0.9.7
# Required by:
# slapos.cookbook==0.35
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.19
zope.interface = 3.8.0
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
# Just so buildout executes [slapos.cookbook-repository] before [eggs], as
# - [eggs] references [slapos.cookbook-repository]
# - [instance-recipe] needs [slapos.cookbook-repository] to be finished
# - we cannot rely on anything else being executed before [eggs]
dummy =
${slapos.cookbook-repository:location}
${erp5.util-repository:location}
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
zc.buildout zc.buildout
...@@ -199,3 +101,62 @@ signature-certificate-list = ...@@ -199,3 +101,62 @@ signature-certificate-list =
R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg== hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-----END CERTIFICATE----- -----END CERTIFICATE-----
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-003
Jinja2 = 2.6
Werkzeug = 0.8.2
erp5.util = 0.3
hexagonit.recipe.cmmi = 1.5.0
lxml = 2.3.2
meld3 = 0.6.7
slapos.cookbook = 0.38
slapos.core = 0.21
slapos.libnetworkcache = 0.11
slapos.recipe.template = 2.2
# Required by:
# slapos.core==0.21
Flask = 0.8
# Required by:
# slapos.cookbook==0.38
PyXML = 0.8.5
# Required by:
# hexagonit.recipe.cmmi==1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# slapos.cookbook==0.38
netaddr = 0.7.6
# Required by:
# slapos.core==0.21
netifaces = 0.6
# Required by:
# erp5.util==0.3
# slapos.cookbook==0.38
# slapos.core==0.21
# slapos.libnetworkcache==0.11
# zc.buildout==1.6.0-dev-SlapOS-003
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.core==0.21
supervisor = 3.0a12
# Required by:
# slapos.cookbook==0.38
xml-marshaller = 0.9.7
# Required by:
# slapos.cookbook==0.38
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.21
zope.interface = 3.8.0
...@@ -49,7 +49,7 @@ buildout-versions = 1.7 ...@@ -49,7 +49,7 @@ buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0 hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.7 meld3 = 0.6.7
slapos.cookbook = 0.31 slapos.cookbook = 0.31
slapos.libnetworkcache = 0.10 slapos.libnetworkcache = 0.11
slapos.recipe.template = 2.2 slapos.recipe.template = 2.2
slapos.toolbox = 0.8 slapos.toolbox = 0.8
...@@ -77,7 +77,7 @@ netaddr = 0.7.6 ...@@ -77,7 +77,7 @@ netaddr = 0.7.6
# Required by: # Required by:
# slapos.core==0.18 # slapos.core==0.18
netifaces = 0.5 netifaces = 0.6
# Required by: # Required by:
# slapos.toolbox==0.8 # slapos.toolbox==0.8
......
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