Skip to content

Commit

Permalink
style: run 'pre-commit run --all-files'
Browse files Browse the repository at this point in the history
  • Loading branch information
hgrecco committed Mar 9, 2024
1 parent f0185f2 commit cf26a01
Show file tree
Hide file tree
Showing 95 changed files with 292 additions and 231 deletions.
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
# All configuration values have a default; values that are commented out
# serve to show the default.
from __future__ import annotations

import datetime
from importlib.metadata import version
Expand Down
2 changes: 2 additions & 0 deletions docs/user/numpy.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"outputs": [],
"source": [
"# Import NumPy\n",
"from __future__ import annotations\n",
"\n",
"import numpy as np\n",
"\n",
"# Import Pint\n",
Expand Down
2 changes: 0 additions & 2 deletions pint/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from importlib.metadata import version

from .delegates.formatter._format_helpers import formatter

from .errors import ( # noqa: F401
DefinitionSyntaxError,
DimensionalityError,
Expand All @@ -31,7 +30,6 @@
from .registry import ApplicationRegistry, LazyRegistry, UnitRegistry
from .util import logger, pi_theorem # noqa: F401


# Default Quantity, Unit and Measurement are the ones
# build in the default registry.
Quantity = UnitRegistry.Quantity
Expand Down
4 changes: 2 additions & 2 deletions pint/_typing.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from __future__ import annotations

from typing import TYPE_CHECKING, Any, TypeVar, Union, Protocol
from collections.abc import Callable
from decimal import Decimal
from fractions import Fraction
from typing import TYPE_CHECKING, Any, Protocol, TypeVar, Union

from .compat import TypeAlias, Never
from .compat import Never, TypeAlias

if TYPE_CHECKING:
from .facets.plain import PlainQuantity as Quantity
Expand Down
18 changes: 10 additions & 8 deletions pint/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@

from __future__ import annotations

import sys
import math
import sys
from collections.abc import Callable, Iterable, Mapping
from decimal import Decimal
from importlib import import_module
from numbers import Number
from collections.abc import Mapping
from typing import Any, NoReturn
from collections.abc import Callable
from collections.abc import Iterable

try:
from uncertainties import UFloat, ufloat
Expand Down Expand Up @@ -190,11 +188,15 @@ def _to_magnitude(value, force_ndarray=False, force_ndarray_like=False):

# Defines Logarithm and Exponential for Logarithmic Converter
if HAS_NUMPY:
from numpy import exp # noqa: F401
from numpy import log # noqa: F401
from numpy import (
exp, # noqa: F401
log, # noqa: F401
)
else:
from math import exp # noqa: F401
from math import log # noqa: F401
from math import (
exp, # noqa: F401
log, # noqa: F401
)

if not HAS_BABEL:
babel_parse = missing_dependency("Babel") # noqa: F811
Expand Down
4 changes: 1 addition & 3 deletions pint/converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@

from dataclasses import dataclass
from dataclasses import fields as dc_fields

from typing import Any, ClassVar

from ._typing import Magnitude

from .compat import HAS_NUMPY, exp, log, Self # noqa: F401
from .compat import HAS_NUMPY, Self, exp, log # noqa: F401


@dataclass(frozen=True)
Expand Down
3 changes: 2 additions & 1 deletion pint/definitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@

from __future__ import annotations

from . import errors
import flexparser as fp

from . import errors
from .delegates import ParserConfig, txt_defparser


Expand Down
1 change: 1 addition & 0 deletions pint/delegates/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:copyright: 2022 by Pint Authors, see AUTHORS for more details.
:license: BSD, see LICENSE for more details.
"""
from __future__ import annotations

from . import txt_defparser
from .base_defparser import ParserConfig, build_disk_cache_class
Expand Down
6 changes: 3 additions & 3 deletions pint/delegates/base_defparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
from dataclasses import dataclass
from typing import Any

import flexcache as fc
import flexparser as fp

from pint import errors
from pint.facets.plain.definitions import NotNumeric
from pint.util import ParserHelper, UnitsContainer

import flexcache as fc
import flexparser as fp


@dataclass(frozen=True)
class ParserConfig:
Expand Down
2 changes: 1 addition & 1 deletion pint/delegates/formatter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:copyright: 2022 by Pint Authors, see AUTHORS for more details.
:license: BSD, see LICENSE for more details.
"""

from __future__ import annotations

from .full import FullFormatter

Expand Down
18 changes: 8 additions & 10 deletions pint/delegates/formatter/_format_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,20 @@

from __future__ import annotations

import locale
from collections.abc import Callable, Generator, Iterable
from contextlib import contextmanager
from functools import partial
from locale import LC_NUMERIC, getlocale, setlocale
from typing import (
Any,
TypeVar,
TYPE_CHECKING,
Any,
Literal,
TypedDict,
TypeVar,
)
from collections.abc import Generator, Iterable, Callable

from locale import getlocale, setlocale, LC_NUMERIC
from contextlib import contextmanager
from warnings import warn

import locale

from pint.delegates.formatter._spec_helpers import FORMATTER, _join

from ...compat import babel_parse, ndarray
Expand All @@ -38,9 +36,9 @@
np_integer = None

if TYPE_CHECKING:
from ...registry import UnitRegistry
from ...facets.plain import PlainUnit
from ...compat import Locale, Number
from ...facets.plain import PlainUnit
from ...registry import UnitRegistry

T = TypeVar("T")
U = TypeVar("U")
Expand Down
7 changes: 4 additions & 3 deletions pint/delegates/formatter/_spec_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@

from __future__ import annotations

from typing import Any
from collections.abc import Iterable, Callable
import re
import warnings
from collections.abc import Callable, Iterable
from typing import Any

from ...compat import Number
import re

FORMATTER = Callable[
[
Expand Down
11 changes: 5 additions & 6 deletions pint/delegates/formatter/_to_register.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@

from __future__ import annotations

from typing import TYPE_CHECKING
from collections.abc import Callable
from ...compat import ndarray, np, Unpack
from ._spec_helpers import split_format, join_mu, REGISTERED_FORMATTERS
from typing import TYPE_CHECKING

from ..._typing import Magnitude

from ._format_helpers import format_compound_unit, BabelKwds, override_locale
from ...compat import Unpack, ndarray, np
from ._format_helpers import BabelKwds, format_compound_unit, override_locale
from ._spec_helpers import REGISTERED_FORMATTERS, join_mu, split_format

if TYPE_CHECKING:
from ...facets.plain import PlainQuantity, PlainUnit, MagnitudeT
from ...facets.plain import MagnitudeT, PlainQuantity, PlainUnit
from ...registry import UnitRegistry


Expand Down
20 changes: 10 additions & 10 deletions pint/delegates/formatter/full.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@

from __future__ import annotations

from typing import TYPE_CHECKING, Literal, Any
from collections.abc import Callable, Iterable
import locale
from ...compat import babel_parse, Number, Unpack
from ...util import iterable
from collections.abc import Callable, Iterable
from typing import TYPE_CHECKING, Any, Literal

from ..._typing import Magnitude
from .html import HTMLFormatter
from .latex import LatexFormatter, SIunitxFormatter
from .plain import RawFormatter, CompactFormatter, PrettyFormatter, DefaultFormatter
from ...compat import Number, Unpack, babel_parse
from ...util import iterable
from ._format_helpers import BabelKwds
from ._to_register import REGISTERED_FORMATTERS
from .html import HTMLFormatter
from .latex import LatexFormatter, SIunitxFormatter
from .plain import CompactFormatter, DefaultFormatter, PrettyFormatter, RawFormatter

if TYPE_CHECKING:
from ...compat import Locale
from ...facets.measurement import Measurement
from ...facets.plain import (
GenericPlainRegistry,
MagnitudeT,
PlainQuantity,
PlainUnit,
MagnitudeT,
)
from ...facets.measurement import Measurement
from ...compat import Locale


class FullFormatter:
Expand Down
14 changes: 7 additions & 7 deletions pint/delegates/formatter/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@

from __future__ import annotations

from typing import TYPE_CHECKING
import re
from typing import TYPE_CHECKING

from ..._typing import Magnitude
from ...compat import Unpack, ndarray, np
from ...util import iterable
from ...compat import ndarray, np, Unpack
from ._format_helpers import BabelKwds, format_compound_unit, formatter, override_locale
from ._spec_helpers import (
split_format,
join_mu,
join_unc,
remove_custom_flags,
split_format,
)

from ..._typing import Magnitude
from ._format_helpers import BabelKwds, format_compound_unit, formatter, override_locale

if TYPE_CHECKING:
from ...facets.plain import PlainQuantity, PlainUnit, MagnitudeT
from ...facets.measurement import Measurement
from ...facets.plain import MagnitudeT, PlainQuantity, PlainUnit

_EXP_PATTERN = re.compile(r"([0-9]\.?[0-9]*)e(-?)\+?0*([0-9]+)")

Expand Down
24 changes: 14 additions & 10 deletions pint/delegates/formatter/latex.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,28 @@


from __future__ import annotations
import functools

from typing import TYPE_CHECKING, Any
from collections.abc import Iterable

import functools
import re
from ._spec_helpers import split_format, FORMATTER
from collections.abc import Iterable
from typing import TYPE_CHECKING, Any

from ..._typing import Magnitude
from ...compat import ndarray, Unpack, Number
from ._format_helpers import BabelKwds, formatter, override_locale, format_compound_unit
from ._spec_helpers import join_mu, join_unc, remove_custom_flags
from ...compat import Number, Unpack, ndarray
from ._format_helpers import BabelKwds, format_compound_unit, formatter, override_locale
from ._spec_helpers import (
FORMATTER,
join_mu,
join_unc,
remove_custom_flags,
split_format,
)

if TYPE_CHECKING:
from ...facets.plain import PlainQuantity, PlainUnit, MagnitudeT
from ...facets.measurement import Measurement
from ...util import ItMatrix
from ...facets.plain import MagnitudeT, PlainQuantity, PlainUnit
from ...registry import UnitRegistry
from ...util import ItMatrix


def vector_to_latex(
Expand Down
17 changes: 8 additions & 9 deletions pint/delegates/formatter/plain.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,23 @@

from __future__ import annotations

from typing import TYPE_CHECKING
import re
from ...compat import ndarray, np, Unpack
from typing import TYPE_CHECKING

from ..._typing import Magnitude
from ...compat import Unpack, ndarray, np
from ._format_helpers import BabelKwds, format_compound_unit, formatter, override_locale
from ._spec_helpers import (
pretty_fmt_exponent,
split_format,
join_mu,
join_unc,
pretty_fmt_exponent,
remove_custom_flags,
split_format,
)

from ..._typing import Magnitude

from ._format_helpers import format_compound_unit, BabelKwds, formatter, override_locale

if TYPE_CHECKING:
from ...facets.plain import PlainQuantity, PlainUnit, MagnitudeT
from ...facets.measurement import Measurement
from ...facets.plain import MagnitudeT, PlainQuantity, PlainUnit


_EXP_PATTERN = re.compile(r"([0-9]\.?[0-9]*)e(-?)\+?0*([0-9]+)")
Expand Down
2 changes: 1 addition & 1 deletion pint/delegates/txt_defparser/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:copyright: 2022 by Pint Authors, see AUTHORS for more details.
:license: BSD, see LICENSE for more details.
"""

from __future__ import annotations

from .defparser import DefParser

Expand Down
4 changes: 2 additions & 2 deletions pint/delegates/txt_defparser/block.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
from __future__ import annotations

from dataclasses import dataclass

from typing import Generic, TypeVar

from ..base_defparser import PintParsedStatement, ParserConfig
import flexparser as fp

from ..base_defparser import ParserConfig, PintParsedStatement


@dataclass(frozen=True)
class EndDirectiveBlock(PintParsedStatement):
Expand Down
Loading

0 comments on commit cf26a01

Please sign in to comment.