From d02ca52c8f5bdeb0b6ea1fd14b752497d71db5be Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Fri, 8 Dec 2023 23:07:30 +0800 Subject: [PATCH] ready for 0.3.0 ? --- README.md | 2 +- pyproject.toml | 2 +- src/lib_not_dr/__init__.py | 2 +- src/lib_not_dr/loggers/config.py | 2 +- src/lib_not_dr/loggers/logger.py | 2 +- src/lib_not_dr/loggers/structure.py | 17 ++++++++--------- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 1bcd6ab..adf9854 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A python lib came from [Difficult Rocket](https://github.com/shenjackyuanjie/Dif ## Information/信息 -- Version / 版本: 0.3.0-rc.2 +- Version / 版本: 0.3.0 - Author / 作者: shenjackyuanjie <3695888@qq.com> > [shenjackyuanjie](https://github.com/shenjackyuanjie) diff --git a/pyproject.toml b/pyproject.toml index f64a026..08a90bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ lndl_nuitka = "lndl_nuitka:main" [tool.ruff] target-version = "py38" -line-length = 80 +line-length = 100 src = [ "src", ] diff --git a/src/lib_not_dr/__init__.py b/src/lib_not_dr/__init__.py index fa6408c..98fbb54 100644 --- a/src/lib_not_dr/__init__.py +++ b/src/lib_not_dr/__init__.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: from lib_not_dr import loggers, nuitka, types, command -_version_ = "0.3.0-rc.2" +_version_ = "0.3.0" # fmt: off __all__ = [ diff --git a/src/lib_not_dr/loggers/config.py b/src/lib_not_dr/loggers/config.py index 413b7fc..972fb16 100644 --- a/src/lib_not_dr/loggers/config.py +++ b/src/lib_not_dr/loggers/config.py @@ -85,7 +85,7 @@ class ConfigStorage(Options): cycles_set.update(cycle) return sorted(cycles_set) # 返回排序后的循环列表 - def parse_level(self, level_config: Dict[str, str]) -> Optional[int]: + def parse_level(self, level_config: dict) -> Optional[int]: """ """ level_found: Tuple[Optional[int], Optional[str]] = ( level_config.get("level"), diff --git a/src/lib_not_dr/loggers/logger.py b/src/lib_not_dr/loggers/logger.py index 539e7b1..efc0c42 100644 --- a/src/lib_not_dr/loggers/logger.py +++ b/src/lib_not_dr/loggers/logger.py @@ -133,7 +133,7 @@ class Logger(Options): stack_trace = stack message = LogMessage( - messages=messages, + messages=messages, # type: ignore end=end, split=split, flush=flush, diff --git a/src/lib_not_dr/loggers/structure.py b/src/lib_not_dr/loggers/structure.py index fe748c2..3ce897d 100644 --- a/src/lib_not_dr/loggers/structure.py +++ b/src/lib_not_dr/loggers/structure.py @@ -10,8 +10,6 @@ from pathlib import Path from types import FrameType from typing import List, Optional, Tuple, Dict, Union -from lib_not_dr.types.options import Options - __all__ = ["LogMessage", "FormattingMessage"] @@ -23,7 +21,7 @@ class LogMessage: # 消息的属性 flush: Optional[bool] = None - level: int = 20 + level: int = 20 # info log_time: float = 0.0 # time.time_ns() if None logger_name: str = "root" logger_tag: Optional[str] = None @@ -32,12 +30,12 @@ class LogMessage: def __init__( self, messages: Optional[List[str]] = None, - end: Optional[str] = "\n", - split: Optional[str] = " ", + end: str = "\n", + split: str = " ", flush: Optional[bool] = None, - level: Optional[int] = 20, + level: int = 20, log_time: Optional[float] = None, - logger_name: Optional[str] = "root", + logger_name: str = "root", logger_tag: Optional[str] = None, stack_trace: Optional[FrameType] = None, ) -> None: @@ -68,11 +66,12 @@ class LogMessage: log_time = time.time_ns() self.log_time = log_time - if not isinstance(flush, bool) and flush is not None: + if flush is not None and not isinstance(flush, bool): flush = True if flush else False + self.flush = flush - def option(self) -> Dict[str, Union[str, int, float, bool]]: + def option(self) -> dict: return { "messages": self.messages, "end": self.end,