Skip to content

S
slapos
Commit 8f391ef6 authored by Kristopher Ruzic's avatar Kristopher Ruzic
2 Browse files
Options

apply patch for erp5-cluster release

parent 9e5385bc
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 56 deletions
patch.pl 0 → 100644
View file @ 8f391ef6
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index e65862a..7d19956 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -601,34 +601,10 @@ ZODB3 = 3.10.5+SlapOSPatched001
# specify dev version to be sure that an old released version is not used
cloudooo = 1.2.5-dev
-# use newer version than specified in ZTK
-PasteDeploy = 1.5.2
-Pygments = 2.0.2
-coverage = 3.7.1
-
-# test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
-Products.PluggableAuthService = 1.9.0
-
# official pysvn egg does not supports --include-dirs and
# --library-dirs, so we use our modified version
pysvn = 1.7.4nxd006
-# we are still using this old stable version.
-rdiff-backup = 1.0.5
-
-# use newest version of slapos.cookbook
-slapos.cookbook =
-
-# modified version that works fine for buildout installation
-SOAPpy = 0.12.0nxd001
-
-# CMF 2.3 is not yet supported.
-Products.CMFCalendar = 2.2.3
-Products.CMFCore = 2.2.8
-Products.CMFDefault = 2.2.4
-Products.CMFTopic = 2.2.1
-Products.CMFUid = 2.2.1
-
# newer version requires zope.traversing>=4.0.0a2.
zope.app.appsetup = 3.16.0
@@ -638,115 +614,129 @@ zope.app.publication = 3.14.0
# newer version requires zope.testbrowser>=4
zope.app.testing = 3.8.1
-# Pinned versions
+# auto generated list
MySQL-python = 1.2.5
-Pillow = 2.7.0
+Pillow = 2.8.1
Products.CMFActionIcons = 2.1.3
+Products.CMFCalendar = 2.3.0b0
+Products.CMFCore = 2.3.0
+Products.CMFDefault = 2.3.0b2
+Products.CMFTopic = 2.3.0b0
+Products.CMFUid = 2.3.0b0
Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 1.1.0
Products.GenericSetup = 1.7.5
Products.LongRequestLogger = 1.1.0
Products.MimetypesRegistry = 2.0.7
+Products.PluggableAuthService = 1.10.0
Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9
PyPDF2 = 1.24
PyXML = 0.8.5
-Pympler = 0.4
+Pympler = 0.4.1
+SOAPpy = 0.12.22
StructuredText = 2.11.1
WSGIUtils = 0.7
apache-libcloud = 0.17.0
astroid = 1.3.6
chardet = 2.3.0
-collective.recipe.template = 1.11
csp-eventlet = 0.7.0
ecdsa = 0.13
elementtree = 1.2.6.post20050316
-erp5diff = 0.8.1.5
-eventlet = 0.17.1
-five.formlib = 1.0.4
+erp5diff = 0.8.1.7
+eventlet = 0.17.4
five.localsitemanager = 2.0.5
gitdb = 0.6.4
-greenlet = 0.4.5
+greenlet = 0.4.7
http-parser = 0.8.3
-httplib2 = 0.9
+httplib2 = 0.9.1
huBarcode = 1.0.0
interval = 1.0.0
-ipdb = 0.8
-ipython = 3.0.0
+ipdb = 0.8.1
+ipython = 3.1.0
logilab-common = 0.63.2
+neoppod = 1.3
numpy = 1.9.2
plone.recipe.command = 1.1
-ply = 3.4
+ply = 3.6
polib = 1.0.6
-pprofile = 1.7.2
+pprofile = 1.7.3
pycountry = 1.10
pycrypto = 2.6.1
-pyflakes = 0.8.1
+pyflakes = 0.9.0
pylint = 1.4.3
python-ldap = 2.4.19
python-magic = 0.4.6
python-memcached = 1.54
qrcode = 5.1
+rdiff-backup = 1.0.5
restkit = 4.2.2
rtjp-eventlet = 0.3.2
-slapos.recipe.template = 2.6
-slapos.toolbox = 0.47.3
+slapos.recipe.template = 2.7
+slapos.toolbox = 0.48
smmap = 0.9.0
socketpool = 0.5.3
spyne = 2.11.0
suds = 0.4
threadframe = 0.2
timerserver = 2.0.2
-urlnorm = 1.1.2
+urlnorm = 1.1.3
uuid = 1.30
validictory = 1.0.0
+xfw = 0.10
xupdate-processor = 0.4
-
+
# Required by:
-# slapos.toolbox==0.47.3
-GitPython = 0.3.6
+# slapos.toolbox==0.48
+GitPython = 1.0.1
# Required by:
-# Products.CMFCore==2.2.8
+# Products.CMFCore==2.3.0
Products.ZSQLMethods = 2.13.4
-
+
# Required by:
-# slapos.toolbox==0.47.3
+# slapos.toolbox==0.48
atomize = 0.2.0
-
+
# Required by:
# apache-libcloud==0.17.0
backports.ssl-match-hostname = 3.4.0.2
-
+
# Required by:
-# slapos.toolbox==0.47.3
-feedparser = 5.1.3
-
+# SOAPpy==0.12.22
+defusedxml = 0.4.1
+
# Required by:
-# SOAPpy===0.12.0nxd001
-fpconst = 0.7.2
-
+# slapos.toolbox==0.48
+feedparser = 5.2.0
+
# Required by:
-# slapos.toolbox==0.47.3
+# Products.CMFCore==2.3.0
+five.globalrequest = 1.0
+
+# Required by:
+# slapos.toolbox==0.48
lockfile = 0.10.2
-
+
# Required by:
-# slapos.toolbox==0.47.3
+# slapos.toolbox==0.48
paramiko = 1.15.2
-
+
# Required by:
-# slapos.toolbox==0.47.3
+# slapos.toolbox==0.48
rpdb = 0.1.5
-
+
+# Required by:
+# SOAPpy==0.12.22
+wstools = 0.4.3
+
# Required by:
# zope.app.testing==3.8.1
zope.app.debug = 3.4.1
-
+
# Required by:
# zope.app.testing==3.8.1
zope.app.dependable = 3.5.1
-
+
# Required by:
-# Products.CMFCalendar==2.2.3
-# five.formlib==1.0.4
-zope.app.form = 4.0.2
+# five.globalrequest==1.0
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index 6d1f348..2044547 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -71,7 +71,8 @@ networkcache-section = networkcache
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
-branch = master
+branch = erp5-cluster
+revision = e20fb6ea96c70c472c024220ff272e9b3b53cd70
git-executable = ${git:location}/bin/git
[slapos-cookbook-develop]
stack/erp5/buildout.cfg
View file @ 8f391ef6
......@@ -601,34 +601,10 @@ ZODB3 = 3.10.5+SlapOSPatched001
# specify dev version to be sure that an old released version is not used
cloudooo = 1.2.5-dev
# use newer version than specified in ZTK
PasteDeploy = 1.5.2
Pygments = 2.0.2
coverage = 3.7.1
# test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
Products.PluggableAuthService = 1.9.0
# official pysvn egg does not supports --include-dirs and
# --library-dirs, so we use our modified version
pysvn = 1.7.4nxd006
# we are still using this old stable version.
rdiff-backup = 1.0.5
# use newest version of slapos.cookbook
slapos.cookbook =
# modified version that works fine for buildout installation
SOAPpy = 0.12.0nxd001
# CMF 2.3 is not yet supported.
Products.CMFCalendar = 2.2.3
Products.CMFCore = 2.2.8
Products.CMFDefault = 2.2.4
Products.CMFTopic = 2.2.1
Products.CMFUid = 2.2.1
# newer version requires zope.traversing>=4.0.0a2.
zope.app.appsetup = 3.16.0
......@@ -638,80 +614,88 @@ zope.app.publication = 3.14.0
# newer version requires zope.testbrowser>=4
zope.app.testing = 3.8.1
# Pinned versions
# auto generated list
MySQL-python = 1.2.5
Pillow = 2.7.0
Pillow = 2.8.1
Products.CMFActionIcons = 2.1.3
Products.CMFCalendar = 2.3.0b0
Products.CMFCore = 2.3.0
Products.CMFDefault = 2.3.0b2
Products.CMFTopic = 2.3.0b0
Products.CMFUid = 2.3.0b0
Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 1.1.0
Products.GenericSetup = 1.7.5
Products.LongRequestLogger = 1.1.0
Products.MimetypesRegistry = 2.0.7
Products.PluggableAuthService = 1.10.0
Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9
PyPDF2 = 1.24
PyXML = 0.8.5
Pympler = 0.4
Pympler = 0.4.1
SOAPpy = 0.12.22
StructuredText = 2.11.1
WSGIUtils = 0.7
apache-libcloud = 0.17.0
astroid = 1.3.6
chardet = 2.3.0
collective.recipe.template = 1.11
csp-eventlet = 0.7.0
ecdsa = 0.13
elementtree = 1.2.6.post20050316
erp5diff = 0.8.1.5
eventlet = 0.17.1
five.formlib = 1.0.4
erp5diff = 0.8.1.7
eventlet = 0.17.4
five.localsitemanager = 2.0.5
gitdb = 0.6.4
greenlet = 0.4.5
greenlet = 0.4.7
http-parser = 0.8.3
httplib2 = 0.9
httplib2 = 0.9.1
huBarcode = 1.0.0
interval = 1.0.0
ipdb = 0.8
ipython = 3.0.0
ipdb = 0.8.1
ipython = 3.1.0
logilab-common = 0.63.2
neoppod = 1.3
numpy = 1.9.2
plone.recipe.command = 1.1
ply = 3.4
ply = 3.6
polib = 1.0.6
pprofile = 1.7.2
pprofile = 1.7.3
pycountry = 1.10
pycrypto = 2.6.1
pyflakes = 0.8.1
pyflakes = 0.9.0
pylint = 1.4.3
python-ldap = 2.4.19
python-magic = 0.4.6
python-memcached = 1.54
qrcode = 5.1
rdiff-backup = 1.0.5
restkit = 4.2.2
rtjp-eventlet = 0.3.2
slapos.recipe.template = 2.6
slapos.toolbox = 0.47.3
slapos.recipe.template = 2.7
slapos.toolbox = 0.48
smmap = 0.9.0
socketpool = 0.5.3
spyne = 2.11.0
suds = 0.4
threadframe = 0.2
timerserver = 2.0.2
urlnorm = 1.1.2
urlnorm = 1.1.3
uuid = 1.30
validictory = 1.0.0
xfw = 0.10
xupdate-processor = 0.4
# Required by:
# slapos.toolbox==0.47.3
GitPython = 0.3.6
# slapos.toolbox==0.48
GitPython = 1.0.1
# Required by:
# Products.CMFCore==2.2.8
# Products.CMFCore==2.3.0
Products.ZSQLMethods = 2.13.4
# Required by:
# slapos.toolbox==0.47.3
# slapos.toolbox==0.48
atomize = 0.2.0
# Required by:
......@@ -719,25 +703,33 @@ atomize = 0.2.0
backports.ssl-match-hostname = 3.4.0.2
# Required by:
# slapos.toolbox==0.47.3
feedparser = 5.1.3
# SOAPpy==0.12.22
defusedxml = 0.4.1
# Required by:
# slapos.toolbox==0.48
feedparser = 5.2.0
# Required by:
# SOAPpy===0.12.0nxd001
fpconst = 0.7.2
# Products.CMFCore==2.3.0
five.globalrequest = 1.0
# Required by:
# slapos.toolbox==0.47.3
# slapos.toolbox==0.48
lockfile = 0.10.2
# Required by:
# slapos.toolbox==0.47.3
# slapos.toolbox==0.48
paramiko = 1.15.2
# Required by:
# slapos.toolbox==0.47.3
# slapos.toolbox==0.48
rpdb = 0.1.5
# Required by:
# SOAPpy==0.12.22
wstools = 0.4.3
# Required by:
# zope.app.testing==3.8.1
zope.app.debug = 3.4.1
......@@ -747,6 +739,4 @@ zope.app.debug = 3.4.1
zope.app.dependable = 3.5.1
# Required by:
# Products.CMFCalendar==2.2.3
# five.formlib==1.0.4
zope.app.form = 4.0.2
# five.globalrequest==1.0
stack/slapos.cfg
View file @ 8f391ef6
......@@ -71,7 +71,8 @@ networkcache-section = networkcache
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
branch = master
branch = erp5-cluster
revision = e20fb6ea96c70c472c024220ff272e9b3b53cd70
git-executable = ${git:location}/bin/git
[slapos-cookbook-develop]
......
triml.py 0 → 100644
View file @ 8f391ef6
f = open("patch")
for line in f:
if line != "":
print line.lstrip()
  • Rafael Monnerat @rafael ·

    You don't need to include eggs updates when you do a release, neither modify slapos.cookbook on stack/slapos.cfg.

    You can just introduce a section on software/erp5/software.cfg:

    [slapos.cookbook-repository] branch = erp5-cluster revision = e20fb6ea96c70c472c024220ff272e9b3b53cd70

  • Rafael Monnerat @rafael ·

    Notice that update of the eggs are good and should be part merged on erp5-cluster itself (independent of the releases).

    It is also required to make sure all eggs has versions.

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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7