From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E6EDE21179257 for ; Sat, 13 Oct 2018 09:39:32 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Oct 2018 09:39:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,377,1534834800"; d="scan'208";a="97202933" Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.127]) by fmsmga004.fm.intel.com with ESMTP; 13 Oct 2018 09:39:31 -0700 From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Sun, 14 Oct 2018 00:39:28 +0800 Message-Id: <1539448768-12816-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Oct 2018 16:39:33 -0000 Remove the logic that the Python3 version must larger than 3.6. We verified Python3 migration patches on version 3.6 and 3.7. for other version we not verified it. Cc: Ard Biesheuvel Cc: Leif Lindholm Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu --- BaseTools/toolsetup.bat | 7 ------- edksetup.sh | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 0d4028d..d585431 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -314,17 +314,10 @@ set PYTHON3=py -3 echo. echo !!! ERROR !!! %PYTHON3% not install. echo. goto end ) - FOR /F "TOKENS=1,2" %%i IN ('%PYTHON3% --version') DO set VERSION=%%j - if /I "%VERSION%" LSS "3.6" ( - echo. - echo !!! ERROR !!! python version should greater than or equal to version 3.6. - echo. - goto end - ) :check_freezer_path @REM We have Python, now test for FreezePython application if not defined PYTHON_FREEZER_PATH ( echo. diff --git a/edksetup.sh b/edksetup.sh index d4e577e..84b3e63 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -129,13 +129,13 @@ function SetupPython3() if [ "$ret" -eq 1 ]; then origin_version=$python_version export PYTHON3=$python fi done - if [ -z "$origin_version" ] || [ `echo "$origin_version < 3.6" |bc` -eq 1 ]; then + if [ -z "$origin_version" ]; then echo - echo ERROR!!!, python version should greater than or equal to version 3.6. + echo ERROR!!!, Please install a Python 3 Tool. echo return 1 fi -- 2.6.1.windows.1