Commit 53a7db2b authored by Kirill Smelkov's avatar Kirill Smelkov

[TEST] erp5: use bstr+ustr as builtin string types

As of pygolang-0.1-121-gcb0e6055 runwsgi starts and serves "welcome" page ok, but I did not check further.

/cc @kazuhiko, @jerome
parent 13d4dca6
Pipeline #34417 failed with stage
in 0 seconds
...@@ -23,9 +23,9 @@ setup-eggs = ...@@ -23,9 +23,9 @@ setup-eggs =
[pygolang-repository] [pygolang-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/pygolang.git repository = https://lab.nexedi.com/kirr/pygolang.git
branch = master branch = y/bstr+x/gpystr
revision = pygolang-0.1-69-g044deb35 #revision = pygolang-0.1-69-g044deb35
location = ${buildout:parts-directory}/pygolang location = ${buildout:parts-directory}/pygolang
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -494,13 +494,13 @@ initialization = ...@@ -494,13 +494,13 @@ initialization =
[erp5-python-interpreter] [erp5-python-interpreter]
# a python interpreter with all eggs available, usable for the software release but also # a python interpreter with all eggs available, usable for the software release but also
# for external tools (such as python extension in theia). # for external tools (such as python extension in theia).
# we will also want to use bstr/ustr from gpython as builtin string types, but keep # we also want to use bstr/ustr from gpython as builtin string types, but keep
# the program named as just `python`. # the program named as just `python`.
<= gpython-interpreter <= gpython-interpreter
interpreter = python interpreter = python
pre-initialization += pre-initialization +=
import os import os
os.environ.setdefault('GPYTHON_STRINGS', 'pystd') # TODO switch to bstr+ustr os.environ.setdefault('GPYTHON_STRINGS', 'bstr+ustr')
os.environ.setdefault('GPYTHON_RUNTIME', 'threads') os.environ.setdefault('GPYTHON_RUNTIME', 'threads')
eggs += ${eggs:eggs} eggs += ${eggs:eggs}
extra-paths += ${eggs:extra-paths} extra-paths += ${eggs:extra-paths}
......
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