Commit 3c7ac8be authored by Bryton Lacquement's avatar Bryton Lacquement 🚪

ERP5: use my2to3

parent 482f5673
[buildout]
parts = my2to3-repository
[my2to3-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/bminusl/my2to3.git
...@@ -110,6 +110,11 @@ ...@@ -110,6 +110,11 @@
}, },
"type": "object" "type": "object"
}, },
"my2to3-action": {
"description": "Set the action my2to3 should perform on ERP5.",
"type": "string",
"default": ""
},
"wsgi": { "wsgi": {
"description": "If set to true, Zope is run as a WSGI application, instead of using the Medusa HTTP server.", "description": "If set to true, Zope is run as a WSGI application, instead of using the Medusa HTTP server.",
"type": "boolean", "type": "boolean",
......
...@@ -5,6 +5,7 @@ extends = ...@@ -5,6 +5,7 @@ extends =
ztk-versions.cfg ztk-versions.cfg
zope-versions.cfg zope-versions.cfg
buildout.hash.cfg buildout.hash.cfg
../../component/my2to3/buildout.cfg
../../component/fonts/buildout.cfg ../../component/fonts/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/graphviz/buildout.cfg ../../component/graphviz/buildout.cfg
...@@ -86,6 +87,9 @@ parts += ...@@ -86,6 +87,9 @@ parts +=
# jupyter # jupyter
jupyter-notebook-initialized-scripts jupyter-notebook-initialized-scripts
# my2to3 tool
my2to3-repository
# override instance-jupyter-notebook not to render into default template.cfg # override instance-jupyter-notebook not to render into default template.cfg
[instance-jupyter-notebook] [instance-jupyter-notebook]
...@@ -525,6 +529,7 @@ scripts = ...@@ -525,6 +529,7 @@ scripts =
extra-paths = extra-paths =
${erp5:location} ${erp5:location}
${my2to3-repository:location}
# patches for eggs # patches for eggs
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
......
...@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 82dc695e212be124d60ceb1143e56b0d md5sum = 2699011c4e94d1bfea1beb31b87f0c04
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
...@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9 ...@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 2f3ddd328ac1c375e483ecb2ef5ffb57 md5sum = 94a9511d9c5c0d4f73dc3feb25f9caf1
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -204,6 +204,7 @@ config-smtp-url = ${request-smtp:connection-url} ...@@ -204,6 +204,7 @@ config-smtp-url = ${request-smtp:connection-url}
config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }} config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }} config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }}
config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }} config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
config-my2to3-action = {{ dumps(slapparameter_dict.get('my2to3-action', '')) }}
config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }} config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }}
config-zodb-dict = {{ dumps(zodb_dict) }} config-zodb-dict = {{ dumps(zodb_dict) }}
config-test-runner-enabled = {{ dumps(test_runner_enabled) }} config-test-runner-enabled = {{ dumps(test_runner_enabled) }}
......
...@@ -62,6 +62,7 @@ environment += ...@@ -62,6 +62,7 @@ environment +=
{% if slapparameter_dict.get('wendelin-core-zblk-fmt') %} {% if slapparameter_dict.get('wendelin-core-zblk-fmt') %}
WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict['wendelin-core-zblk-fmt'] }} WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict['wendelin-core-zblk-fmt'] }}
{% endif %} {% endif %}
MY2TO3_ACTION={{ slapparameter_dict['my2to3-action'] }}
${:environment-extra} ${:environment-extra}
[directory] [directory]
......
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