NEO: default ZODB was changed to 5

See merge request nexedi/slapos!1122

NEO: default ZODB was changed to 5
See merge request nexedi/slapos!1122
d8409763 · Julien Muchembled · 7102c878 · d8409763 · d8409763 · d8409763
Commit d8409763 authored Oct 16, 2023 by Julien Muchembled
4 changed files
--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -57,6 +57,7 @@ eggs = neoppod[admin, ctl, master]
  zope.testing
  coverage
  setproctitle
+  mock
 adapter-egg =
  ${python-mysqlclient:egg}
  PyMySQL

--- a/software/neoppod/software-zodb5.cfg
+++ b/software/neoppod/software-zodb5.cfg
@@ -2,7 +2,4 @@
 extends = software.cfg

 [ZODB]
-major = 5
-
-[neoppod]
-eggs += mock
+major = 4
--- a/stack/erp5-zope2/buildout.cfg
+++ b/stack/erp5-zope2/buildout.cfg
@@ -565,7 +565,6 @@ eggs = ${neoppod:eggs}
  Jinja2
  jsonschema
  mechanize
-  mock
  oauthlib
  objgraph
  ${python-pynacl:egg}

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -556,7 +556,6 @@ eggs = ${neoppod:eggs}
  Jinja2
  jsonschema
  mechanize
-  mock
  oauthlib
  objgraph
  ${python-pynacl:egg}