Commit cc7f36a0 authored by Jérome Perrin's avatar Jérome Perrin

component/defaults: use python3 by default

Change python2 softwares to use python2 explicitly and python3
softwares to use the default, but leave a few softwares (html5as,
html5as-base, fluent-bit, packer, seleniumrunner) using the default
python, as they were using python2 not because they only support python2
but because they don't have strong dependency to the python version
being used.
parent 14f5a38d
Pipeline #23186 failed with stage
......@@ -12,7 +12,7 @@ python = python
[python]
recipe = slapos.recipe.build
part = python2.7
part = python3
init =
python = self.buildout[options['part']]
for x in 'location', 'executable', 'version':
......
......@@ -27,6 +27,9 @@ parts =
template-crontab-line
slapos-cookbook
[python]
part = python2.7
[rssgen-eggs]
recipe = zc.recipe.egg
interpreter = python-${:_buildout_section_name_}
......
......@@ -15,6 +15,9 @@ parts =
matiec
open62541
[python]
part = python2.7
[open62541]
# Beremiz need it to be in folder parts/open62541
# as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
......
......@@ -8,6 +8,9 @@ parts =
template
download-cache = ${:directory}/download-cache
[python]
part = python2.7
[template]
recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe
......
......@@ -6,6 +6,9 @@ parts =
slapos-cookbook
template
[python]
part = python2.7
[slapos.buildout-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.buildout.git
......
......@@ -22,9 +22,6 @@ parts +=
caddyprofiledeps
kedifa
[python]
part = python3
[kedifa]
recipe = zc.recipe.egg
eggs =
......
......@@ -7,6 +7,9 @@ parts +=
instance
caucase-eggs
[python]
part = python2.7
[instance-caucased]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
......
......@@ -6,6 +6,9 @@ parts =
${cloudooo-buildout:parts}
template-cloudooo
[python]
part = python2.7
[cloudooo-software-parameter-dict]
publish-url-name = cloudooo
port-parameter-name = tcpv4-port
......
......@@ -8,6 +8,9 @@ parts =
slapos-cookbook
instance.cfg
[python]
part = python2.7
[instance.cfg]
recipe = slapos.recipe.template
output = ${buildout:directory}/${:_buildout_section_name_}
......
......@@ -11,9 +11,6 @@ parts =
location = ${buildout:directory}/activate
eggs = Django
[python]
part = python3
[versions]
Django = 4.0.6
sqlparse = 0.4.2
......
......@@ -17,6 +17,9 @@ parts =
# Always build GCC for Fortran (see openblas).
max_version = 0
[python]
part = python2.7
[instance]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
......
......@@ -9,9 +9,6 @@ parts =
instance-profile
slapos-cookbook
[python]
part = python3
[template-base]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
......
......@@ -10,9 +10,6 @@ parts =
eggs
instance-cfg
[python]
part = python3
# eggs for instance.cfg
[eggs]
recipe = zc.recipe.egg
......
......@@ -71,7 +71,8 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
<= nodejs-8.12.0
[yarn]
<= yarn-1.3.2
[python]
part = python2.7
############################
# Software compilation #
......
......@@ -21,13 +21,9 @@ parts =
loki-config-file
promtail-config-file
[python]
part = python3
[nodejs]
<= nodejs-14.16.0
[go_github.com_grafana_grafana]
<= go-git-package
go.importpath = github.com/grafana/grafana
......
......@@ -13,9 +13,6 @@ parts =
slapos-cookbook
template-cfg
[python]
part = python3
[template-cfg]
recipe = slapos.recipe.template:jinja2
output = ${buildout:directory}/template.cfg
......
......@@ -6,6 +6,9 @@ parts =
slapos-cookbook
template
[python]
part = python2.7
[file]
# For old GCC like 4.9.2 on Debian 8.
# XXX: This should be moved to component/rina-tools/buildout.cfg, next to where
......
......@@ -29,9 +29,6 @@ parts =
helloweb-go
[python]
part = python3
[gowork]
golang = ${golang1.17:location}
......
......@@ -15,6 +15,9 @@ parts =
slapos-cookbook
template
[python]
part = python2.7
##########################################################
# Service startup scripts and configuration files
##########################################################
......
......@@ -12,9 +12,6 @@ parts =
hugo
template-cfg
[python]
part = python3
[profile-common]
nginx_location = ${nginx:location}
dash_location = ${dash:location}
......
......@@ -16,6 +16,9 @@ parts =
jscrawler-build
instance
[python]
part = python2.7
[nodejs]
<= nodejs-12.18.3
......
......@@ -29,6 +29,9 @@ parts =
openssl
instance
[python]
part = python2.7
[nodejs]
<= nodejs-14.16.0
......
......@@ -12,8 +12,6 @@ parts +=
jupyter-notebook-initialized-scripts
instance
[python]
part = python3
[gcc]
# Always build GCC for Fortran (see openblas).
......
......@@ -40,9 +40,6 @@ parts = ${:common-parts}
#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
[python]
part = python3
[python-with-eggs]
recipe = zc.recipe.egg
interpreter = ${:_buildout_section_name_}
......
......@@ -14,9 +14,6 @@ parts =
slapos-cookbook
instance-profile
[python]
part = python3
[java]
<= java-re-temurin-11
......
......@@ -15,9 +15,6 @@ parts =
template
template-monitor
[python]
part = python3
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
......
......@@ -21,10 +21,6 @@ parts +=
[gcc]
min_version = 0
[python]
# we need python3 for repo/cros_sdk command
part = python3
[eggs]
# name is python3 so that cros_sdk uses it automatically through "/usr/bin/env python3"
recipe = zc.recipe.egg
......
......@@ -29,6 +29,9 @@ parts =
neoppod
slapos-cookbook
[python]
part = python2.7
[neoppod-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/neoppod.git
......
......@@ -47,6 +47,8 @@ parts =
slapos-cookbook
instance.cfg
[python]
part = python2.7
[neo]
<= go-git-package
......
......@@ -12,9 +12,6 @@ parts =
nginx-push-stream
template
[python]
part = python3
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
......
......@@ -21,6 +21,9 @@ parts +=
# apache-php
# logrotate
[python]
part = python2.7
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
......
[buildout]
extends =
extends =
../../stack/slapos.cfg
../../component/qemu-kvm/buildout.cfg
../../component/packer/buildout.cfg
parts +=
qemu
......@@ -15,9 +15,6 @@ parts =
slapos-cookbook
instance
[python]
part = python3
[instance]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
......
......@@ -10,9 +10,6 @@ parts =
slapos-cookbook
eggs
[python]
part = python3
[gcc]
# powerdns needs a compiler with C++17 features
min_version = 8
......
......@@ -12,9 +12,6 @@ parts =
proftpd-config-file
instance-profile
[python]
part = python3
[download-file-base]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
......
......@@ -10,11 +10,6 @@ parts =
slapos-cookbook
instance-profile
[python]
part = python3
# force to install plone.recipe.command as it will be used during instanciation
[slapos-cookbook]
eggs +=
......
......@@ -17,6 +17,9 @@ parts +=
slapos-cookbook
template
[python]
part = python2.7
[re6stnet-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/re6stnet.git
......
......@@ -35,9 +35,6 @@ parts =
[mariadb]
location = ${mariadb-10.4:location}
[python]
part = python3
[template-mysqld-wrapper]
recipe = slapos.recipe.template
output = ${buildout:parts-directory}/${:_buildout_section_name_}/mysqld.in
......
......@@ -17,9 +17,6 @@ parts =
restic
gowork
[python]
part = python3
[gowork]
install +=
${git.github.com_restic_rest-server:location}:./cmd/...
......
......@@ -23,6 +23,9 @@ parts =
collective.recipe.shelloutput
template
[python]
part = python2.7
[collective.recipe.shelloutput]
recipe = zc.recipe.egg
......
......@@ -27,6 +27,9 @@ parts =
shared-part-list =
[python]
part = python2.7
[setup-develop-egg]
recipe = zc.recipe.egg:develop
......
......@@ -30,6 +30,9 @@ parts =
phantomjs
template
[python]
part = python2.7
[bootstrap-slapos.recipe.cmmi]
# install our develop version of slapos.recipe.cmmi before anything else,
# otherwise it will be installed from pypi by dependencies.
......
......@@ -50,6 +50,8 @@ common-parts =
parts =
${:common-parts}
[python]
part = python2.7
[template-base]
recipe = slapos.recipe.template
......
......@@ -30,9 +30,6 @@ shared-part-list =
# Versions
# --------
[python]
part = python3
[gcc]
# We keep the gcc part in sync with the one from erp5 software, so that when we install
# erp5 inside theia's slapos parts can be shared.
......
......@@ -12,6 +12,9 @@ parts =
util-linux
template
[python]
part = python2.7
# eggs for instance-rsn-client.cfg
[eggs]
recipe = zc.recipe.egg
......
......@@ -14,6 +14,8 @@ parts =
coturn
instance-cfg
[python]
part = python2.7
[download-base]
recipe = slapos.recipe.build:download
......
......@@ -10,6 +10,9 @@ parts =
slapos-cookbook
template
[python]
part = python2.7
[template]
# Default template for the instance.
recipe = slapos.recipe.template
......
......@@ -45,10 +45,6 @@ recipe = slapos.recipe.build:download-unpacked
# set to the relative path of this folder.
archive-root =
[python]
part = python3
#----------------
#--
#-- Optional part allowing applications using this stack to run a custom
......
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