diff --git a/src/packg/__init__.py b/src/packg/__init__.py index f272c4e..df2a89a 100644 --- a/src/packg/__init__.py +++ b/src/packg/__init__.py @@ -2,4 +2,5 @@ from .misc import format_exception __all__ = ["Const", "format_exception"] -__version__ = "0.20.12" +__version__ = "0.20.13" + diff --git a/src/packg/cli/cleanup_builds.py b/src/packg/cli/cleanup_builds.py index 169f638..96d2508 100644 --- a/src/packg/cli/cleanup_builds.py +++ b/src/packg/cli/cleanup_builds.py @@ -8,9 +8,9 @@ from attrs import define from loguru import logger +from typedparser import VerboseQuietArgs, add_argument, TypedParser from packg import format_exception from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args -from typedparser import VerboseQuietArgs, add_argument, TypedParser @define diff --git a/src/packg/cli/count_endings.py b/src/packg/cli/count_endings.py index 4e5dffa..e9c7c88 100644 --- a/src/packg/cli/count_endings.py +++ b/src/packg/cli/count_endings.py @@ -6,12 +6,12 @@ from collections import defaultdict from pathlib import Path -from attrs import define from loguru import logger +from attrs import define +from typedparser import VerboseQuietArgs, add_argument, TypedParser from packg.iotools import make_index from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args -from typedparser import VerboseQuietArgs, add_argument, TypedParser @define diff --git a/src/packg/cli/count_lines.py b/src/packg/cli/count_lines.py index 4eeece5..bf536d8 100644 --- a/src/packg/cli/count_lines.py +++ b/src/packg/cli/count_lines.py @@ -1,6 +1,7 @@ """ Count lines per file endings in a directory. """ + from __future__ import annotations from collections import defaultdict @@ -10,6 +11,7 @@ from attrs import define from loguru import logger +from typedparser import VerboseQuietArgs, add_argument, TypedParser from packg import format_exception from packg.iotools import make_index from packg.iotools.encoding import ( @@ -18,7 +20,6 @@ ) from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args from packg.tqdmext import tqdm_max_ncols -from typedparser import VerboseQuietArgs, add_argument, TypedParser @define diff --git a/src/packg/cli/create_package_autocomplete.py b/src/packg/cli/create_package_autocomplete.py index 611dab8..cccd474 100644 --- a/src/packg/cli/create_package_autocomplete.py +++ b/src/packg/cli/create_package_autocomplete.py @@ -13,9 +13,9 @@ from attrs import define from loguru import logger +from typedparser import VerboseQuietArgs, add_argument, TypedParser from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args from packg.packaging import FILEDIR_AUTOCOMPLETE, create_bash_autocomplete_script -from typedparser import VerboseQuietArgs, add_argument, TypedParser @define diff --git a/src/packg/cli/download_list_of_urls.py b/src/packg/cli/download_list_of_urls.py index 0fbb547..43fbff5 100644 --- a/src/packg/cli/download_list_of_urls.py +++ b/src/packg/cli/download_list_of_urls.py @@ -13,11 +13,11 @@ from attrs import define from loguru import logger +from typedparser import VerboseQuietArgs, add_argument, TypedParser from packg.iotools import yield_lines_from_file from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args from packg.multiproc import FnMultiProcessor from packg.web import download_file -from typedparser import VerboseQuietArgs, add_argument, TypedParser @define diff --git a/src/packg/cli/import_all.py b/src/packg/cli/import_all.py index f6a7eb9..e163e95 100644 --- a/src/packg/cli/import_all.py +++ b/src/packg/cli/import_all.py @@ -11,12 +11,12 @@ from attrs import define from loguru import logger +from typedparser import VerboseQuietArgs, add_argument, TypedParser from packg.iotools import make_git_pathspec from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args from packg.system import systemcall from packg.testing import recurse_modules from packg.tqdmext import tqdm_max_ncols -from typedparser import VerboseQuietArgs, add_argument, TypedParser @define diff --git a/src/packg/cli/multiproc_example.py b/src/packg/cli/multiproc_example.py index b017c7c..e5e57c7 100644 --- a/src/packg/cli/multiproc_example.py +++ b/src/packg/cli/multiproc_example.py @@ -5,9 +5,9 @@ from attrs import define from loguru import logger +from typedparser import TypedParser, add_argument, VerboseQuietArgs from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args from packg.multiproc import FnMultiProcessor -from typedparser import TypedParser, add_argument, VerboseQuietArgs @define diff --git a/src/packg/cli/pip_update_all.py b/src/packg/cli/pip_update_all.py index 03ce6aa..f494989 100644 --- a/src/packg/cli/pip_update_all.py +++ b/src/packg/cli/pip_update_all.py @@ -1,10 +1,10 @@ from attrs import define from loguru import logger +from typedparser import VerboseQuietArgs, TypedParser from packg.iotools import loads_json from packg.log import SHORTEST_FORMAT, configure_logger, get_logger_level_from_args from packg.system import systemcall_with_assert -from typedparser import VerboseQuietArgs, TypedParser @define diff --git a/src/packg/iotools/compress.py b/src/packg/iotools/compress.py index 7ec0871..35f0091 100644 --- a/src/packg/iotools/compress.py +++ b/src/packg/iotools/compress.py @@ -13,8 +13,8 @@ import zstandard -from packg import Const -from packg.iotools import read_bytes_from_file_or_io, open_file_or_io +from packg.constclass import Const +from packg.iotools.file_reader import read_bytes_from_file_or_io, open_file_or_io def load_xz(file, mode: str = "rt", encoding: str = "utf-8"): diff --git a/src/packg/iotools/file_indexer.py b/src/packg/iotools/file_indexer.py index bd5c8a1..cafe9cb 100644 --- a/src/packg/iotools/file_indexer.py +++ b/src/packg/iotools/file_indexer.py @@ -15,6 +15,7 @@ from attr import define from tqdm import tqdm +from typedparser import NamedTupleMixin from packg import format_exception from packg.iotools.pathspec_matcher import ( PathSpecArgs, @@ -25,7 +26,6 @@ ) from packg.log import logger from packg.typext import PathType -from typedparser import NamedTupleMixin def regex_glob( diff --git a/src/packg/iotools/jsonext_encoder.py b/src/packg/iotools/jsonext_encoder.py index 0fd1e8f..e7090fc 100644 --- a/src/packg/iotools/jsonext_encoder.py +++ b/src/packg/iotools/jsonext_encoder.py @@ -1,6 +1,8 @@ """JSON encoder implementation for jsonext.py""" # pylint: skip-file +# since this is mostly a reimplementation of the original json.encoder module +# there is no point in fixing all the lint errors import json from json.encoder import ( c_make_encoder, # noqa diff --git a/src/packg/iotools/pathspec_matcher.py b/src/packg/iotools/pathspec_matcher.py index 86b2dc7..429b443 100644 --- a/src/packg/iotools/pathspec_matcher.py +++ b/src/packg/iotools/pathspec_matcher.py @@ -13,8 +13,8 @@ from attr import define from pathspec import PathSpec, patterns as p_patterns, RegexPattern, Pattern -from packg.typext import PathType from typedparser import add_argument +from packg.typext import PathType class PathSpecRepr(PathSpec): diff --git a/src/packg/iotools/yamlext.py b/src/packg/iotools/yamlext.py index 7221951..328b50d 100644 --- a/src/packg/iotools/yamlext.py +++ b/src/packg/iotools/yamlext.py @@ -10,14 +10,14 @@ import yaml -from packg.iotools.file_reader import read_text_from_file_or_io -from packg.typext import PathOrIO, PathTypeCls from typedparser.objects import ( is_any_mapping, is_any_iterable, compare_nested_objects, modify_nested_object, ) +from packg.iotools.file_reader import read_text_from_file_or_io +from packg.typext import PathOrIO, PathTypeCls def load_yaml(file_or_io: PathOrIO) -> Any: diff --git a/src/packg/multiproc/multiproc_producer_consumer.py b/src/packg/multiproc/multiproc_producer_consumer.py index 98f3ccd..8a329b6 100644 --- a/src/packg/multiproc/multiproc_producer_consumer.py +++ b/src/packg/multiproc/multiproc_producer_consumer.py @@ -8,6 +8,7 @@ from statistics import mean from timeit import default_timer from typing import Optional, Any + from attr import define, field from loguru import logger