From dae28d1160e6f55005c3a550ced9f08c6273c765 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 13 Aug 2022 15:53:30 -0400 Subject: [PATCH 1/2] update env script version --- cmds/cmd_package/__init__.py | 4 +--- env.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmds/cmd_package/__init__.py b/cmds/cmd_package/__init__.py index c0cfa365..d2d2e656 100644 --- a/cmds/cmd_package/__init__.py +++ b/cmds/cmd_package/__init__.py @@ -25,9 +25,7 @@ # 2019-01-07 SummerGift The prompt supports utf-8 encoding # 2020-04-08 SummerGift Optimize program structure # -__version__ = 'RT-Thread packages v1.2.1' -# This version number prepares for the subsequent suspension -# of the env script to upgrade the python2 version + from .cmd_package_printenv import package_print_env, package_print_help from .cmd_package_list import list_packages from .cmd_package_wizard import package_wizard diff --git a/env.py b/env.py index 043b8a92..4634387f 100644 --- a/env.py +++ b/env.py @@ -34,7 +34,7 @@ from cmds import * from vars import Export -__version__ = 'RT-Thread packages v1.2.1' +__version__ = 'RT-Thread Env Tool v1.3.0' def init_argparse(): From f753455fa0b9af0fb3a1cd8ff03802cc89eb49b5 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 13 Aug 2022 16:09:01 -0400 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmds/cmd_package/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmds/cmd_package/__init__.py b/cmds/cmd_package/__init__.py index d2d2e656..cc0374be 100644 --- a/cmds/cmd_package/__init__.py +++ b/cmds/cmd_package/__init__.py @@ -29,8 +29,8 @@ from .cmd_package_printenv import package_print_env, package_print_help from .cmd_package_list import list_packages from .cmd_package_wizard import package_wizard -from .cmd_package_upgrade import package_upgrade from .cmd_package_update import package_update +from .cmd_package_upgrade import package_upgrade from .cmd_package_upgrade import package_upgrade_modules def run_env_cmd(args): @@ -67,8 +67,8 @@ def add_parser(sub): default=False, dest='package_update') - parser.add_argument('--force-update', '--update-force', - help='force update and clean packages, install or remove packages by settings in menuconfig', + parser.add_argument('--update-force', '--force-update', + help='forcely update and clean packages, install or remove packages by settings in menuconfig', action='store_true', default=False, dest='package_update_force') @@ -86,13 +86,13 @@ def add_parser(sub): dest='package_create') parser.add_argument('--upgrade', - help='upgrade local packages list and ENV scripts from git repo', + help='upgrade local packages index and Env scripts from git repository', action='store_true', default=False, dest='package_upgrade') - parser.add_argument('--force-upgrade', '--upgrade-force', - help='force upgrade packages, install or remove the packages by your settings in menuconfig', + parser.add_argument('--upgrade-force', '--force-upgrade', + help='forcely upgrade local packages index and Env scripts from git repository', action='store_true', default=False, dest='package_upgrade_force')