openubmc-bingo 0.6.45__py3-none-any.whl → 0.6.99__py3-none-any.whl

bmcgo/functional/diff.py

@@ -10,11 +10,11 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 import os
-import subprocess
 import re
 import shutil
 import json
 from tempfile import NamedTemporaryFile
+import yaml
 from git import Repo
 from bmcgo import misc
 from bmcgo.utils.tools import Tools
@@ -39,7 +39,10 @@ def if_available(bconfig: BmcgoConfig):
     return True
 
 CONAN_DATA = ".conan/data"
-VERSION_KEY = "revision"
+if misc.conan_v1():
+    VERSION_KEY = "revision"
+else:
+    VERSION_KEY = "branch"
 
 
 class BmcgoCommand:
@@ -76,20 +79,20 @@ class BmcgoCommand:
             cur_version = version_msg.get('url')[:-4]
             for _log in current_commit[::-1]:
                 if "See merge request" in _log:
-                    line = re.search("(?<=!)\d+", _log)[0]
+                    line = re.search(r"(?<=!)\d+", _log)[0]
                     log.info("%s/merge_requests/%s: %s", cur_version, line, description)
                     break
         #将数据分割为一个一个commit
         for i, _log in enumerate(log_list):
-            if re.match('^\s*Created-by:', _log):
+            if re.match(r'^\s*Created-by:', _log):
                 new_commit = False
                 edit_description = False
             #都为真时记录描述信息
             if new_commit and edit_description:
                 description += _log
-            if re.match('^\s*merge', _log):
+            if re.match(r'^\s*merge', _log):
                 edit_description = True
-            if re.match('^commit', _log):
+            if re.match(r'^commit', _log):
                 new_commit = True
                 if i != 0:
                     current_commit = log_list[commit_index: i - 1]
@@ -102,36 +105,51 @@ class BmcgoCommand:
 
     @staticmethod
     def get_version_msg(version):
-        tempfile = NamedTemporaryFile()
-        # 过滤只包含scm的信息, 并将其生成为字典对象
-        ret = tools.run_command(f"conan info {version} --json {tempfile.name} \
-              -r {misc.conan_remote()}", ignore_error=True, command_echo=False, capture_output=True)
-        file_handler = open(tempfile.name, "r")
-        conan_comps = json.load(file_handler)
-        version_msg = ""
-        for conan_comp in conan_comps:
-            comp_ref = conan_comp.get("reference", "")
-            if comp_ref == version:
-                version_msg = conan_comp.get("scm", "")
-                break
-        file_handler.close()
-        if ret.returncode != 0 or version_msg == "":
-            log.info(version)
-            log.info("仅自研软件支持版本对比功能!")
-            return 1, version_msg
-        # 由于两个组件版本之间的依赖可能冲突，所以清理一遍data
-        if os.path.exists(os.path.join(os.path.expanduser('~'), CONAN_DATA)):
-            shutil.rmtree(os.path.join(os.path.expanduser('~'), CONAN_DATA))
+        if misc.conan_v1():
+            tempfile = NamedTemporaryFile()
+            # 过滤只包含scm的信息, 并将其生成为字典对象
+            ret = tools.run_command(f"conan info {version} --json {tempfile.name} \
+                  -r {misc.conan_remote()}", ignore_error=True, command_echo=False, capture_output=True)
+            file_handler = open(tempfile.name, "r")
+            conan_comps = json.load(file_handler)
+            version_msg = ""
+            for conan_comp in conan_comps:
+                comp_ref = conan_comp.get("reference", "")
+                if comp_ref == version:
+                    version_msg = conan_comp.get("scm", "")
+                    break
+            file_handler.close()
+            if ret.returncode != 0 or version_msg == "":
+                log.info(version)
+                log.info("仅自研软件支持版本对比功能!")
+                return 1, version_msg
+            # 由于两个组件版本之间的依赖可能冲突，所以清理一遍data
+            if os.path.exists(os.path.join(os.path.expanduser('~'), CONAN_DATA)):
+                shutil.rmtree(os.path.join(os.path.expanduser('~'), CONAN_DATA))
+        else:
+            tools.run_command(f"conan download {version} -r {misc.conan_remote()} --only-recipe", 
+                              command_echo=False, capture_output=True)
+            ret = tools.run_command(f"conan cache path {version}", command_echo=False, capture_output=True)
+            conandata_path = os.path.join(ret.stdout.strip(), "conandata.yml")
+            with open(conandata_path, mode="r") as fp:
+                conan_data = yaml.safe_load(fp)
+                comp_ver = version.split("/")[1].split("@")[0]
+                version_msg = conan_data.get("sources", {}).get(comp_ver, {})
+                url = version_msg.get("url", "")
+            if url == "":
+                log.info(version)
+                log.info("仅自研软件支持版本对比功能!")
+                return 1, version_msg
         return ret.returncode, version_msg
 
-    def stage_match_parse(self, repo, stage):
+    def stage_match_parse(self, repo):
         merge_time_1 = repo.git.log("--pretty=format:%at", "-1", self.version_before)
         merge_time_2 = repo.git.log("--pretty=format:%at", "-1", self.version_after)
         # 先对比两个version id的subsys目录下的几个文件, 并获取到有差异的组件
         if merge_time_1 > merge_time_2:
             self.version_before, self.version_after = self.version_after, self.version_before
 
-        diff_list = repo.git.diff(self.version_before, self.version_after, "--", f"build/subsys/{stage}").split('\n')
+        diff_list = repo.git.diff(self.version_before, self.version_after, "--", f"build/subsys/stable").split('\n')
         log.info("====>>>>>> manifest 由 %s 演进至 %s <<<<<<====", self.version_before, self.version_after)
         # 由于git diff会打印许多的无关内容, 这里对其过滤
         cmp_bef_dict = {}
