diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..d035d37 --- /dev/null +++ b/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from .beans_logging import * diff --git a/auto.py b/auto.py new file mode 100644 index 0000000..369019c --- /dev/null +++ b/auto.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from .beans_logging.auto import * diff --git a/beans_logging/__init__.py b/beans_logging/__init__.py index 1d4ffab..cc839be 100644 --- a/beans_logging/__init__.py +++ b/beans_logging/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from .schema import LoggerConfigPM from ._base import Logger, logger, LoggerLoader from .__version__ import __version__ diff --git a/beans_logging/_base.py b/beans_logging/_base.py index 9acd770..ad6b559 100644 --- a/beans_logging/_base.py +++ b/beans_logging/_base.py @@ -9,13 +9,13 @@ ## Third-party libraries import yaml from pydantic import validate_call -from loguru import logger from loguru._logger import Logger +from loguru import logger ## Internal modules -from ._schema import LoggerConfigPM from ._handler import InterceptHandler from .rotation import RotationChecker +from .schema import LoggerConfigPM from .sink import std_sink from .format import json_format from .filter import ( diff --git a/beans_logging/auto.py b/beans_logging/auto.py index 03377f0..abb8bb2 100644 --- a/beans_logging/auto.py +++ b/beans_logging/auto.py @@ -3,11 +3,7 @@ import os from typing import Union -from loguru import logger -from loguru._logger import Logger - -from ._base import LoggerLoader -from .__version__ import __version__ +from . import * logger_loader: Union[LoggerLoader, None] = None _DISABLE_DEFAULT_LOGGER = ( diff --git a/beans_logging/_schema.py b/beans_logging/schema.py similarity index 100% rename from beans_logging/_schema.py rename to beans_logging/schema.py diff --git a/tests/test_beans_logging.py b/tests/test_beans_logging.py index a034e0d..99ebb77 100644 --- a/tests/test_beans_logging.py +++ b/tests/test_beans_logging.py @@ -2,8 +2,7 @@ import pytest -from beans_logging._schema import LoggerConfigPM -from beans_logging.auto import logger, Logger, LoggerLoader +from beans_logging import LoggerConfigPM, Logger, logger, LoggerLoader @pytest.fixture