Commit ad34ff4a authored by Kirill Smelkov's avatar Kirill Smelkov

wendelin.core: Always use git checkout for both release and development version

Having only one section [wendelin.core] instead of [wendelin.core] and
[wendelin.core-dev] is easier to handle in "we want to use such and such
particular version" scenarious without deciding in advance whether an SR needs
to inherit from wendelin/software.cfg or wendelin/software-dev.cfg

/reviewed-on !874
parent ec79e384
...@@ -10,19 +10,10 @@ parts = ...@@ -10,19 +10,10 @@ parts =
wendelin.core wendelin.core
# wendelin.core installed from released egg from pypi # wendelin.core is installed from git checkout
[wendelin.core] [wendelin.core]
recipe = zc.recipe.egg:custom
<= wendelin.core-eggcommon
# wendelin.core installed from latest git version
[wendelin.core-dev]
recipe = zc.recipe.egg:develop recipe = zc.recipe.egg:develop
setup = ${wendelin.core-repository:location} setup = ${wendelin.core-repository:location}
<= wendelin.core-eggcommon
# common parts in between wendelin.core and wendelin.core-dev
[wendelin.core-eggcommon]
egg = wendelin.core egg = wendelin.core
setup-eggs = setup-eggs =
${pygolang:egg}[pyx.build] ${pygolang:egg}[pyx.build]
...@@ -41,6 +32,8 @@ PATH = ${git:location}/bin:%(PATH)s ...@@ -41,6 +32,8 @@ PATH = ${git:location}/bin:%(PATH)s
[wendelin.core-repository] [wendelin.core-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/wendelin.core.git repository = https://lab.nexedi.com/nexedi/wendelin.core.git
# dir is pretty name as top-level -dev recipe branch = master
location = ${buildout:parts-directory}/wendelin.core-dev revision = v0.13-0-gb26ba55
# dir is pretty name as top-level recipe
location = ${buildout:parts-directory}/wendelin.core
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
...@@ -15,7 +15,7 @@ parts = ...@@ -15,7 +15,7 @@ parts =
# keep neoppod first and in parts so that ZODB is built correctly # keep neoppod first and in parts so that ZODB is built correctly
neoppod neoppod
wendelin.core-dev wendelin.core
# for instance # for instance
wendelin.core-python wendelin.core-python
......
...@@ -34,7 +34,7 @@ parts = ...@@ -34,7 +34,7 @@ parts =
neoppod-develop neoppod-develop
neoppod neoppod
wendelin.core-dev wendelin.core
scripts scripts
# for ZEO scripts (runzeo) # for ZEO scripts (runzeo)
...@@ -107,7 +107,7 @@ template = inline: ...@@ -107,7 +107,7 @@ template = inline:
[neotest-python] [neotest-python]
<= python-interpreter <= python-interpreter
eggs += eggs +=
${wendelin.core-dev:egg} ${wendelin.core:egg}
${neoppod:eggs} ${neoppod:eggs}
# for instance # for instance
plone.recipe.command plone.recipe.command
...@@ -116,7 +116,7 @@ eggs += ...@@ -116,7 +116,7 @@ eggs +=
recipe = zc.recipe.egg:scripts recipe = zc.recipe.egg:scripts
eggs = eggs =
# to install not only wendelin.core modules but also scripts # to install not only wendelin.core modules but also scripts
${wendelin.core-dev:egg} ${wendelin.core:egg}
# wendelin.core: latest not yet released # wendelin.core: latest not yet released
......
...@@ -2,20 +2,8 @@ ...@@ -2,20 +2,8 @@
[buildout] [buildout]
extends = software.cfg extends = software.cfg
# wendelin.core [wendelin.core-repository]
parts -= wendelin.core revision =
parts += wendelin.core-dev
[eggs]
# tell erp5 to use -dev eggs instead of released ones
eggs -= ${wendelin.core:egg}
eggs += ${wendelin.core-dev:egg}
# unpin wendelin.core from versions, so that if there is difference between
# version of wendelin.core-dev and what was pinned, buildout does not fallback
# to installing non-dev egg
[versions] [versions]
wendelin.core =
scikit-learn = 0.20 scikit-learn = 0.20
...@@ -77,4 +77,3 @@ branch = master ...@@ -77,4 +77,3 @@ branch = master
[versions] [versions]
msgpack-numpy = 0.4.4.3 msgpack-numpy = 0.4.4.3
wendelin.core = 0.13
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