openubmc-bingo 0.6.51__py3-none-any.whl → 0.6.55__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.51'
+__version__ = '0.6.55'

bmcgo/bmcgo_config.py

@@ -140,6 +140,7 @@ class BmcgoConfig(object):
 
     def _bmcgo_config_init(self):
         """配置初始化"""
+        self.bingo_version_range = None
         cwd = self.cwd
         if os.path.isfile("frame.py"):
             self.manifest = BmcgoManifest(os.path.realpath(os.path.join(cwd, "..")), None)
@@ -185,6 +186,9 @@ class BmcgoConfig(object):
                     self.component = BmcgoComp(folder, conf)
                 except (NoSectionError, NoOptionError):
                     log.debug("不是一个合法的组件仓，尝试查找mds/service.json")
+                
+                #检查是否需要升级
+                self._bingo_version_check(conf)
 
                 self._bmcgo_signature_config_load(conf)
 
@@ -194,6 +198,18 @@ class BmcgoConfig(object):
                 return
 
             cwd = os.path.dirname(cwd)
+    
+    def _bingo_version_check(self, conf: configparser.ConfigParser):
+        try:
+            version_range = conf.get("bingo", "version")
+        except Exception as e:
+            version_range = ""
+        version_range_str = version_range.strip("[").rstrip("]")
+        import semver
+        if semver.satisfies(__version__, version_range_str):
+            return
+        else:
+            self.bingo_version_range = version_range_str.replace(" ", ",")
 
     def _bmcgo_config_load(self):
         """读取配置"""

bmcgo/cli/cli.py

@@ -40,6 +40,7 @@ from bmcgo.bmcgo_config import BmcgoConfig
 from bmcgo.utils.tools import Tools
 from bmcgo.utils.config import Config
 
+
 cwd = os.getcwd()
 tools = Tools()
 log = tools.log
@@ -265,6 +266,12 @@ class Command(object):
             if command in ["-h", "--help"]:
                 self._show_help()
                 return 0
+            #检查是否需要升级
+            if self.bconfig.bingo_version_range:
+                result_code = self.bingo_upgrade()
+                if result_code == 0:
+                    log.info("自动升级完成，请重新运行命令")
+                return result_code
             valid_command = self._find_real_command(command)
             # 命令参数
             command_args = args[0][1:]
@@ -316,6 +323,13 @@ class Command(object):
         if studio_version:
             log.info("bmc-studio 版本为: %s", studio_version)
     
+    def bingo_upgrade(self):
+        version_range = self.bconfig.bingo_version_range.replace(",", " ")
+        log.info(f"检测到当前版本：{client_version}与约束版本{version_range}不匹配，将自动升级，完成后请重新运行")
+        from bmcgo.functional.upgrade import BmcgoCommand as upcommand
+        cmd = upcommand(self.bconfig, (["-v", f"bingo{self.bconfig.bingo_version_range}", "-f"]))
+        return cmd.run()
+
     def conan_init(self):
         if misc.conan_v2():
             tools.run_command("conan profile detect --force")
@@ -451,14 +465,6 @@ class Command(object):
         """检查当前环境中正在使用的bmc studio版本，
         优先通过pip获取，获取不到通过bmc_studio/mds/server获取
         """
-        package_info = tools.run_command('pip3 show hw_ibmc_bmc_studio', sudo=True, 
-            command_echo=False, ignore_error=True, capture_output=True)
-        version = ""
-        if package_info:
-            version = package_info.stdout.replace("\n", " ")
-        match = re.match(r".*([0-9]+\.[0-9]+\.[0-9]+)", version)
-        if match:
-            return match.group(1)
         studio_path = tools.get_studio_path()
         bmc_studio_conf = os.path.join(f"{studio_path}/mds/service.json")
         if not os.path.isfile(bmc_studio_conf):

bmcgo/functional/upgrade.py

@@ -43,8 +43,7 @@ bingo 升级工具
 
 class BmcgoCommand:
     VERSION_PATTERN = re.compile(
-        r"^([a-zA-Z0-9_-]+)\s*([<>]=?|[!~]?=)?\s*([a-zA-Z0-9._+-]*|"
-        rf"{install_consts.INSTALL_LATEST})$"
+        r"^([a-zA-Z0-9._-]+)((?:>=|<=|>|<|=)\s*[\s\S]+)"
     )
 
     def __init__(self, bconfig: BmcgoConfig, *args):
@@ -73,7 +72,7 @@ class BmcgoCommand:
             help="列出可安装版本"
         )
 
-        args, _ = parser.parse_known_args()
+        args, _ = parser.parse_known_args(*args)
 
         self.version = args.version
         self.force = args.force
@@ -83,8 +82,9 @@ class BmcgoCommand:
         self.plugin_path = Path(bconfig.bmcgo_config_list.get(misc.CUSTOM_PLUGINS, misc.DEFAULT_PLUGINS_PATH))
 
     def run(self):
-        app, opt, ver = self._parse_version()
-        self.installer.init(app, opt, ver, self.plugin_path)
+        app, version_range = self._parse_version()
+        version_range = version_range.replace(",", " ")
+        self.installer.init(app, version_range, self.plugin_path)
 
         if self.list:
             self._list_all_versions()
@@ -105,4 +105,4 @@ class BmcgoCommand:
         if match:
             return match.groups()
         self.version = install_consts.INSTALL_DEFAULT
-        return self._parse_version()
+        return install_consts.INSTALL_ALL, install_consts.INSTALL_LATEST

bmcgo/utils/component_version_check.py

@@ -94,7 +94,7 @@ class ComponentVersionCheck:
     def get_dict(self):
         self.openubmc_folder()
         self.manifest_dict = self.generate_manifest_dict()
