Commit 7f6729de authored by Kirill Smelkov's avatar Kirill Smelkov

Revert "software/neoppod & stack/erp5: Hook in zodbutils"

This reverts commit ae808179.

Reason for revert: zodbtools depend on ZODB while currently neoppod &
erp5 are depending on `ZODB3 = 3.10` so upon installing both ZODB3 and
ZODB are installed. Together with our requirement

    stack/erp5/zope-versions.cfg:transaction = 1.1.1

This creates version conflict and installation fails:

2016-11-17 14:56:35,858 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO The version, 1.1.1, is not consistent with the requirement, 'transaction>=1.6.1'.
2016-11-17 14:56:35,937 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO While:
2016-11-17 14:56:35,937 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO   Installing neoppod.
2016-11-17 14:56:35,937 testsuite    : INFO     slapgrid_sr : 2016-11-17 14:56:35 slapos[3698] INFO Error: Bad version 1.1.1

So revert zodbtools hooking for now until we upgrade our ZODB to ZODB > 3.
parent 554cb250
...@@ -43,7 +43,6 @@ recipe = zc.recipe.egg ...@@ -43,7 +43,6 @@ recipe = zc.recipe.egg
eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests] eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests]
${python-mysqlclient:egg} ${python-mysqlclient:egg}
ZODB3 ZODB3
zodbtools
[slapos-deps-eggs] [slapos-deps-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -104,7 +103,6 @@ md5sum = 81ab5e842ecf8385b12d735585497cc8 ...@@ -104,7 +103,6 @@ md5sum = 81ab5e842ecf8385b12d735585497cc8
[versions] [versions]
slapos.recipe.template = 2.9 slapos.recipe.template = 2.9
ZODB3 = 3.10.7 ZODB3 = 3.10.7
zodbtools = 0.0.0.dev3
# 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
......
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