Commit b5b3db66 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 90c5b1dd
...@@ -30,9 +30,8 @@ init = ...@@ -30,9 +30,8 @@ init =
# ZODB{4,5}: link/depend to ZEO<ZODB.major> # ZODB{4,5}: link/depend to ZEO<ZODB.major>
else: else:
zeo_x = 'ZEO'+zmajor zeo_x = self.buildout['ZEO'+zmajor]
options['depends'] += '$${%s:egg}' % zeo_x options['depends'] += '$${%s:egg}' % zeo_x.name
zeo_x = self.buildout[zeo_x]
options['egg'] = zeo_x['egg'] options['egg'] = zeo_x['egg']
#options['location'] = zeo_x['setup'] XXX needed? reenable? #options['location'] = zeo_x['setup'] XXX needed? reenable?
...@@ -85,6 +84,6 @@ egg_versions = ...@@ -85,6 +84,6 @@ egg_versions =
trollius = 2.2.post1 trollius = 2.2.post1
futures = 3.2.0 futures = 3.2.0
# XXX neoppod had this: # XXX neoppod had this: XXX
# # BBB: ZEO # # BBB: ZEO
# msgpack = 0.5.6 # msgpack = 0.5.6
...@@ -9,7 +9,7 @@ extends = ...@@ -9,7 +9,7 @@ extends =
parts = ZODB/scripts parts = ZODB/scripts
# ZODB allows to use either ZODB3, ZODB4 or ZODB5 # ZODB allows to use either ZODB3, ZODB4 or ZODB5.
# To select which version to use users should do: # To select which version to use users should do:
# #
# [ZODB] # [ZODB]
...@@ -29,8 +29,8 @@ init = ...@@ -29,8 +29,8 @@ init =
options['location'] = zodb_x['setup'] options['location'] = zodb_x['setup']
# for ZODB3 also depend on _ZODB3-{ZODB,persistent,BTrees,ZEO}. # for ZODB3 also depend on _ZODB3-{ZODB,persistent,BTrees,ZEO}.
# installing those eggs ensures forward compatibiluty with ZODB4/5 where # installing those eggs ensures forward compatibility with ZODB4/5 where
# instead of single ZODB3 egg, there are separate ZDOB,persistent,BTrees,... distributions. # instead of single ZODB3 egg, there are separate ZODB,persistent,BTrees,... distributions.
if options['major'] == '3': if options['major'] == '3':
for egg in ['ZODB','persistent','BTrees','ZEO']: for egg in ['ZODB','persistent','BTrees','ZEO']:
z3egg = self.buildout['_ZODB3-%s' % egg] z3egg = self.buildout['_ZODB3-%s' % egg]
...@@ -59,7 +59,6 @@ eggs = ${ZODB:egg} ...@@ -59,7 +59,6 @@ eggs = ${ZODB:egg}
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
# XXX kirr -> nexedi # XXX kirr -> nexedi
repository = https://lab.nexedi.com/kirr/ZODB.git repository = https://lab.nexedi.com/kirr/ZODB.git
#location = ${buildout:parts-directory}/ZODB # XXX
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
[_ZODB45] [_ZODB45]
...@@ -70,13 +69,15 @@ depends = ${persistent:egg} ${BTrees:egg} ...@@ -70,13 +69,15 @@ depends = ${persistent:egg} ${BTrees:egg}
# eggs versions that are used by all ZODB{4,5}. # eggs versions that are used by all ZODB{4,5}.
egg_versions = egg_versions =
# TODO update to 4.7.3 once it is released # TODO update to 4.7.3 once it is released
Btrees = 4.5.1 BTrees = 4.5.1
persistent = 4.6.4 persistent = 4.6.4
# TODO update to 2.0.0 once NEO stops doing bytes._pack = ... # TODO update to 2.0.0 once NEO stops doing bytes._pack = ...
# https://lab.nexedi.com/nexedi/slapos/commit/27f574bc # https://lab.nexedi.com/nexedi/slapos/commit/27f574bc
zodbpickle = 1.0.4 zodbpickle = 1.0.4
# XXX explain about ZODB3 # Provide ZODB3 for those eggs that still care about ZODB3 compatibility -
# for example wendelin.core. ZODB3 3.11 is just a dependency egg on _latest_
# ZODB, persistent, BTrees and ZEO.
ZODB3 = 3.11.0 ZODB3 = 3.11.0
......
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