From a6d7ff796bd5decc09745061bac9cbc78d25fe10 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Mon, 17 Feb 2020 15:26:07 +0100 Subject: [PATCH] Drop Python 3.5 in favor of Python 3.6 --- component/python3/buildout.cfg | 13 +++++-------- software/nextcloud/software.cfg | 2 +- software/slapos-testing/software-py3.cfg | 4 ++-- software/theia/software.cfg | 4 ---- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/component/python3/buildout.cfg b/component/python3/buildout.cfg index 76b2b6151..516b84387 100644 --- a/component/python3/buildout.cfg +++ b/component/python3/buildout.cfg @@ -17,7 +17,10 @@ extends = ../zlib/buildout.cfg parts = - python3.5 + python3 + +[python3] +<= python3.6 [python3-common] recipe = slapos.recipe.cmmi @@ -49,16 +52,10 @@ environment = CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib -[python3.5] -<= python3-common -package_version = 3.5.3 -md5sum = 57d1f8bfbabf4f2500273fb0706e6f21 - -[python3.6.6] +[python3.6] <= python3-common package_version = 3.6.6 md5sum = c3f30a0aff425dda77d19e02f420d6ba -executable = @@LOCATION@@/bin/python3.6 # Python 3.7 have to use gcc 8(actually, gcc 4+) # See https://bugs.python.org/issue34112 diff --git a/software/nextcloud/software.cfg b/software/nextcloud/software.cfg index 6207746b0..9f9125738 100644 --- a/software/nextcloud/software.cfg +++ b/software/nextcloud/software.cfg @@ -33,7 +33,7 @@ rendered = ${buildout:directory}/instance-nextcloud.cfg extensions = jinja2.ext.do context = key gzip_location gzip:location - key python3_location python3.6.6:location + key python3_location python3:location key news_updater_location news-updater:location key php_location apache-php:location raw redis_bin ${redis:location}/bin/redis-server diff --git a/software/slapos-testing/software-py3.cfg b/software/slapos-testing/software-py3.cfg index 7c255a9d2..9679a827d 100644 --- a/software/slapos-testing/software-py3.cfg +++ b/software/slapos-testing/software-py3.cfg @@ -2,11 +2,11 @@ extends = ../../component/python3/buildout.cfg software.cfg -python = python3.5 +python = python3 [nghttp2] environment = - PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${python3.5:location}/bin:%(PATH)s + PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${python3:location}/bin:%(PATH)s [supervisor-repository] <= git-clone-repository diff --git a/software/theia/software.cfg b/software/theia/software.cfg index e91d93017..12280b0e3 100644 --- a/software/theia/software.cfg +++ b/software/theia/software.cfg @@ -26,10 +26,6 @@ parts = [nodejs] <= nodejs-10.6.0 -[python3] -<= python3.6.6 - - [yarn] # this could become a component, but it needs to be invoked from nodejs explicitly, # otherwise it uses system's nodejs -- 2.30.9