* [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 @ 2018-10-13 16:39 Yonghong Zhu 2018-10-13 16:52 ` Ard Biesheuvel 0 siblings, 1 reply; 6+ messages in thread From: Yonghong Zhu @ 2018-10-13 16:39 UTC (permalink / raw) To: edk2-devel 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 <ard.biesheuvel@linaro.org> Cc: Leif Lindholm <leif.lindholm@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> --- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 2018-10-13 16:39 [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 Yonghong Zhu @ 2018-10-13 16:52 ` Ard Biesheuvel 2018-10-13 17:03 ` Gao, Liming 0 siblings, 1 reply; 6+ messages in thread From: Ard Biesheuvel @ 2018-10-13 16:52 UTC (permalink / raw) To: Yonghong Zhu, Andrew Fish; +Cc: edk2-devel@lists.01.org, Leif Lindholm On 13 October 2018 at 18:39, Yonghong Zhu <yonghong.zhu@intel.com> wrote: > 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 <ard.biesheuvel@linaro.org> > Cc: Leif Lindholm <leif.lindholm@linaro.org> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> I will note that this does not solve Andrew's problem, but nonetheless: Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > 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 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 2018-10-13 16:52 ` Ard Biesheuvel @ 2018-10-13 17:03 ` Gao, Liming 2018-10-13 17:04 ` Ard Biesheuvel 0 siblings, 1 reply; 6+ messages in thread From: Gao, Liming @ 2018-10-13 17:03 UTC (permalink / raw) To: Ard Biesheuvel, Zhu, Yonghong, Andrew Fish; +Cc: edk2-devel@lists.01.org Ard: Do you verify BaseTools with Python35 or Python36? Thanks Liming > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard Biesheuvel > Sent: Sunday, October 14, 2018 12:52 AM > To: Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com> > Cc: edk2-devel@lists.01.org > Subject: Re: [edk2] [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 > > On 13 October 2018 at 18:39, Yonghong Zhu <yonghong.zhu@intel.com> wrote: > > 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 <ard.biesheuvel@linaro.org> > > Cc: Leif Lindholm <leif.lindholm@linaro.org> > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> > > I will note that this does not solve Andrew's problem, but nonetheless: > > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > > --- > > 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 > > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 2018-10-13 17:03 ` Gao, Liming @ 2018-10-13 17:04 ` Ard Biesheuvel 2018-10-13 17:12 ` Gao, Liming 0 siblings, 1 reply; 6+ messages in thread From: Ard Biesheuvel @ 2018-10-13 17:04 UTC (permalink / raw) To: Gao, Liming; +Cc: Zhu, Yonghong, Andrew Fish, edk2-devel@lists.01.org On 13 October 2018 at 19:03, Gao, Liming <liming.gao@intel.com> wrote: > Ard: > Do you verify BaseTools with Python35 or Python36? > Python 3.5.3 (default, Sep 27 2018, 17:25:39) [GCC 6.3.0 20170516] on linux >> -----Original Message----- >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard Biesheuvel >> Sent: Sunday, October 14, 2018 12:52 AM >> To: Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com> >> Cc: edk2-devel@lists.01.org >> Subject: Re: [edk2] [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 >> >> On 13 October 2018 at 18:39, Yonghong Zhu <yonghong.zhu@intel.com> wrote: >> > 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 <ard.biesheuvel@linaro.org> >> > Cc: Leif Lindholm <leif.lindholm@linaro.org> >> > Contributed-under: TianoCore Contribution Agreement 1.1 >> > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> >> >> I will note that this does not solve Andrew's problem, but nonetheless: >> >> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> >> > --- >> > 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 >> > >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 2018-10-13 17:04 ` Ard Biesheuvel @ 2018-10-13 17:12 ` Gao, Liming 2018-10-13 17:17 ` Ard Biesheuvel 0 siblings, 1 reply; 6+ messages in thread From: Gao, Liming @ 2018-10-13 17:12 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: Zhu, Yonghong, Andrew Fish, edk2-devel@lists.01.org Ard: So, could I add this version in the commit message? Python3.5.3 has been tested. And, with this patch, your CI environment can work? Do you find any other issue? Thanks Liming > -----Original Message----- > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] > Sent: Sunday, October 14, 2018 1:05 AM > To: Gao, Liming <liming.gao@intel.com> > Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com>; edk2-devel@lists.01.org > Subject: Re: [edk2] [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 > > On 13 October 2018 at 19:03, Gao, Liming <liming.gao@intel.com> wrote: > > Ard: > > Do you verify BaseTools with Python35 or Python36? > > > > Python 3.5.3 (default, Sep 27 2018, 17:25:39) > [GCC 6.3.0 20170516] on linux > > > >> -----Original Message----- > >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard Biesheuvel > >> Sent: Sunday, October 14, 2018 12:52 AM > >> To: Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com> > >> Cc: edk2-devel@lists.01.org > >> Subject: Re: [edk2] [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 > >> > >> On 13 October 2018 at 18:39, Yonghong Zhu <yonghong.zhu@intel.com> wrote: > >> > 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 <ard.biesheuvel@linaro.org> > >> > Cc: Leif Lindholm <leif.lindholm@linaro.org> > >> > Contributed-under: TianoCore Contribution Agreement 1.1 > >> > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> > >> > >> I will note that this does not solve Andrew's problem, but nonetheless: > >> > >> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > >> Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > >> > >> > --- > >> > 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 > >> > > >> _______________________________________________ > >> edk2-devel mailing list > >> edk2-devel@lists.01.org > >> https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 2018-10-13 17:12 ` Gao, Liming @ 2018-10-13 17:17 ` Ard Biesheuvel 0 siblings, 0 replies; 6+ messages in thread From: Ard Biesheuvel @ 2018-10-13 17:17 UTC (permalink / raw) To: Gao, Liming; +Cc: Zhu, Yonghong, Andrew Fish, edk2-devel@lists.01.org On 13 October 2018 at 19:12, Gao, Liming <liming.gao@intel.com> wrote: > Ard: > So, could I add this version in the commit message? Python3.5.3 has been tested. > Yes. > And, with this patch, your CI environment can work? Do you find any other issue? > I can build locally on Debian Stretch so the CI environment should work as well. >> -----Original Message----- >> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] >> Sent: Sunday, October 14, 2018 1:05 AM >> To: Gao, Liming <liming.gao@intel.com> >> Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com>; edk2-devel@lists.01.org >> Subject: Re: [edk2] [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 >> >> On 13 October 2018 at 19:03, Gao, Liming <liming.gao@intel.com> wrote: >> > Ard: >> > Do you verify BaseTools with Python35 or Python36? >> > >> >> Python 3.5.3 (default, Sep 27 2018, 17:25:39) >> [GCC 6.3.0 20170516] on linux >> >> >> >> -----Original Message----- >> >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard Biesheuvel >> >> Sent: Sunday, October 14, 2018 12:52 AM >> >> To: Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com> >> >> Cc: edk2-devel@lists.01.org >> >> Subject: Re: [edk2] [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 >> >> >> >> On 13 October 2018 at 18:39, Yonghong Zhu <yonghong.zhu@intel.com> wrote: >> >> > 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 <ard.biesheuvel@linaro.org> >> >> > Cc: Leif Lindholm <leif.lindholm@linaro.org> >> >> > Contributed-under: TianoCore Contribution Agreement 1.1 >> >> > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> >> >> >> >> I will note that this does not solve Andrew's problem, but nonetheless: >> >> >> >> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> >> Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> >> >> >> > --- >> >> > 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 >> >> > >> >> _______________________________________________ >> >> edk2-devel mailing list >> >> edk2-devel@lists.01.org >> >> https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-13 17:17 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-10-13 16:39 [Patch] BaseTools: Remove the logic that check Python3 version larger than 3.6 Yonghong Zhu 2018-10-13 16:52 ` Ard Biesheuvel 2018-10-13 17:03 ` Gao, Liming 2018-10-13 17:04 ` Ard Biesheuvel 2018-10-13 17:12 ` Gao, Liming 2018-10-13 17:17 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox