lbkit 0.9.13__tar.gz → 0.9.14__tar.gz

{lbkit-0.9.13/lbkit.egg-info → lbkit-0.9.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.13
+Version: 0.9.14
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
@@ -22,6 +22,12 @@ Requires-Dist: inflection
 Requires-Dist: meson>=1.4.0
 Requires-Dist: psutil
 Requires-Dist: loguru
+Requires-Dist: pre-commit
+Requires-Dist: black
+Requires-Dist: isort
+Requires-Dist: flake8
+Requires-Dist: flake8-bugbear
+Requires-Dist: flake8-comprehensions
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

lbkit-0.9.14/lbkit/__commit__.py

@@ -0,0 +1 @@
+__commit__ = '7fd1830'

lbkit-0.9.14/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.9.14'

{lbkit-0.9.13 → lbkit-0.9.14}/lbkit/cli.py

@@ -5,29 +5,30 @@
 # Free Software Foundation; either version 3 of the License, or (at your
 # option) any later version.
 """lbkit命令行入口"""
+import argparse
 import inspect
 import os
 import signal
 import sys
-import argparse
 import traceback
+
 from lbkit import __version__ as client_version
+
 try:
     from lbkit.__commit__ import __commit__ as client_commit
 except ImportError:
     client_commit = ""
+from lbkit import errors, misc
 from lbkit.codegen.codegen import CodeGen
+from lbkit.component.arg_parser import ArgParser
 from lbkit.component.build import BuildComponent
 from lbkit.component.test import TestComponent
-from lbkit.tasks.executor import Executor
-from lbkit.component.arg_parser import ArgParser
 from lbkit.log import Logger
-from lbkit import misc
-from lbkit import errors
-from lbkit.ukr.build import UKRBuild
-from lbkit.utils.env_detector import EnvDetector
 from lbkit.skill.manager import sync as skill_sync
+from lbkit.tasks.executor import Executor
+from lbkit.ukr.build import UKRBuild
 from lbkit.upgrade import upgrade as do_upgrade
+from lbkit.utils.env_detector import EnvDetector
 
 log = Logger()
 
@@ -48,15 +49,16 @@ class Command(object):
     parsing of parameters and delegates functionality in collaborators. It can also show the
     help of the tool.
     """
+
     def __init__(self):
         pass
+
     def help(self, *args):
         """
         Shows help for a specific command.
         """
 
-        parser = argparse.ArgumentParser(description=self.help.__doc__,
-                                         prog="lbkit help")
+        parser = argparse.ArgumentParser(description=self.help.__doc__, prog="lbkit help")
         parser.add_argument("command", help='command', nargs="?")
         args = parser.parse_args(*args)
         if not args.command:
@@ -135,16 +137,36 @@ class Command(object):
         """
         do_upgrade(*args)
 
+    def hooks_path(self, *args):
+        """
+        输出 pre-commit hooks 安装路径.
+
+        供 CI/脚本使用，输出 hooks 目录的绝对路径
+        """
+        import os
+
+        hooks_dir = misc.HOOKS_DIR
+        if not os.path.isdir(hooks_dir):
+            # fallback: 查找源码树内的 hooks
+            import lbkit
+
+            pkg_dir = os.path.dirname(os.path.dirname(os.path.abspath(lbkit.__file__)))
+            candidate = os.path.join(pkg_dir, "pre-commit-hooks")
+            if os.path.isdir(candidate):
+                hooks_dir = candidate
+        print(hooks_dir)
+
     def _show_help(self):
         """
         Prints a summary of all commands.
         """
-        grps = [("Code Generate commands", ["gen"]),
-                ("Build Component commands", ["build", "test"]),
-                ("Build Product commands", ["build"]),
-                ("AI Skill commands", ["skill"]),
-                ("Misc commands", ["upgrade", "help"]),
-               ]
+        grps = [
+            ("Code Generate commands", ["gen"]),
+            ("Build Component commands", ["build", "test"]),
+            ("Build Product commands", ["build"]),
+            ("AI Skill commands", ["skill"]),
+            ("Misc commands", ["upgrade", "hooks_path", "help"]),
+        ]
 
         def check_all_commands_listed():
             """Keep updated the main directory, raise if don't"""
@@ -163,9 +185,9 @@ class Command(object):
             print(group_name + ":")
             for name in comm_names:
                 # future-proof way to ensure tabular formatting
-                output = (fmt % (misc.Color.GREEN + name + misc.Color.RESET_ALL))
+                output = fmt % (misc.Color.GREEN + name + misc.Color.RESET_ALL)
                 if len(output) < 32:
-                    space = " "*(32 - len(output))
+                    space = " " * (32 - len(output))
                     output += space
 
                 # Help will be all the lines up to the first empty one
@@ -182,15 +204,15 @@ class Command(object):
                     data.append(line)
 
                 import textwrap
-                output += textwrap.fill(' '.join(data), 80, subsequent_indent=" "*(max_len+2))
+
+                output += textwrap.fill(' '.join(data), 80, subsequent_indent=" " * (max_len + 2))
                 print(output)
 
         print("")
         print('LiteBmcKit commands. Type "litebmc <command> -h" for help')
 
     def _commands(self):
-        """ Returns a list of available commands.
-        """
+        """Returns a list of available commands."""
         result = {}
         for m in inspect.getmembers(self, predicate=inspect.ismethod):
             method_name = m[0]
@@ -201,13 +223,13 @@ class Command(object):
         return result
 
     def _warn_python_version(self):
-        import textwrap
-
         width = 70
         version = sys.version_info
         if version.major < 3:
-            log.info("*"*width + "\nPython 2 support has been dropped. It is strongly "
-                                            "recommended to use Python >= 3.0\n" + "*"*width)
+            log.info(
+                "*" * width + "\nPython 2 support has been dropped. It is strongly "
+                "recommended to use Python >= 3.0\n" + "*" * width
+            )
 
     def run(self, *args):
         """HIDDEN: entry point for executing commands, dispatcher to class
@@ -268,6 +290,7 @@ def main(args):
     # 使能revision功能
     os.environ["CONAN_REVISIONS_ENABLED"] = "1"
     os.makedirs(misc.LOG_DIR, exist_ok=True)
+
     def ctrl_c_handler(_, __):
         sys.exit(-3)
 

{lbkit-0.9.13 → lbkit-0.9.14}/lbkit/component/test.py

@@ -217,6 +217,11 @@ class TestComponent():
             return 0
 
         log.success("call test method...")
+        # 为增加可定位性，测试时将日志写入文件，等级定为debug
+        if os.environ.get("LOG_LEVEL") is None:
+            os.environ["LOG_LEVEL"] = "debug"
+        if os.environ.get("LOG_TYPE") is None:
+            os.environ["LOG_TYPE"] = "file"
         ret = test.test()
         if ret is not None:
             if isinstance(ret, unittest.TestResult) and (len(ret.errors) > 0 or len(ret.failures) > 0):

{lbkit-0.9.13 → lbkit-0.9.14}/lbkit/misc.py

@@ -4,28 +4,31 @@
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation; either version 3 of the License, or (at your
 # option) any later version.
-import os
 import argparse
-import textwrap
+import fcntl
 import json
-import yaml
+import os
 import re
-import requests
-import fcntl
+import textwrap
 from pathlib import Path
 from string import Template
+
+import requests
+import yaml
 from colorama import Fore, Style
-from jsonschema import validate, ValidationError
-from lbkit.errors import PackageConfigException, HttpRequestException
+from jsonschema import ValidationError, validate
+
+from lbkit.errors import HttpRequestException, PackageConfigException
 
 LOG_DIR = os.path.join(Path.home(), ".cache", "lbkit", "log")
 DOWNLOAD_CACHE_DIR = os.path.join(Path.home(), ".cache", "litebmc", "download")
 TARGETS_DIR = "/usr/share/litebmc/targets"
+HOOKS_DIR = "/usr/share/litebmc/pre-commit-hooks"
 
 
 class Color(object):
-    """ Wrapper around colorama colors that are undefined in importing
-    """
+    """Wrapper around colorama colors that are undefined in importing"""
+
     RED = Fore.RED  # @UndefinedVariable
     WHITE = Fore.WHITE  # @UndefinedVariable
     CYAN = Fore.CYAN  # @UndefinedVariable
@@ -40,9 +43,9 @@ class Color(object):
     BRIGHT_BLUE = Style.BRIGHT + Fore.BLUE  # @UndefinedVariable
     BRIGHT_YELLOW = Style.BRIGHT + Fore.YELLOW  # @UndefinedVariable
     BRIGHT_GREEN = Style.BRIGHT + Fore.GREEN  # @UndefinedVariable
-    BRIGHT_CYAN = Style.BRIGHT + Fore.CYAN   # @UndefinedVariable
-    BRIGHT_WHITE = Style.BRIGHT + Fore.WHITE   # @UndefinedVariable
-    BRIGHT_MAGENTA = Style.BRIGHT + Fore.MAGENTA   # @UndefinedVariable
+    BRIGHT_CYAN = Style.BRIGHT + Fore.CYAN  # @UndefinedVariable
+    BRIGHT_WHITE = Style.BRIGHT + Fore.WHITE  # @UndefinedVariable
+    BRIGHT_MAGENTA = Style.BRIGHT + Fore.MAGENTA  # @UndefinedVariable
 
 
 if os.environ.get("COLOR_DARK", 0):
@@ -54,8 +57,10 @@ if os.environ.get("COLOR_DARK", 0):
     Color.BRIGHT_YELLOW = Fore.MAGENTA
     Color.BRIGHT_GREEN = Fore.GREEN
 
+
 class SmartFormatter(argparse.HelpFormatter):
     """重写HelpFormatter"""
+
     def _fill_text(self, text, width, indent):
         """重写HelpFormatter"""
         text = textwrap.dedent(text)
@@ -71,6 +76,7 @@ class SmartFormatter(argparse.HelpFormatter):
             ret.extend(super()._split_lines(line, width))
         return ret
 
+
 def get_json_schema_file(yml_file, default_json_schema_file):
     """使用json schema文件校验yml_file配置文件"""
     with open(yml_file, "r") as fp:
@@ -80,6 +86,7 @@ def get_json_schema_file(yml_file, default_json_schema_file):
                 return match.group(1)
     return default_json_schema_file
 
+
 def load_json_schema(schema_file):
     """使用json schema文件校验yml_file配置文件"""
     if schema_file.startswith("https://litebmc.com/"):
@@ -94,6 +101,7 @@ def load_json_schema(schema_file):
             tmp = fp.read()
             return json.loads(tmp)
 
+
 def load_yml_with_json_schema_validate(yml_file, default_json_schema_file, **kwargs):
     """使用json schema文件校验yml_file配置文件"""
     schema_file = get_json_schema_file(yml_file, default_json_schema_file)
@@ -110,11 +118,14 @@ def load_yml_with_json_schema_validate(yml_file, default_json_schema_file, **kwa
         validate(data, schema)
         return data
     except ValidationError as exc:
-        raise PackageConfigException(f"validate {yml_file} failed, schema file is {schema_file}, "
-                                     f"message: {exc.message}\n"
-                                     "installing redhat.vscode-yaml plugin in vscode will help you write odf files")
+        raise PackageConfigException(
+            f"validate {yml_file} failed, schema file is {schema_file}, "
+            f"message: {exc.message}\n"
+            "installing redhat.vscode-yaml plugin in vscode will help you write odf files"
+        )
+
 
-class DownloadFlag():
+class DownloadFlag:
     @staticmethod
     def clean(filename):
         """清理文件标记"""
@@ -152,4 +163,4 @@ class DownloadFlag():
         if len(content) == 0:
             return "", ""
         chunk = content.split("|")
-        return chunk[0], chunk[1]
+        return chunk[0], chunk[1]

{lbkit-0.9.13 → lbkit-0.9.14/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.13
+Version: 0.9.14
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
@@ -22,6 +22,12 @@ Requires-Dist: inflection
 Requires-Dist: meson>=1.4.0
 Requires-Dist: psutil
 Requires-Dist: loguru
+Requires-Dist: pre-commit
+Requires-Dist: black
+Requires-Dist: isort
+Requires-Dist: flake8
+Requires-Dist: flake8-bugbear
+Requires-Dist: flake8-comprehensions
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{lbkit-0.9.13 → lbkit-0.9.14}/lbkit.egg-info/requires.txt

@@ -10,3 +10,9 @@ inflection
 meson>=1.4.0
 psutil
 loguru
+pre-commit
+black
+isort
+flake8
+flake8-bugbear
+flake8-comprehensions

{lbkit-0.9.13 → lbkit-0.9.14}/setup.py

@@ -6,17 +6,19 @@
 # option) any later version.
 import os
 import re
-from setuptools import setup, find_packages
+
+from setuptools import find_packages, setup
+
 
 def load_version():
-    """ Loads a file content """
-    filename = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                                            "lbkit", "__init__.py"))
+    """Loads a file content"""
+    filename = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lbkit", "__init__.py"))
     with open(filename, "rt") as version_file:
         litebmc_init = version_file.read()
         version = re.search(r"__version__ = '([0-9.]+)'", litebmc_init).group(1)
         return version
 
+
 setup(
     name="lbkit",
     version=load_version(),
@@ -25,7 +27,26 @@ setup(
     description="Tools provided by litebmc.com",
     long_description="build and code generate tools",
     long_description_content_type="text/markdown",
-    install_requires=["pyyaml", "colorama", "mako", "node-semver>=0.6.1", "jsonschema", "conan", "requests", "gitpython", "inflection", "meson>=1.4.0", "psutil", "loguru"],
+    install_requires=[
+        "pyyaml",
+        "colorama",
+        "mako",
+        "node-semver>=0.6.1",
+        "jsonschema",
+        "conan",
+        "requests",
+        "gitpython",
+        "inflection",
+        "meson>=1.4.0",
+        "psutil",
+        "loguru",
+        "pre-commit",
+        "black",
+        "isort",
+        "flake8",
+        "flake8-bugbear",
+        "flake8-comprehensions",
+    ],
     url="https://www.litebmc.com",
     packages=find_packages(),
     include_package_data=True,

lbkit-0.9.13/lbkit/__commit__.py

@@ -1 +0,0 @@
-__commit__ = '014a769'

lbkit-0.9.13/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.9.13'