packg 0.7.2__tar.gz → 0.9.2__tar.gz

{packg-0.7.2 → packg-0.9.2}/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 gingsi
+   Copyright 2023 simonging
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

{packg-0.7.2/src/packg.egg-info → packg-0.9.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: packg
-Version: 0.7.2
+Version: 0.9.2
 Summary: Collection of utilities used in other python projects.
-Author: gingsi
+Author: simonging
 License: Apache-2.0
-Project-URL: Project-URL, https://github.com/gingsi/packg
+Project-URL: Project-URL, https://github.com/simonging/packg
 Keywords: attrs,typing,dict,attr
 Platform: any
 Classifier: Development Status :: 3 - Alpha
@@ -36,13 +36,13 @@ Requires-Dist: requests
 # packg
 
 <p align="center">
-<a href="https://github.com/gingsi/packg/actions/workflows/build-py37.yml">
-  <img alt="build 3.7 status" title="build 3.7 status" src="https://img.shields.io/github/actions/workflow/status/gingsi/packg/build-py37.yml?branch=main&label=build%203.7" />
+<a href="https://github.com/simonging/packg/actions/workflows/build-py37.yml">
+  <img alt="build 3.7 status" title="build 3.7 status" src="https://img.shields.io/github/actions/workflow/status/simonging/packg/build-py37.yml?branch=main&label=build%203.7" />
 </a>
-<a href="https://github.com/gingsi/packg/actions/workflows/build-py310.yml">
-  <img alt="build 3.10 status" title="build 3.10 status" src="https://img.shields.io/github/actions/workflow/status/gingsi/packg/build-py310.yml?branch=main&label=build%203.10" />
+<a href="https://github.com/simonging/packg/actions/workflows/build-py310.yml">
+  <img alt="build 3.10 status" title="build 3.10 status" src="https://img.shields.io/github/actions/workflow/status/simonging/packg/build-py310.yml?branch=main&label=build%203.10" />
 </a>
-<img alt="coverage" title="coverage" src="https://raw.githubusercontent.com/gingsi/packg/main/docs/coverage.svg" />
+<img alt="coverage" title="coverage" src="https://raw.githubusercontent.com/simonging/packg/main/docs/coverage.svg" />
 <a href="https://pypi.org/project/packg/">
   <img alt="version" title="version" src="https://img.shields.io/pypi/v/packg?color=success" />
 </a>

{packg-0.7.2 → packg-0.9.2}/README.md

@@ -1,13 +1,13 @@
 # packg
 
 <p align="center">
-<a href="https://github.com/gingsi/packg/actions/workflows/build-py37.yml">
-  <img alt="build 3.7 status" title="build 3.7 status" src="https://img.shields.io/github/actions/workflow/status/gingsi/packg/build-py37.yml?branch=main&label=build%203.7" />
+<a href="https://github.com/simonging/packg/actions/workflows/build-py37.yml">
+  <img alt="build 3.7 status" title="build 3.7 status" src="https://img.shields.io/github/actions/workflow/status/simonging/packg/build-py37.yml?branch=main&label=build%203.7" />
 </a>
-<a href="https://github.com/gingsi/packg/actions/workflows/build-py310.yml">
-  <img alt="build 3.10 status" title="build 3.10 status" src="https://img.shields.io/github/actions/workflow/status/gingsi/packg/build-py310.yml?branch=main&label=build%203.10" />
+<a href="https://github.com/simonging/packg/actions/workflows/build-py310.yml">
+  <img alt="build 3.10 status" title="build 3.10 status" src="https://img.shields.io/github/actions/workflow/status/simonging/packg/build-py310.yml?branch=main&label=build%203.10" />
 </a>
-<img alt="coverage" title="coverage" src="https://raw.githubusercontent.com/gingsi/packg/main/docs/coverage.svg" />
+<img alt="coverage" title="coverage" src="https://raw.githubusercontent.com/simonging/packg/main/docs/coverage.svg" />
 <a href="https://pypi.org/project/packg/">
   <img alt="version" title="version" src="https://img.shields.io/pypi/v/packg?color=success" />
 </a>

{packg-0.7.2 → packg-0.9.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "packg"
 description = "Collection of utilities used in other python projects."
 readme = "README.md"
-authors = [{ "name" = "gingsi" }]
+authors = [{ "name" = "simonging" }]
 requires-python = ">=3.7"
 license = { text = "Apache-2.0" }
 keywords = ["attrs", "typing", "dict", "attr"]
@@ -24,7 +24,7 @@ classifiers = [
 dynamic = ["version", "dependencies"]
 
 [project.urls]
-Project-URL = "https://github.com/gingsi/packg"
+Project-URL = "https://github.com/simonging/packg"
 
 [tool.setuptools]
 zip-safe = true

{packg-0.7.2 → packg-0.9.2}/src/packg/__init__.py

@@ -2,4 +2,4 @@ from .constclass import Const
 from .misc import format_exception
 
 __all__ = ["Const", "format_exception"]
-__version__ = "0.7.2"
+__version__ = "0.9.2"

{packg-0.7.2 → packg-0.9.2}/src/packg/iotools/__init__.py

@@ -6,7 +6,8 @@ but from the actual source file. For everything outside, importing from this __i
 from .file_indexer import make_index, sort_file_paths_with_dirs_separated
 from .file_reader import (
     yield_chunked_bytes,
-    yield_nonempty_stripped_lines,
+    yield_lines_from_file,
+    yield_lines_from_object,
     read_bytes_from_file_or_io,
     read_text_from_file_or_io,
     open_file_or_io,
@@ -38,7 +39,8 @@ from .yamlext import load_yaml, loads_yaml, dump_yaml, dumps_yaml
 __all__ = [
     "set_working_directory",
     "yield_chunked_bytes",
-    "yield_nonempty_stripped_lines",
+    "yield_lines_from_file",
+    "yield_lines_from_object",
     "load_json",
     "loads_json",
     "load_jsonl",

{packg-0.7.2 → packg-0.9.2}/src/packg/iotools/file_reader.py

@@ -6,7 +6,7 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import Union, Iterable
 
-from packg.typext import PathOrIO, PathTypeCls
+from packg.typext import PathOrIO, PathTypeCls, PathType
 
 
 @contextmanager
@@ -78,27 +78,49 @@ def yield_chunked_bytes(file_or_io: PathOrIO, chunk_size=1024 * 1024) -> Iterabl
             yield data
 
 
-def yield_nonempty_stripped_lines(lines_obj: Union[PathOrIO, Iterable[str]]) -> Iterable[str]:
+def yield_lines_from_object(
+    lines_obj: Union[str, Iterable[str]], strip: bool = True, skip_empty: bool = True
+) -> Iterable[str]:
     """
     Read lines from input, strip whitespaces, skip empty lines, yield lines.
 
     Args:
-        lines_obj: Can be any of:
-            - iterable of str (list, opened file)
-            - filepath str or Path
+        lines_obj: Either str or iterable of str (list, opened file)
+        strip: strip whitespace from lines
+        skip_empty: skip empty lines
 
     Returns:
         Generator of stripped lines
 
     Examples:
-        >>> for li in yield_nonempty_stripped_lines(["  a  ", "  ", "  b  "]): print(li, end=",")
+        >>> for li in yield_lines_from_object(["  a  ", "  ", "  b  "]): print(li, end=",")
         a,b,
     """
     if isinstance(lines_obj, str):
         lines_obj = lines_obj.splitlines()
-    with open_file_or_io(lines_obj) as fh:
-        for line in fh:
+    for line in lines_obj:
+        if strip:
             line = line.strip()
+        if skip_empty:
             if line == "":
                 continue
-            yield line
+        yield line
+
+
+def yield_lines_from_file(
+    file: PathType, strip: bool = True, skip_empty: bool = True, encoding: str = "utf-8"
+) -> Iterable[str]:
+    """
+    Read lines from input, strip whitespaces, skip empty lines, yield lines.
+
+    Args:
+        file: Either str or iterable of str (list, opened file)
+        strip: strip whitespace from lines
+        skip_empty: skip empty lines
+        encoding: encoding to use for reading
+
+    Returns:
+        Generator of stripped lines
+    """
+    content = Path(file).read_text(encoding=encoding)
+    yield from yield_lines_from_object(content, strip=strip, skip_empty=skip_empty)

{packg-0.7.2 → packg-0.9.2}/src/packg/iotools/git_status_checker.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Dict
 
-from packg.iotools.file_reader import yield_nonempty_stripped_lines
+from packg.iotools.file_reader import yield_lines_from_object
 from packg.iotools.misc import set_working_directory
 from packg.system import systemcall_with_assert
 from packg.typext import PathType
@@ -23,7 +23,7 @@ def parse_gitadd_dryrun_output(
         Alternative way to do this would be git status: https://git-scm.com/docs/git-status#_output
     """
     files = {}
-    for line in yield_nonempty_stripped_lines(output.splitlines()):
+    for line in yield_lines_from_object(output.splitlines()):
         line_split = line.split(" ")
         status = line_split[0].strip()
         file = " ".join(line_split[1:]).strip()[1:-1]

{packg-0.7.2 → packg-0.9.2}/src/packg/log.py

@@ -1,5 +1,4 @@
 """
-
 - Utils for the loguru package
   https://loguru.readthedocs.io/en/stable/overview.html
   https://loguru.readthedocs.io/en/stable/resources/recipes.html#changing-the-level-of-an-existing-handler
@@ -12,19 +11,20 @@ Usage:
     configure_logger(level=get_logger_level_from_args(args), format=SHORTEST_FORMAT)
     logger.info("Hello")
 """
+from __future__ import annotations
+
 import logging
 import os
 import sys
 from copy import deepcopy
 from logging import getLevelName
-from typing import Union, Optional, List, Any, Dict
 
 from loguru import logger
 from pathspec import PathSpec
 
 from packg.iotools.pathspec_matcher import make_pathspec
 
-LevelType = Union[str, int]  # either "DEBUG" or 10
+LevelType = str | int  # either "DEBUG" or 10
 DEFAULT_LOGURU_FORMAT = (
     "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | "
     "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - "
@@ -55,10 +55,10 @@ def configure_logger(
     sink=sys.stderr,
     format=SHORTEST_FORMAT,  # noqa # pylint: disable=redefined-builtin
     colorize=True,
-    add_sinks: Optional[List[Any]] = None,
-    kwargs_handler: Optional[Dict[str, Any]] = None,
-    **kwargs: Any,
-) -> Dict[str, Any]:
+    add_sinks: list[any] | list[dict[str, any]] | None = None,
+    kwargs_handler: dict[str, any] | None = None,
+    **kwargs: any,
+) -> dict[str, any]:
     """
     Configure the loguru logger. For more complex usages, use logger.configure() directly.
 
@@ -67,7 +67,8 @@ def configure_logger(
         sink: where to write the logs to
         format: message formatting
         colorize: add color codes to the output
-        add_sinks: other sinks to add (str will add a file sink)
+        add_sinks: list of other sinks to add. str sinks will write to file.
+            use a dictionary to change parameters format, colorize, level separately from main sink.
         kwargs_handler: additional parameters to pass to each handler
         **kwargs: additional parameters to pass to logger.configure()
 
@@ -83,13 +84,23 @@ def configure_logger(
     kwargs_handler = kwargs_handler if kwargs_handler is not None else {}
     sinks = [sink] + add_sinks
     handlers = []
+    level_str = get_level_as_str(level)
     for lsink in sinks:
-        params = {
-            "sink": lsink,
-            "format": format,
-            "colorize": colorize,
-            "level": get_level_as_str(level),
-        }
+        if isinstance(lsink, dict):
+            params = lsink
+            if "format" not in params:
+                params["format"] = format
+            if "colorize" not in params:
+                params["colorize"] = colorize
+            if "level" not in params:
+                params["level"] = level_str
+        else:
+            params = {
+                "sink": lsink,
+                "format": format,
+                "colorize": colorize,
+                "level": level_str,
+            }
         assert "sink" not in kwargs_handler, f"sink is a reserved key, got {params}"
         params.update(deepcopy(kwargs_handler))
         if isinstance(lsink, str):

{packg-0.7.2 → packg-0.9.2/src/packg.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: packg
-Version: 0.7.2
+Version: 0.9.2
 Summary: Collection of utilities used in other python projects.
-Author: gingsi
+Author: simonging
 License: Apache-2.0
-Project-URL: Project-URL, https://github.com/gingsi/packg
+Project-URL: Project-URL, https://github.com/simonging/packg
 Keywords: attrs,typing,dict,attr
 Platform: any
 Classifier: Development Status :: 3 - Alpha
@@ -36,13 +36,13 @@ Requires-Dist: requests
 # packg
 
 <p align="center">
-<a href="https://github.com/gingsi/packg/actions/workflows/build-py37.yml">
-  <img alt="build 3.7 status" title="build 3.7 status" src="https://img.shields.io/github/actions/workflow/status/gingsi/packg/build-py37.yml?branch=main&label=build%203.7" />
+<a href="https://github.com/simonging/packg/actions/workflows/build-py37.yml">
+  <img alt="build 3.7 status" title="build 3.7 status" src="https://img.shields.io/github/actions/workflow/status/simonging/packg/build-py37.yml?branch=main&label=build%203.7" />
 </a>
-<a href="https://github.com/gingsi/packg/actions/workflows/build-py310.yml">
-  <img alt="build 3.10 status" title="build 3.10 status" src="https://img.shields.io/github/actions/workflow/status/gingsi/packg/build-py310.yml?branch=main&label=build%203.10" />
+<a href="https://github.com/simonging/packg/actions/workflows/build-py310.yml">
+  <img alt="build 3.10 status" title="build 3.10 status" src="https://img.shields.io/github/actions/workflow/status/simonging/packg/build-py310.yml?branch=main&label=build%203.10" />
 </a>
-<img alt="coverage" title="coverage" src="https://raw.githubusercontent.com/gingsi/packg/main/docs/coverage.svg" />
+<img alt="coverage" title="coverage" src="https://raw.githubusercontent.com/simonging/packg/main/docs/coverage.svg" />
 <a href="https://pypi.org/project/packg/">
   <img alt="version" title="version" src="https://img.shields.io/pypi/v/packg?color=success" />
 </a>