@@ -139,14 +157,14 @@ class BmcgoCommand:
         for diff in diff_list:
             # 时间旧的 version id
             match_bef = None
-            match_bef = re.search("(?<=^-  - conan: ).*", diff)
+            match_bef = re.search(r"(?<=^-  - conan: ).*", diff)
             if match_bef is not None:
                 match_bef = match_bef[0].replace('"', '')
                 cmp_bef_dict[match_bef.split('/')[0]] = match_bef
 
             # 时间新的 version id
             match_aft = None
-            match_aft = re.search("(?<=^\+  - conan: ).*", diff)
+            match_aft = re.search(r"(?<=^\+  - conan: ).*", diff)
             if match_aft is not None:
                 match_aft = match_aft[0].replace('"', '')
                 cmp_aft_dict[match_aft.split('/')[0]] = match_aft
@@ -186,11 +204,11 @@ class BmcgoCommand:
         # 由于组件在版本变更时，可能存储地址发生了改变，旧地址不存在，导致下载失败,同时输入的新地址可能也不存在
         # 故用try进行确认，确保创建目标目录和下载正确执行
         try:
-            Repo.clone_from(version_msg1.get("url"), to_path=to_path, branch='main')
+            Repo.clone_from(version_msg1.get("url"), to_path=to_path)
         except Exception as e1:
             if version_after:
                 try:
-                    Repo.clone_from(version_msg2.get("url"), to_path=to_path, branch='main')
+                    Repo.clone_from(version_msg2.get("url"), to_path=to_path)
                 except Exception as e2:
                     log.error(f"远程软件仓库地址不存在：{version_msg2.get('url')}")
                     raise e2
@@ -222,8 +240,7 @@ class BmcgoCommand:
         log.info(f"合并记录为时间排序，并非编号排序")
         log.info(f"版本演进均为旧版本演进为新版本, 回滚提交也视为演进")
         repo = Repo(self.bconfig.manifest.folder)
-        self.stage_match_parse(repo, "stable")
-        self.stage_match_parse(repo, "rc")
+        self.stage_match_parse(repo)
 
     def run(self):
         if "@" in self.version_before and "@" in self.version_after:

bmcgo/functional/full_component.py

@@ -91,9 +91,12 @@ class BuildComponent:
             if misc.conan_v2():
                 self.option_cmd = self.option_cmd + f" -o {self.comp_name}/*:{key}={value}"
             else:
-                self.option_cmd = self.option_cmd + f" -o {self.comp_name}:{key}={value}"
+                if isinstance(key, str) and ":" in key:
+                    self.option_cmd = self.option_cmd + f" -o {key}={value}"
+                else:
+                    self.option_cmd = self.option_cmd + f" -o {self.comp_name}:{key}={value}"
         command = (
-            f"--remote {self.remote} -nc --stage {self.stage} --build_type {self.build_type.lower()}"
+            f"--remote {self.remote} -nc --stage {self.stage.value} --build_type {self.build_type.value.lower()}"
             f" --profile {self.profile} {self.option_cmd}"
         )
         log.info(f"执行构建命令{misc.tool_name()} build {command}")
@@ -204,6 +207,8 @@ class BmcgoCommand:
         if conan_file_cls.name in obj:
             for exclude_option in obj[conan_file_cls.name]["exclude_options"]:
                 del options_dict[exclude_option]
+            if obj[conan_file_cls.name].get("add_options", {}):
+                options_dict.update(obj[conan_file_cls.name]["add_options"])
 
     @staticmethod
     def exclude_all_options(obj, options_dict):
@@ -211,15 +216,20 @@ class BmcgoCommand:
             for exclude_option in obj["all"]["exclude_options"]: 
                 if exclude_option in options_dict:
                     del options_dict[exclude_option]
+            if obj["all"].get("add_options", {}):
+                options_dict.update(obj["all"]["add_options"])
 
     @staticmethod
     def copy_stable2rc(comp: str):
         com_folder = os.path.join(tool.conan_data, comp)
+        cwd = os.getcwd()
+        os.chdir(com_folder)
         for version in os.listdir(com_folder):
             pkg = f"{comp}/{version}@{CONAN_USER}.release/{STAGE_STABLE}"
             if not os.path.exists(os.path.join(tool.conan_data, pkg.replace("@", "/"))):
                 continue
             tool.run_command(f"conan copy {pkg} {CONAN_USER}.release/{STAGE_RC} --all --force")
+        os.chdir(cwd)
 
     @staticmethod
     def copy_all_stable2rc(tools: Tools):
@@ -323,7 +333,8 @@ class BmcgoCommand:
         self.revise_comp_version(service_json)
         self.revise_service_dependencies(service_json)
         self.build_all_packages(service_json)
-        self.copy_all_stable2rc(tool)
+        if misc.conan_v1():
+            self.copy_all_stable2rc(tool)
         if self.upload:
             log.info("上传组件包至conan仓......")
             tool.run_command(f'conan upload "*" --all --remote {self.remote} -c --no-overwrite')
@@ -356,9 +367,9 @@ class BmcgoCommand:
         for build_args in all_build_params:
             profile, stage, build_type, *option_values = build_args
             if misc.conan_v1():
-                if profile == "profile.dt.ini" and build_type.lower() != BUILD_TYPE_DT.lower():
+                if profile == "profile.dt.ini" and build_type.value.lower() != BUILD_TYPE_DT.lower():
                     continue
-                if profile != "profile.dt.ini" and build_type.lower() == BUILD_TYPE_DT.lower():
+                if profile != "profile.dt.ini" and build_type.value.lower() == BUILD_TYPE_DT.lower():
                     continue
             build_options = dict(zip(options_dict.keys(), option_values))
             task = BuildComponent(