Commit a15808a5 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 19a0e3c4
...@@ -35,7 +35,6 @@ template = inline: ...@@ -35,7 +35,6 @@ template = inline:
export PATH=${buildout:bin-directory}:$PATH export PATH=${buildout:bin-directory}:$PATH
# XXX needed? -> move to stack/nxdtest completely?
[instance.cfg] [instance.cfg]
<= nxdtest-instance.cfg <= nxdtest-instance.cfg
env.sh = ${pygolang-env.sh:rendered} env.sh = ${pygolang-env.sh:rendered}
......
# SlapOS component for pytest. # SlapOS component for pytest.
# https://pytest.org # https://pytest.org
# XXX +scripts
[pytest] [pytest]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = pytest eggs = pytest
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
[buildout] [buildout]
extends = extends =
# test*.cfg first extend from neoppod/software<ZODB-flabour>.cfg to use # test*.cfg first extend from neoppod/software<ZODB-flavour>.cfg to use
# appropriate ZODB and versions of other components. # appropriate ZODB and versions of other components.
../pytest/buildout.cfg ../pytest/buildout.cfg
...@@ -12,7 +12,7 @@ extends = ...@@ -12,7 +12,7 @@ extends =
buildout.cfg buildout.cfg
parts = parts =
# XXX keep neoppod and in parts so that ZEO is built correctly # XXX keep neoppod first and in parts so that ZEO is built correctly
# FIXME can we avoid it? -> no need (we anyaway need NEO for tests) # FIXME can we avoid it? -> no need (we anyaway need NEO for tests)
neoppod neoppod
...@@ -46,7 +46,7 @@ initialization = ...@@ -46,7 +46,7 @@ initialization =
# workaround. # workaround.
scripts = python scripts = python
# env.sh for that python to be on $PATH XXX + go # env.sh for that python +go to be on $PATH
[wendelin.core-env.sh] [wendelin.core-env.sh]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = ${buildout:directory}/${:_buildout_section_name_} rendered = ${buildout:directory}/${:_buildout_section_name_}
...@@ -61,6 +61,7 @@ template = inline: ...@@ -61,6 +61,7 @@ template = inline:
env.sh = ${wendelin.core-env.sh:rendered} env.sh = ${wendelin.core-env.sh:rendered}
workdir = ${wendelin.core-repository:location} workdir = ${wendelin.core-repository:location}
[versions] [versions]
neoppod = 1.12.0 neoppod = 1.12.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