-        self.ibmc_lock_dict = self.generate_ibmc_lock_dict()
+        self.ibmc_lock_dict = self.generate_bmc_lock_dict()
 
     def generate_manifest_dict(self) -> dict:
         """根据 manifest.yml(conan目录) 配置生成 组件名: 组件配置 的字典
@@ -106,8 +106,8 @@ class ComponentVersionCheck:
         manifest_dict = {x[misc.CONAN].split('/')[0]: x[misc.CONAN].split('@')[0] for x in dependency_list}
         return manifest_dict
 
-    def generate_ibmc_lock_dict(self) -> dict:
-        """根据 ibmc.lock 配置生成 组件名: 组件配置 的字典
+    def generate_bmc_lock_dict(self) -> dict:
+        """根据 bmc.lock 配置生成 组件名: 组件配置 的字典
 
         Returns:
             dict: 返回 组件名: 组件配置 的字典
@@ -116,7 +116,7 @@ class ComponentVersionCheck:
             component_list = self.ibmc_lock["graph_lock"]["nodes"]
             ibmc_lock_dict = {x["ref"].split('/')[0]: x["ref"].split('@')[0]
                             for x in [component_conf for _, component_conf in component_list.items()]}
-            ibmc_lock_dict.pop("openubmc")
+            ibmc_lock_dict.pop(misc.community_name())
         else:
             component_list = self.ibmc_lock["requires"]
             ibmc_lock_dict = {x.split('/')[0]: x.split('@')[0] for x in component_list}

bmcgo/utils/config.py

@@ -762,6 +762,8 @@ class Config:
 
     def merge_dependencies(self, dependencies, subsys_comps, base_deps):
         for com_package in dependencies:
+            if "overwrite" in com_package:
+                del com_package["overwrite"]
             com_package_split = com_package.get(misc.CONAN).split("/")
             if len(com_package_split) > 2:
                 continue

bmcgo/utils/install_manager.py

@@ -38,7 +38,7 @@ class InstallManager:
     def custom_install_plan_path(self):
         return self._custom_path / install_consts.PLUGIN_INSTALL_PLAN_PATH
     
-    def init(self, app_name, operator, version, custom_path):
+    def init(self, app_name, version_range, custom_path):
         self._set_custom_path(custom_path)
 
         if app_name == install_consts.INSTALL_ALL:
@@ -54,7 +54,7 @@ class InstallManager:
                 if not inst_type:
                     raise ValueError(f"未配置 {wname}/{install_consts.PLAN_STEPS}/{install_consts.PLAN_INSTALL_TYPE}")
                 inst = BaseInstaller.get_installer(inst_type)
-                inst.init(plan, operator, version)
+                inst.init(plan, version_range)
                 self._installers.setdefault(wname, []).append(inst)
 
     def show_versions(self):

bmcgo/utils/installations/base_installer.py

@@ -86,11 +86,11 @@ class BaseInstaller(abc.ABC):
             raise ValueError(f"未定义的安装方法：{installer_type}")
         return installer_cls()
     
-    def init(self, plan, operator, version):
+    def init(self, plan, version_range):
         self.parse_plan(plan)
 
         versions = self.get_versions()
-        self.resolve_constraint(versions, operator, version)
+        self.resolve_constraint(versions, version_range)
 
         self.get_current_version()
 
@@ -113,39 +113,22 @@ class BaseInstaller(abc.ABC):
             return
         self.parse_custom_plan(plan)
 
-    def resolve_constraint(self, versions, opt, ver):
+    def resolve_constraint(self, versions, version_range):
         if not versions:
             self.warning("当前没有可下载版本!")
             return
 
-        if ver == install_consts.INSTALL_LATEST or not opt:
+        if version_range == install_consts.INSTALL_LATEST or not version_range:
             self._target_ver = versions[0]
             return
-
-        pkg_ver = PkgVersion(ver)
+        
+        import semver
         for avl_ver in versions:
-            v = PkgVersion(avl_ver)
-            if opt == ">=" and v >= pkg_ver:
-                self._target_ver = v.origin
-                break
-            elif opt == "<=" and v <= pkg_ver:
-                self._target_ver = v.origin
-                break
-            elif opt == "!=" and v != pkg_ver:
-                self._target_ver = v.origin
+            if semver.satisfies(avl_ver, version_range):
+                self._target_ver = avl_ver
                 break
-            elif opt == "<" and v < pkg_ver:
-                self._target_ver = v.origin
-                break
-            elif opt == ">" and v > pkg_ver:
-                self._target_ver = v.origin
-                break
-            elif opt == "=" and v == pkg_ver:
-                self._target_ver = v.origin
-                break
-        else:
-            self.warning(f"没有找到匹配的版本：{self._pkg_name}{opt}{ver}")
-            return
+        if not self._target_ver:
+            raise ValueError(f"没有找到匹配的版本：{self._pkg_name}{version_range}")
         
     def info(self, msg):
         self.logger and self.logger.info(f"[{self.type_name}] {msg}")

bmcgo/utils/mapping_config_patch.py

@@ -128,7 +128,7 @@ def rename_json_prop(obj, array, depth, new_key):
         elif isinstance(obj, list) and array[depth] < len(obj):
             node = obj[array[depth]]
         if node is not None:
-            remove_json_prop(node, array, depth + 1, new_key)
+            rename_json_prop(node, array, depth + 1, new_key)
 
 
 class MappingConfigPatch(Task):

bmcgo/utils/tools.py

@@ -245,16 +245,19 @@ class Tools():
         pkg_name = pkg_info[0]
         has_version = len(pkg_info) > 1
         for sub in base_manifest.get(dependency_type, {}):
+            overwrite = sub.get("overwrite", False)
             sub_name = sub.get(misc.CONAN)
             sub_pkg_name = sub_name.split("/")[0]
             # 上下层具有相同组件名的组件
             if pkg_name == sub_pkg_name:
-                if has_version:
+                if not has_version:
+                    com_package[misc.CONAN] = sub_name
+                elif overwrite:
+                    com_package[misc.CONAN] = name
+                else:
                     raise errors.BmcGoException(
                         "配置错误: 不允许删除平台组件或定制平台组件版本号{}".format(name)
                     )
-                else:
-                    com_package[misc.CONAN] = sub_name
                 break
 
     @staticmethod
@@ -630,7 +633,7 @@ class Tools():
         self.run_command(f"chown {user_group} {img_path}", sudo=True)
 
     def get_studio_path(self):
-        ret = self.run_command("whereis bmc_studio", sudo=True, ignore_error=True,
+        ret = self.run_command("whereis bmc_studio", sudo=False, ignore_error=True,
             command_echo=False, capture_output=True).stdout
         if not ret:
             return ""

{openubmc_bingo-0.6.51.dist-info → openubmc_bingo-0.6.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.51
+Version: 0.6.55
 Summary: Tools provided by openubmc
 Home-page: https://openubmc.cn
 Classifier: Programming Language :: Python :: 3

{openubmc_bingo-0.6.51.dist-info → openubmc_bingo-0.6.55.dist-info}/RECORD

@@ -1,13 +1,13 @@
-bmcgo/__init__.py,sha256=gPR11fdu-7LXVTAiD7rNONaYFEKBD8FQRCv_fHBZFg4,562
+bmcgo/__init__.py,sha256=kPOx3PSU7WJGVIwqgX-wmHpPAd0GuOH0ws0CUMBz40E,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
-bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
+bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
 bmcgo/frame.py,sha256=xv-9d8KN98ivmZQe-k_QQn_miPjELSNwkkVtOt95J1Y,10680
 bmcgo/logger.py,sha256=rcMqJnyQ5Ag3k04KLEskrG8ZJ508OOU_JH4fMFiGOqQ,6644
 bmcgo/misc.py,sha256=w0vzsD7uzrsxTly5Y1viLgYTKHhLP4sxa499XwbqHnU,6986
 bmcgo/worker.py,sha256=OXz5Gam3pmZjgQeoGJrYy73ZrQszCOxk9X19nbeBI_A,15710
 bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/cli/cli.py,sha256=REX_9QUHPEyrYEQ3BU10py4nssIXkaK0XEpAcY6KejM,27398
+bmcgo/cli/cli.py,sha256=O4FHWNLUyqNjs0BoD3aYzPyi3L3mCg7rsIL0mP7_x0U,27748
 bmcgo/cli/config.conan2.yaml,sha256=SAtM_6_qOjZbkgUT5fzWbhbq4aWCayqE8o4xJ2vBRww,261
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
 bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
@@ -209,7 +209,7 @@ bmcgo/functional/maintain.py,sha256=lUn0BtMKMqYKm56aYhvuvnzj47p4BinwVCRuNZ2c1P0,
 bmcgo/functional/new.py,sha256=g7J4qLRTi4F9N6wlKHOVgJJwDmUFiWZbxO1PeGIWqTE,6171
 bmcgo/functional/schema_valid.py,sha256=WI7_NOJqU8wFC51bgiU9G7HJTYnxnMyzxH-L6jn339A,3924
 bmcgo/functional/simple_sign.py,sha256=AstEnGzcTIxAYs5U9G82JDXj7CnfhN9LyYcnkpGEH2Y,4086
-bmcgo/functional/upgrade.py,sha256=HgTtUYtntuRcsO9qb1ciBvZ2gwyHrd0snyH7gjPKA6o,3131
+bmcgo/functional/upgrade.py,sha256=y5smvMoKlfdnNjMtfImS9VW_p8rGhZctkzUkT7tymQU,3180
 bmcgo/ipmigen/__init__.py,sha256=xrppKUuQkt1jTqnr6gHWiWeEyUMFJeiZxcA7Hx9XXUo,789
 bmcgo/ipmigen/ctype_defination.py,sha256=PmkKRWTvmVQsZ-njio16ayXpsyFhC6le9Tu0baWU-xw,3179
 bmcgo/ipmigen/ipmigen.py,sha256=SZWoylTM-Tp4KSOQyfHidMjhhIzp4WIa40oxcrFfKB8,14506
@@ -244,18 +244,18 @@ bmcgo/utils/buffer.py,sha256=t1SkWntWksboNFMPsltslwRdXZi3FAe8eV0JAAE7Vto,4004
 bmcgo/utils/build_conans.py,sha256=3afY0XOwFtfcKud2yp6nODIuPoMKjjsoAl5AV8GbJ6w,8997
 bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPPt9bPMY,7967
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
-bmcgo/utils/component_version_check.py,sha256=nKfav7EnJ_JWfCvH_SiyhhIapGXUzhFs1QvLb58MPBs,6266
-bmcgo/utils/config.py,sha256=QFhPR_ndHLrEcdhFP4X8zRNChEl8cIw4rC2W1wQqaec,50989
+bmcgo/utils/component_version_check.py,sha256=ukc-H-A4ljkOShzVtkYWL0oTIYwxgDIZtP-fPqqHnRY,6274
+bmcgo/utils/config.py,sha256=rXk3_UbweJSdDcj8ISgXKJHcjg9erGSPjf9BJ1nODTo,51077
 bmcgo/utils/fetch_component_code.py,sha256=WtPJ5h1nM87X6RicrAhMOJzOzh9A0jD3CbjPc4A-REo,11280
-bmcgo/utils/install_manager.py,sha256=XMZUuIHm7_DWRdLV4dAevsyamQ6rt8lb_7OqGWzNBC8,4927
+bmcgo/utils/install_manager.py,sha256=Ag7tcTbhBfc6aTe5FOiET-8koq8_iY38Sozmi3dquio,4919
 bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c,7524
-bmcgo/utils/mapping_config_patch.py,sha256=_gKfZnrvsLPgHn1yXhEJRVTAeuGpeGD9T-Pqyw5Ydys,16827
+bmcgo/utils/mapping_config_patch.py,sha256=rfCfeiEU3WAEMDuUxLDARNjne3pWtK0Bxga3dQrEWoM,16827
 bmcgo/utils/merge_csr.py,sha256=JNxHCfW1au84WQshdz0aQy8wMTEOHonjQT3s6LjlZN4,4580
 bmcgo/utils/perf_analysis.py,sha256=fh6lV9AAKVhpPkGPwAJ8EWfGfUoHjqGYQxrvc32Xiac,4767
-bmcgo/utils/tools.py,sha256=xJFmhIQdC2IjqMbVgjcjWOYJk3TwWG0EjN0-FQ4LJ4s,33012
+bmcgo/utils/tools.py,sha256=MmFWnfL1ahRReBb7QaHjLNH3731IXDiBBRiOk9CPsQE,33152
 bmcgo/utils/installations/README.md,sha256=hKXnFYmeHEuROFMFE-vzlGLSHg71bei5ZYwyYZphWNk,2
 bmcgo/utils/installations/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/utils/installations/base_installer.py,sha256=3UZiKWoa41ygRbLD3QsE2FTp-VFp79V0I53QLRIf4E8,5902
+bmcgo/utils/installations/base_installer.py,sha256=0l19uzKD0IXsSp0XgBHFQnP-nuaXX06-43wNmBKxjlk,5339
 bmcgo/utils/installations/install_consts.py,sha256=QrRYfjw-rkwRllXDvC-pqoAH3Ii_tXsj590gzYxnAFA,1104
 bmcgo/utils/installations/install_workflow.py,sha256=wT6lTE_s-NZP8LSZR1xlu4dXTtPTEai1dsq3D5-kLzE,3162
 bmcgo/utils/installations/version_util.py,sha256=dOwvLZ7iOmnzSeyD6_pRm7NS7I13Um5mSD_y0dVyO6M,3212
@@ -264,8 +264,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=APR3GM-3Q11LFfe8vh7t3LztDn4LLEpNHRUNjkaVekA,143
 bmcgo/utils/installations/installers/apt_installer.py,sha256=nPaCb4cobSi9InN_aHsEPtQ0k4FgsCUWE5_VgBPvcRE,3769
 bmcgo/utils/installations/installers/pip_installer.py,sha256=dDdios1EQ7fzt90r02pZeoM3jCmjslLzkSvzd2hgRVM,3241
-openubmc_bingo-0.6.51.dist-info/METADATA,sha256=LhSm0RCzavLoRo86bOwXimNKy7gEFCurUCor5ak9dnw,1010
-openubmc_bingo-0.6.51.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.51.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.51.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.51.dist-info/RECORD,,
+openubmc_bingo-0.6.55.dist-info/METADATA,sha256=rwg9UScKpnA_TWlGjXbb4abjn2Tdx2Bi5JySyoSNukk,1010
+openubmc_bingo-0.6.55.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.55.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.55.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.55.dist-info/RECORD,,