Commit 79d41451 authored by Kirill Smelkov's avatar Kirill Smelkov

erp5: Switch runwsgi to be implemented via pyprog + gpython-interpreter instead of zc.recipe.egg

An example patch of how to convert a program to be run via gpython. For now
there should be no change in semantic, but once we adjust ERP5 interpreter to
activate bstr+ustr as builtin string types by default, it will affect the
programs ran via pyprog infrastructure.

/cc @kazuhiko, @jerome
parent 064073ed
...@@ -87,6 +87,7 @@ parts += ...@@ -87,6 +87,7 @@ parts +=
# some additional utils # some additional utils
zodbpack zodbpack
runwsgi
# Create instance template # Create instance template
template template
...@@ -516,6 +517,15 @@ pre-initialization += ...@@ -516,6 +517,15 @@ pre-initialization +=
eggs += ${eggs:eggs} eggs += ${eggs:eggs}
extra-paths += ${eggs:extra-paths} extra-paths += ${eggs:extra-paths}
# erp5-pyprog is similar to pyprog macro and should be used by python-based
# programs instantiated in ERP5 software-release.
[erp5-pyprog]
<= pyprog
exe = ${buildout:bin-directory}/${:_buildout_section_name_}
python-interpreter = erp5-python-interpreter
# by default no need for extra eggs in addition to eggs provided by interpreter
eggs =
[erp5-python-interpreter-jupyter] [erp5-python-interpreter-jupyter]
<= erp5-python-interpreter <= erp5-python-interpreter
interpreter = pythonwitheggs_jupyter interpreter = pythonwitheggs_jupyter
...@@ -667,11 +677,9 @@ eggs = ...@@ -667,11 +677,9 @@ eggs =
Zope Zope
entry-points = entry-points =
runwsgi=Products.ERP5.bin.zopewsgi:runwsgi
scripts = scripts =
apachedex apachedex
performance_tester_erp5 performance_tester_erp5
runwsgi
runzeo runzeo
tidstoraged tidstoraged
tidstorage_repozo tidstorage_repozo
...@@ -788,6 +796,11 @@ scripts = ...@@ -788,6 +796,11 @@ scripts =
depends = depends =
${slapos-toolbox-dependencies:eggs} ${slapos-toolbox-dependencies:eggs}
[runwsgi]
<= erp5-pyprog
entry = Products.ERP5.bin.zopewsgi:runwsgi
[versions] [versions]
# See ../../software/neoppod/software-common.cfg for versions common with NEO: # See ../../software/neoppod/software-common.cfg for versions common with NEO:
# neoppod, mysqlclient, slapos.recipe.template # neoppod, mysqlclient, slapos.recipe.template
......
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