Commit 9a8676a3 authored by Jérome Perrin's avatar Jérome Perrin

stack/erp5: use python-interpreter macro from pygolang to generate an interpreter

This macro generates an intepreters knowing its own sys.executable, so
it can be used as interpreter for theia's python extension to provide
code navigation, completion etc.
parent 00512fa1
Pipeline #20910 passed with stage
in 0 seconds
...@@ -58,6 +58,7 @@ extends = ...@@ -58,6 +58,7 @@ extends =
../../component/perl-Image-ExifTool/buildout.cfg ../../component/perl-Image-ExifTool/buildout.cfg
../../component/wendelin.core/buildout.cfg ../../component/wendelin.core/buildout.cfg
../../component/jupyter-py2/buildout.cfg ../../component/jupyter-py2/buildout.cfg
../../component/pygolang/buildout.cfg
../../stack/caucase/buildout.cfg ../../stack/caucase/buildout.cfg
../../software/neoppod/software-common.cfg ../../software/neoppod/software-common.cfg
# keep neoppod extends last # keep neoppod extends last
...@@ -204,7 +205,7 @@ context = ...@@ -204,7 +205,7 @@ context =
key site_zcml site-zcml:target key site_zcml site-zcml:target
key sixtunnel_location 6tunnel:location key sixtunnel_location 6tunnel:location
key template_run_zelenium template-run-zelenium:target key template_run_zelenium template-run-zelenium:target
key egg_interpreter eggs:interpreter key egg_interpreter erp5-python-interpreter:interpreter
key template_apache_conf template-apache-backend-conf:target key template_apache_conf template-apache-backend-conf:target
key template_balancer template-balancer:target key template_balancer template-balancer:target
key template_erp5 template-erp5:target key template_erp5 template-erp5:target
...@@ -386,6 +387,13 @@ initialization = ...@@ -386,6 +387,13 @@ initialization =
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split())) repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list] sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
[erp5-python-interpreter]
<= python-interpreter
# a python interpreter with all eggs available, usable for the software release but also
# for external tools (such as python extension in theia).
eggs += ${eggs:eggs}
extra-paths += ${eggs:extra-paths}
[zope-product-with-eggtestinfo] [zope-product-with-eggtestinfo]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
setup-eggs = setup-eggs =
...@@ -560,10 +568,6 @@ eggs = ${neoppod:eggs} ...@@ -560,10 +568,6 @@ eggs = ${neoppod:eggs}
strict-rfc3339 strict-rfc3339
jsonschema[format] jsonschema[format]
# parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance
interpreter = ${buildout:python}
entry-points = entry-points =
runwsgi=Products.ERP5.bin.zopewsgi:runwsgi runwsgi=Products.ERP5.bin.zopewsgi:runwsgi
scripts = scripts =
......
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