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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos
Commits
447b27e6
Commit
447b27e6
authored
May 02, 2016
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch from ZODB3 (3.10.7) to ZODB (4.4.4)
parent
5d8ddfd4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
31 deletions
+33
-31
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+12
-4
software/neoppod/software-zodb3.cfg
software/neoppod/software-zodb3.cfg
+16
-0
software/neoppod/software-zodb4.cfg
software/neoppod/software-zodb4.cfg
+0
-14
software/neoppod/software.cfg
software/neoppod/software.cfg
+2
-9
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-4
No files found.
software/neoppod/software-common.cfg
View file @
447b27e6
...
@@ -17,7 +17,7 @@ extends =
...
@@ -17,7 +17,7 @@ extends =
../../component/pycurl/buildout.cfg
../../component/pycurl/buildout.cfg
parts =
parts =
# keep neoppod first so that ZODB
3
is built correctly,
# keep neoppod first so that ZODB is built correctly,
# before any other section that would depend on it
# before any other section that would depend on it
neoppod-develop
neoppod-develop
neoppod
neoppod
...
@@ -40,9 +40,12 @@ environment = neoppod-setup-env
...
@@ -40,9 +40,12 @@ environment = neoppod-setup-env
[neoppod]
[neoppod]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs = neoppod[admin, ctl, master, storage-
importer, storage-mysqldb, tests
]
eggs = neoppod[admin, ctl, master, storage-
mysqldb
]
${python-mysqlclient:egg}
${python-mysqlclient:egg}
ZODB3
psutil
BTrees
ZODB
zope.testing
[slapos-deps-eggs]
[slapos-deps-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
@@ -102,7 +105,12 @@ md5sum = 81ab5e842ecf8385b12d735585497cc8
...
@@ -102,7 +105,12 @@ md5sum = 81ab5e842ecf8385b12d735585497cc8
[versions]
[versions]
slapos.recipe.template = 2.9
slapos.recipe.template = 2.9
ZODB3 = 3.10.7
ZODB = 4.4.4
BTrees = 4.3.1
persistent = 4.2.2
transaction = 1.7.0
zdaemon = 4.1.0
zodbpickle = 0.6.0
# Required by slapos.toolbox = 0.61
# Required by slapos.toolbox = 0.61
slapos.toolbox = 0.61
slapos.toolbox = 0.61
PyRSS2Gen = 1.1
PyRSS2Gen = 1.1
...
...
software/neoppod/software-zodb3.cfg
0 → 100644
View file @
447b27e6
[buildout]
extends = software.cfg
[neoppod]
eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests]
${python-mysqlclient:egg}
ZODB3
patch-binary = ${patch:location}/bin/patch
ZODB3-patch-options = -p1
ZODB3-patches =
${neoppod-repository:location}/ZODB3.patch
[versions]
ZODB3 = 3.10.7+SlapOSPatched001
transaction = 1.1.1
zdaemon = 2.0.7
software/neoppod/software-zodb4.cfg
deleted
100644 → 0
View file @
5d8ddfd4
[buildout]
extends = software.cfg
[neoppod]
eggs = neoppod
${python-mysqlclient:egg}
psutil
ZODB
zope.testing
[versions]
ZODB = 4.4.4
transaction = 1.7.0
zdaemon =
software/neoppod/software.cfg
View file @
447b27e6
...
@@ -33,19 +33,12 @@ recipe = zc.recipe.egg
...
@@ -33,19 +33,12 @@ recipe = zc.recipe.egg
eggs = erp5.util
eggs = erp5.util
interpreter = ${:_buildout_section_name_}
interpreter = ${:_buildout_section_name_}
[neoppod]
patch-binary = ${patch:location}/bin/patch
ZODB3-patch-options = -p1
ZODB3-patches +=
${neoppod-repository:location}/ZODB3.patch
[versions]
[versions]
ZODB3 = 3.10.7+SlapOSPatched001
erp5.util = 0.4.46
erp5.util = 0.4.46
# To match ERP5
# To match ERP5
transaction = 1.1.1
ZConfig = 2.9.3
ZConfig = 2.9.3
zc.lockfile = 1.0.2
zc.lockfile = 1.0.2
zdaemon = 2.0.7
zope.event = 3.5.2
zope.event = 3.5.2
zope.exceptions = 3.6.2
zope.testing = 3.9.7
##
##
stack/erp5/buildout.cfg
View file @
447b27e6
...
@@ -466,10 +466,9 @@ initialization =
...
@@ -466,10 +466,9 @@ initialization =
[eggs]
[eggs]
<= neoppod
<= neoppod
eggs =
eggs =
${neoppod:eggs}
${numpy:egg}
${numpy:egg}
${matplotlib:egg}
${matplotlib:egg}
${python-mysqlclient:egg}
${lxml-python:egg}
${lxml-python:egg}
${pandas:egg}
${pandas:egg}
${pillow-python:egg}
${pillow-python:egg}
...
@@ -524,9 +523,7 @@ eggs =
...
@@ -524,9 +523,7 @@ eggs =
pylint
pylint
pytracemalloc
pytracemalloc
neoppod[client]
# Zope
# Zope
ZODB3
Zope2
Zope2
# Zope acquisition patch
# Zope acquisition patch
Acquisition
Acquisition
...
@@ -683,6 +680,8 @@ PyXML = 0.8.5
...
@@ -683,6 +680,8 @@ PyXML = 0.8.5
Pympler = 0.4.3
Pympler = 0.4.3
StructuredText = 2.11.1
StructuredText = 2.11.1
WSGIUtils = 0.7
WSGIUtils = 0.7
ZEO = 4.2.1
ZODB3 = 3.11.0
Zope2 = 2.13.24
Zope2 = 2.13.24
astor = 0.5
astor = 0.5
# astroid 1.4.1 breaks testDynamicClassGeneration
# astroid 1.4.1 breaks testDynamicClassGeneration
...
...
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