From 7d0fb2cc34cb7aaa2b6eaca4f14f2c20778d3e40 Mon Sep 17 00:00:00 2001 From: Doug Kerr Date: Thu, 8 Sep 2022 19:07:18 -0400 Subject: [PATCH] build: drop support for python 3.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit python 3.6 EOL was Dec. 2021 buildbot is running debian 10 which ships with 3.7 meson 0.62+ requires 3.7 Signed-off-by: Doug Kerr Signed-off-by: Petr Štetiar [rebased] --- README.md | 2 +- include/prereq-build.mk | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 29ff89f90c2..8bca0ee7b08 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ documentation. ``` binutils bzip2 diff find flex gawk gcc-6+ getopt grep install libc-dev libz-dev -make4.1+ perl python3.6+ rsync subversion unzip which +make4.1+ perl python3.7+ rsync subversion unzip which ``` ### Quickstart diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 52988fbda92..9096e379bb0 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -175,23 +175,21 @@ $(eval $(call SetupHostCommand,install,Please install GNU 'install', \ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ perl --version | grep "perl.*v5")) -$(eval $(call SetupHostCommand,python,Please install Python >= 3.6, \ +$(eval $(call SetupHostCommand,python,Please install Python >= 3.7, \ python3.11 -V 2>&1 | grep 'Python 3', \ python3.10 -V 2>&1 | grep 'Python 3', \ python3.9 -V 2>&1 | grep 'Python 3', \ python3.8 -V 2>&1 | grep 'Python 3', \ python3.7 -V 2>&1 | grep 'Python 3', \ - python3.6 -V 2>&1 | grep 'Python 3', \ - python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?')) + python3 -V 2>&1 | grep -E 'Python 3\.([7-9]|[0-9][0-9])\.?')) -$(eval $(call SetupHostCommand,python3,Please install Python >= 3.6, \ +$(eval $(call SetupHostCommand,python3,Please install Python >= 3.7, \ python3.11 -V 2>&1 | grep 'Python 3', \ python3.10 -V 2>&1 | grep 'Python 3', \ python3.9 -V 2>&1 | grep 'Python 3', \ python3.8 -V 2>&1 | grep 'Python 3', \ python3.7 -V 2>&1 | grep 'Python 3', \ - python3.6 -V 2>&1 | grep 'Python 3', \ - python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?')) + python3 -V 2>&1 | grep -E 'Python 3\.([7-9]|[0-9][0-9])\.?')) $(eval $(call TestHostCommand,python3-distutils, \ Please install the Python3 distutils module, \