diff --git a/bindgen/__init__.py b/bindgen/__init__.py index 05a1367..e385c72 100644 --- a/bindgen/__init__.py +++ b/bindgen/__init__.py @@ -4,7 +4,7 @@ from sys import platform from typing import List -import logzero +import logging import toml as toml import pandas as pd import pyparsing as pp @@ -20,6 +20,7 @@ from .utils import current_platform, get_includes, init_clang from .schemas import global_schema, module_schema +logger = logging.getLogger(__name__) def read_settings(p): @@ -342,7 +343,7 @@ def _process_module(name, files, module_names, includes, clang_location): :-1] + (exclude_ns,) if not verbose: - logzero.logger.setLevel(logzero.logging.INFO) + logger.setLevel(logging.INFO) return ModuleInfo(name, path, files, module_names, settings, target_platform) modules = Parallel(prefer="processes", n_jobs=n_jobs)( @@ -368,8 +369,8 @@ def transform_modules( # ignore functions and classes based on settings and update the global class_dict def _filter_module(m): if not verbose: - logzero.logger.setLevel(logzero.logging.INFO) - logzero.logger.debug(m.name) + logger.setLevel(logging.INFO) + logger.debug(m.name) transform_module(m, sym, settings, settings_per_module) return m @@ -384,7 +385,7 @@ def _filter_module(m): class_dict.update(m.class_dict) # sort modules - logzero.logger.info("sorting") + logger.info("sorting") cls_dict = {c.name: m.name for m in modules for c in m.classes} enum_dict = {e.name: m.name for m in modules for e in m.enums} @@ -414,7 +415,7 @@ def _filter_module(m): # m.dependencies.add(enum_dict[t]) # remove duplicate typedefs - logzero.logger.info("removing duplicate typedefs") + logger.info("removing duplicate typedefs") typedefs_dict = {} for m in modules: @@ -640,12 +641,12 @@ def _validate(f): tu = parse_tu(f, pre_includes="") if len([d for d in tu.diagnostics if d.severity > 2]): - logzero.logger.error("Validation {}: NOK".format(f)) + logger.error("Validation {}: NOK".format(f)) if verbose: for d in tu.diagnostics: - logzero.logger.warning(d) + logger.warning(d) else: - logzero.logger.info("Validation {}: OK".format(f)) + logger.info("Validation {}: OK".format(f)) result = Parallel(prefer="processes", n_jobs=n_jobs)( delayed(_validate)(n) for n in Path(folder).files("*.cpp") diff --git a/bindgen/__main__.py b/bindgen/__main__.py index 8b33f77..edcd328 100644 --- a/bindgen/__main__.py +++ b/bindgen/__main__.py @@ -1,5 +1,5 @@ import click -import logzero +import logging import pickle from types import SimpleNamespace @@ -8,6 +8,7 @@ from . import read_settings, parse_modules, transform_modules, render, validate_result from .utils import get_includes, init_clang +logger = logging.getLogger(__name__) @click.group() @click.option("-n", "--njobs", default=-2, type=int) @@ -39,7 +40,7 @@ def main(ctx, clean, verbose, njobs, include, prefix, libclang): if not verbose: - logzero.logger.setLevel(logzero.logging.INFO) + logger.setLevel(logging.INFO) if include: get_includes.__defaults__ = (include,) diff --git a/bindgen/module.py b/bindgen/module.py index 8a1f22f..d7d6a73 100644 --- a/bindgen/module.py +++ b/bindgen/module.py @@ -9,11 +9,13 @@ FunctionInfo, EnumInfo, ) -from logzero import logger +import logging from toposort import toposort_flatten from path import Path +logger = logging.getLogger(__name__) + class ModuleInfo(object): """Container for the whole module diff --git a/bindgen/translation_unit.py b/bindgen/translation_unit.py index 65b923e..47a08d2 100755 --- a/bindgen/translation_unit.py +++ b/bindgen/translation_unit.py @@ -1,10 +1,11 @@ -import logzero +import logging import pybind11 from clang.cindex import TranslationUnit as TU from .utils import get_index, get_includes +logger = logging.getLogger(__name__) def parse_tu( path, @@ -65,9 +66,9 @@ def parse_tu( diag = list(tr_unit.diagnostics) if diag: - logzero.logger.warning(path) + logger.warning(path) for d in diag: - logzero.logger.warning(d) + logger.warning(d) tr_unit.path = ("dummy.cxx", path.name) diff --git a/env.yml b/env.yml index 015916e..f1cf987 100644 --- a/env.yml +++ b/env.yml @@ -18,7 +18,6 @@ dependencies: - clang==6.0.0 - click - jinja2 - - logzero - pandas - path.py - pyparsing diff --git a/setup.py b/setup.py index db3bdb2..7051201 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,6 @@ include_package_data=True, install_requires=[ "click", - "logzero", "path", "clang", "toml",