Skip to content

slapos
slapos
Commit cc7f36a0 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 74 deletions
component/defaults.cfg
View file @ cc7f36a0
...@@ -12,7 +12,7 @@ python = python ...@@ -12,7 +12,7 @@ python = python
[python] [python]
recipe = slapos.recipe.build recipe = slapos.recipe.build
part = python2.7 part = python3
init = init =
python = self.buildout[options['part']] python = self.buildout[options['part']]
for x in 'location', 'executable', 'version': for x in 'location', 'executable', 'version':
......
software/backupserver/software.cfg
View file @ cc7f36a0
...@@ -27,6 +27,9 @@ parts = ...@@ -27,6 +27,9 @@ parts =
template-crontab-line template-crontab-line
slapos-cookbook slapos-cookbook
[python]
part = python2.7
[rssgen-eggs] [rssgen-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = python-${:_buildout_section_name_} interpreter = python-${:_buildout_section_name_}
......
software/beremiz-runtime/software.cfg
View file @ cc7f36a0
...@@ -15,6 +15,9 @@ parts = ...@@ -15,6 +15,9 @@ parts =
matiec matiec
open62541 open62541
[python]
part = python2.7
[open62541] [open62541]
# Beremiz need it to be in folder parts/open62541 # Beremiz need it to be in folder parts/open62541
# as Beremiz search for open62541 to BEREMIZ_PATH/../open62541 # as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
......
software/build-rina/software.cfg
View file @ cc7f36a0
...@@ -8,6 +8,9 @@ parts = ...@@ -8,6 +8,9 @@ parts =
template template
download-cache = ${:directory}/download-cache download-cache = ${:directory}/download-cache
[python]
part = python2.7
[template] [template]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
......
software/buildout-testing/software.cfg
View file @ cc7f36a0
...@@ -6,6 +6,9 @@ parts = ...@@ -6,6 +6,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[slapos.buildout-repository] [slapos.buildout-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.buildout.git repository = https://lab.nexedi.com/nexedi/slapos.buildout.git
......
software/caddy-frontend/software.cfg
View file @ cc7f36a0
...@@ -22,9 +22,6 @@ parts += ...@@ -22,9 +22,6 @@ parts +=
caddyprofiledeps caddyprofiledeps
kedifa kedifa
[python]
part = python3
[kedifa] [kedifa]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
......
software/caucase/software.cfg
View file @ cc7f36a0
...@@ -7,6 +7,9 @@ parts += ...@@ -7,6 +7,9 @@ parts +=
instance instance
caucase-eggs caucase-eggs
[python]
part = python2.7
[instance-caucased] [instance-caucased]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
software/cloudooo/software.cfg
View file @ cc7f36a0
...@@ -6,6 +6,9 @@ parts = ...@@ -6,6 +6,9 @@ parts =
${cloudooo-buildout:parts} ${cloudooo-buildout:parts}
template-cloudooo template-cloudooo
[python]
part = python2.7
[cloudooo-software-parameter-dict] [cloudooo-software-parameter-dict]
publish-url-name = cloudooo publish-url-name = cloudooo
port-parameter-name = tcpv4-port port-parameter-name = tcpv4-port
......
software/cythonplus-dev/software.cfg
View file @ cc7f36a0
...@@ -8,6 +8,9 @@ parts = ...@@ -8,6 +8,9 @@ parts =
slapos-cookbook slapos-cookbook
instance.cfg instance.cfg
[python]
part = python2.7
[instance.cfg] [instance.cfg]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${buildout:directory}/${:_buildout_section_name_} output = ${buildout:directory}/${:_buildout_section_name_}
......
software/django-dev/software.cfg
View file @ cc7f36a0
...@@ -11,9 +11,6 @@ parts = ...@@ -11,9 +11,6 @@ parts =
location = ${buildout:directory}/activate location = ${buildout:directory}/activate
eggs = Django eggs = Django
[python]
part = python3
[versions] [versions]
Django = 4.0.6 Django = 4.0.6
sqlparse = 0.4.2 sqlparse = 0.4.2
......
software/dream/software.cfg
View file @ cc7f36a0
...@@ -17,6 +17,9 @@ parts = ...@@ -17,6 +17,9 @@ parts =
# Always build GCC for Fortran (see openblas). # Always build GCC for Fortran (see openblas).
max_version = 0 max_version = 0
[python]
part = python2.7
[instance] [instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
software/fluentd/software.cfg
View file @ cc7f36a0
...@@ -9,9 +9,6 @@ parts = ...@@ -9,9 +9,6 @@ parts =
instance-profile instance-profile
slapos-cookbook slapos-cookbook
[python]
part = python3
[template-base] [template-base]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
software/galene/software.cfg
View file @ cc7f36a0
...@@ -10,9 +10,6 @@ parts = ...@@ -10,9 +10,6 @@ parts =
eggs eggs
instance-cfg instance-cfg
[python]
part = python3
# eggs for instance.cfg # eggs for instance.cfg
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
software/gitlab/software.cfg
View file @ cc7f36a0
...@@ -71,7 +71,8 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261 ...@@ -71,7 +71,8 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
<= nodejs-8.12.0 <= nodejs-8.12.0
[yarn] [yarn]
<= yarn-1.3.2 <= yarn-1.3.2
[python]
part = python2.7
############################ ############################
# Software compilation # # Software compilation #
......
software/grafana/software.cfg
View file @ cc7f36a0
...@@ -21,13 +21,9 @@ parts = ...@@ -21,13 +21,9 @@ parts =
loki-config-file loki-config-file
promtail-config-file promtail-config-file
[python]
part = python3
[nodejs] [nodejs]
<= nodejs-14.16.0 <= nodejs-14.16.0
[go_github.com_grafana_grafana] [go_github.com_grafana_grafana]
<= go-git-package <= go-git-package
go.importpath = github.com/grafana/grafana go.importpath = github.com/grafana/grafana
......
software/headless-chromium/software.cfg
View file @ cc7f36a0
...@@ -13,9 +13,6 @@ parts = ...@@ -13,9 +13,6 @@ parts =
slapos-cookbook slapos-cookbook
template-cfg template-cfg
[python]
part = python3
[template-cfg] [template-cfg]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
......
software/hellorina/software.cfg
View file @ cc7f36a0
...@@ -6,6 +6,9 @@ parts = ...@@ -6,6 +6,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[file] [file]
# For old GCC like 4.9.2 on Debian 8. # For old GCC like 4.9.2 on Debian 8.
# XXX: This should be moved to component/rina-tools/buildout.cfg, next to where # XXX: This should be moved to component/rina-tools/buildout.cfg, next to where
......
software/helloworld/software.cfg
View file @ cc7f36a0
...@@ -29,9 +29,6 @@ parts = ...@@ -29,9 +29,6 @@ parts =
helloweb-go helloweb-go
[python]
part = python3
[gowork] [gowork]
golang = ${golang1.17:location} golang = ${golang1.17:location}
......
software/htmlvalidatorserver/software.cfg
View file @ cc7f36a0
...@@ -15,6 +15,9 @@ parts = ...@@ -15,6 +15,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
########################################################## ##########################################################
# Service startup scripts and configuration files # Service startup scripts and configuration files
########################################################## ##########################################################
......
software/hugo/software.cfg
View file @ cc7f36a0
...@@ -12,9 +12,6 @@ parts = ...@@ -12,9 +12,6 @@ parts =
hugo hugo
template-cfg template-cfg
[python]
part = python3
[profile-common] [profile-common]
nginx_location = ${nginx:location} nginx_location = ${nginx:location}
dash_location = ${dash:location} dash_location = ${dash:location}
......
software/jscrawler/software.cfg
View file @ cc7f36a0
...@@ -16,6 +16,9 @@ parts = ...@@ -16,6 +16,9 @@ parts =
jscrawler-build jscrawler-build
instance instance
[python]
part = python2.7
[nodejs] [nodejs]
<= nodejs-12.18.3 <= nodejs-12.18.3
......
software/jstestnode/software.cfg
View file @ cc7f36a0
...@@ -29,6 +29,9 @@ parts = ...@@ -29,6 +29,9 @@ parts =
openssl openssl
instance instance
[python]
part = python2.7
[nodejs] [nodejs]
<= nodejs-14.16.0 <= nodejs-14.16.0
......
software/jupyter/software.cfg
View file @ cc7f36a0
...@@ -12,8 +12,6 @@ parts += ...@@ -12,8 +12,6 @@ parts +=
jupyter-notebook-initialized-scripts jupyter-notebook-initialized-scripts
instance instance
[python]
part = python3
[gcc] [gcc]
# Always build GCC for Fortran (see openblas). # Always build GCC for Fortran (see openblas).
......
software/kvm/software.cfg
View file @ cc7f36a0
...@@ -40,9 +40,6 @@ parts = ${:common-parts} ...@@ -40,9 +40,6 @@ parts = ${:common-parts}
#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu #XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
[python]
part = python3
[python-with-eggs] [python-with-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = ${:_buildout_section_name_} interpreter = ${:_buildout_section_name_}
......
software/metabase/software.cfg
View file @ cc7f36a0
...@@ -14,9 +14,6 @@ parts = ...@@ -14,9 +14,6 @@ parts =
slapos-cookbook slapos-cookbook
instance-profile instance-profile
[python]
part = python3
[java] [java]
<= java-re-temurin-11 <= java-re-temurin-11
......
software/monitor/software.cfg
View file @ cc7f36a0
...@@ -15,9 +15,6 @@ parts = ...@@ -15,9 +15,6 @@ parts =
template template
template-monitor template-monitor
[python]
part = python3
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
software/nayuos/software.cfg
View file @ cc7f36a0
...@@ -21,10 +21,6 @@ parts += ...@@ -21,10 +21,6 @@ parts +=
[gcc] [gcc]
min_version = 0 min_version = 0
[python]
# we need python3 for repo/cros_sdk command
part = python3
[eggs] [eggs]
# name is python3 so that cros_sdk uses it automatically through "/usr/bin/env python3" # name is python3 so that cros_sdk uses it automatically through "/usr/bin/env python3"
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
software/neoppod/software-common.cfg
View file @ cc7f36a0
...@@ -29,6 +29,9 @@ parts = ...@@ -29,6 +29,9 @@ parts =
neoppod neoppod
slapos-cookbook slapos-cookbook
[python]
part = python2.7
[neoppod-repository] [neoppod-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/neoppod.git repository = https://lab.nexedi.com/nexedi/neoppod.git
......
software/neotest/software.cfg
View file @ cc7f36a0
...@@ -47,6 +47,8 @@ parts = ...@@ -47,6 +47,8 @@ parts =
slapos-cookbook slapos-cookbook
instance.cfg instance.cfg
[python]
part = python2.7
[neo] [neo]
<= go-git-package <= go-git-package
......
software/nginx-push-stream/software.cfg
View file @ cc7f36a0
...@@ -12,9 +12,6 @@ parts = ...@@ -12,9 +12,6 @@ parts =
nginx-push-stream nginx-push-stream
template template
[python]
part = python3
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
......
software/ors-amarisoft/software.cfg
View file @ cc7f36a0
...@@ -21,6 +21,9 @@ parts += ...@@ -21,6 +21,9 @@ parts +=
# apache-php # apache-php
# logrotate # logrotate
[python]
part = python2.7
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
software/packer/software.cfg
View file @ cc7f36a0
[buildout] [buildout]
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/qemu-kvm/buildout.cfg ../../component/qemu-kvm/buildout.cfg
../../component/packer/buildout.cfg ../../component/packer/buildout.cfg
parts += parts +=
qemu qemu
software/plantuml/software.cfg
View file @ cc7f36a0
...@@ -15,9 +15,6 @@ parts = ...@@ -15,9 +15,6 @@ parts =
slapos-cookbook slapos-cookbook
instance instance
[python]
part = python3
[instance] [instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
software/powerdns/software.cfg
View file @ cc7f36a0
...@@ -10,9 +10,6 @@ parts = ...@@ -10,9 +10,6 @@ parts =
slapos-cookbook slapos-cookbook
eggs eggs
[python]
part = python3
[gcc] [gcc]
# powerdns needs a compiler with C++17 features # powerdns needs a compiler with C++17 features
min_version = 8 min_version = 8
......
software/proftpd/software.cfg
View file @ cc7f36a0
...@@ -12,9 +12,6 @@ parts = ...@@ -12,9 +12,6 @@ parts =
proftpd-config-file proftpd-config-file
instance-profile instance-profile
[python]
part = python3
[download-file-base] [download-file-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
software/pureftpd/software.cfg
View file @ cc7f36a0
...@@ -10,11 +10,6 @@ parts = ...@@ -10,11 +10,6 @@ parts =
slapos-cookbook slapos-cookbook
instance-profile instance-profile
[python]
part = python3
# force to install plone.recipe.command as it will be used during instanciation # force to install plone.recipe.command as it will be used during instanciation
[slapos-cookbook] [slapos-cookbook]
eggs += eggs +=
......
software/re6stnet/software.cfg
View file @ cc7f36a0
...@@ -17,6 +17,9 @@ parts += ...@@ -17,6 +17,9 @@ parts +=
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[re6stnet-repository] [re6stnet-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/re6stnet.git repository = https://lab.nexedi.com/nexedi/re6stnet.git
......
software/repman/software.cfg
View file @ cc7f36a0
...@@ -35,9 +35,6 @@ parts = ...@@ -35,9 +35,6 @@ parts =
[mariadb] [mariadb]
location = ${mariadb-10.4:location} location = ${mariadb-10.4:location}
[python]
part = python3
[template-mysqld-wrapper] [template-mysqld-wrapper]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${buildout:parts-directory}/${:_buildout_section_name_}/mysqld.in output = ${buildout:parts-directory}/${:_buildout_section_name_}/mysqld.in
......
software/restic-rest-server/software.cfg
View file @ cc7f36a0
...@@ -17,9 +17,6 @@ parts = ...@@ -17,9 +17,6 @@ parts =
restic restic
gowork gowork
[python]
part = python3
[gowork] [gowork]
install += install +=
${git.github.com_restic_rest-server:location}:./cmd/... ${git.github.com_restic_rest-server:location}:./cmd/...
......
software/seleniumserver/software.cfg
View file @ cc7f36a0
...@@ -23,6 +23,9 @@ parts = ...@@ -23,6 +23,9 @@ parts =
collective.recipe.shelloutput collective.recipe.shelloutput
template template
[python]
part = python2.7
[collective.recipe.shelloutput] [collective.recipe.shelloutput]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
software/slapos-sr-testing/software.cfg
View file @ cc7f36a0
...@@ -27,6 +27,9 @@ parts = ...@@ -27,6 +27,9 @@ parts =
shared-part-list = shared-part-list =
[python]
part = python2.7
[setup-develop-egg] [setup-develop-egg]
recipe = zc.recipe.egg:develop recipe = zc.recipe.egg:develop
......
software/slapos-testing/software.cfg
View file @ cc7f36a0
...@@ -30,6 +30,9 @@ parts = ...@@ -30,6 +30,9 @@ parts =
phantomjs phantomjs
template template
[python]
part = python2.7
[bootstrap-slapos.recipe.cmmi] [bootstrap-slapos.recipe.cmmi]
# install our develop version of slapos.recipe.cmmi before anything else, # install our develop version of slapos.recipe.cmmi before anything else,
# otherwise it will be installed from pypi by dependencies. # otherwise it will be installed from pypi by dependencies.
......
software/slaprunner/software.cfg
View file @ cc7f36a0
...@@ -50,6 +50,8 @@ common-parts = ...@@ -50,6 +50,8 @@ common-parts =
parts = parts =
${:common-parts} ${:common-parts}
[python]
part = python2.7
[template-base] [template-base]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
software/theia/software.cfg
View file @ cc7f36a0
...@@ -30,9 +30,6 @@ shared-part-list = ...@@ -30,9 +30,6 @@ shared-part-list =
# Versions # Versions
# -------- # --------
[python]
part = python3
[gcc] [gcc]
# We keep the gcc part in sync with the one from erp5 software, so that when we install # 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. # erp5 inside theia's slapos parts can be shared.
......
software/tsn-demo/software.cfg
View file @ cc7f36a0
...@@ -12,6 +12,9 @@ parts = ...@@ -12,6 +12,9 @@ parts =
util-linux util-linux
template template
[python]
part = python2.7
# eggs for instance-rsn-client.cfg # eggs for instance-rsn-client.cfg
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
software/turnserver/software.cfg
View file @ cc7f36a0
...@@ -14,6 +14,8 @@ parts = ...@@ -14,6 +14,8 @@ parts =
coturn coturn
instance-cfg instance-cfg
[python]
part = python2.7
[download-base] [download-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
......
software/zabbix-agent/software.cfg
View file @ cc7f36a0
...@@ -10,6 +10,9 @@ parts = ...@@ -10,6 +10,9 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[template] [template]
# Default template for the instance. # Default template for the instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
stack/lamp/buildout.cfg
View file @ cc7f36a0
...@@ -45,10 +45,6 @@ recipe = slapos.recipe.build:download-unpacked ...@@ -45,10 +45,6 @@ recipe = slapos.recipe.build:download-unpacked
# set to the relative path of this folder. # set to the relative path of this folder.
archive-root = archive-root =
[python]
part = python3
#---------------- #----------------
#-- #--
#-- Optional part allowing applications using this stack to run a custom #-- 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7