From 3a5f0d98b6b9f3a7a679e337983a1c8e315cb43f Mon Sep 17 00:00:00 2001 From: Alexandru Fikl Date: Sat, 20 Jan 2024 09:54:13 +0200 Subject: [PATCH] chore: bump requirements --- Makefile | 9 ++++- src/pyshocks/__init__.py | 62 ++++++++++++++--------------- src/pyshocks/advection/__init__.py | 12 +++--- src/pyshocks/burgers/__init__.py | 16 ++++---- src/pyshocks/continuity/__init__.py | 8 ++-- src/pyshocks/diffusion/__init__.py | 10 ++--- src/pyshocks/logging.py | 23 ++++------- 7 files changed, 68 insertions(+), 72 deletions(-) diff --git a/Makefile b/Makefile index c9c88c2..da2a20d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ help: ## Show this help # {{{ linting -format: black pyproject ## Run all formatting scripts +format: black isort pyproject ## Run all formatting scripts .PHONY: format fmt: format @@ -23,10 +23,15 @@ pyproject: ## Run pyproject-fmt over the configuration black: ## Run ruff format over the source code ruff format src tests examples docs drivers - ruff check --fix --select=I src tests examples docs @echo -e "\e[1;32mruff format clean!\e[0m" .PHONY: black +isort: ## Run ruff isort fixes over the source code + ruff check --fix --select=I src tests examples docs + ruff check --fix --select=RUF022 src + @echo -e "\e[1;32mruff isort clean!\e[0m" +.PHONY: isort + lint: ruff mypy doc8 codespell reuse manifest ## Run linting checks .PHONY: lint diff --git a/src/pyshocks/__init__.py b/src/pyshocks/__init__.py index cb39886..d921ca3 100644 --- a/src/pyshocks/__init__.py +++ b/src/pyshocks/__init__.py @@ -84,46 +84,46 @@ # }}} __all__ = ( - "T", + "BlockTimer", + "Boundary", + "BoundaryType", + "CombineConservationLawScheme", + "CombineScheme", + "ConservationLawScheme", + "EOCRecorder", + "FiniteDifferenceSchemeBase", + "FiniteVolumeSchemeBase", + "Grid", + "IterationTimer", "P", + "Quadrature", "ScalarFunction", - "VectorFunction", + "SchemeBase", + "SchemeT", "SpatialFunction", + "T", "TemporalFunction", - "Grid", + "TimeResult", "UniformGrid", - "make_uniform_cell_grid", - "make_uniform_point_grid", - "make_uniform_ssweno_grid", - "SchemeT", - "SchemeBase", - "CombineScheme", - "FiniteVolumeSchemeBase", - "FiniteDifferenceSchemeBase", - "bind", - "apply_operator", - "predict_timestep", - "ConservationLawScheme", - "CombineConservationLawScheme", - "flux", - "numerical_flux", - "Boundary", - "BoundaryType", + "VectorFunction", "apply_boundary", + "apply_operator", + "bind", + "cell_average", + "estimate_order_of_convergence", "evaluate_boundary", - "Quadrature", + "flux", + "get_logger", "make_leggauss_quadrature", - "cell_average", + "make_uniform_cell_grid", + "make_uniform_point_grid", + "make_uniform_ssweno_grid", "norm", - "rnorm", - "EOCRecorder", - "estimate_order_of_convergence", - "TimeResult", - "BlockTimer", - "IterationTimer", - "timeit", - "repeatit", + "numerical_flux", + "predict_timestep", "profileit", - "get_logger", + "repeatit", + "rnorm", "set_recommended_matplotlib", + "timeit", ) diff --git a/src/pyshocks/advection/__init__.py b/src/pyshocks/advection/__init__.py index 730ab00..1004b82 100644 --- a/src/pyshocks/advection/__init__.py +++ b/src/pyshocks/advection/__init__.py @@ -99,14 +99,14 @@ def make_scheme_from_name(name: str, **kwargs: Any) -> Scheme: # }}} __all__ = ( - "Scheme", - "FiniteVolumeScheme", - "FiniteDifferenceScheme", - "Godunov", - "Upwind", "ESWENO32", "SBPSAT", + "FiniteDifferenceScheme", + "FiniteVolumeScheme", "FluxSplitGodunov", - "scheme_ids", + "Godunov", + "Scheme", + "Upwind", "make_scheme_from_name", + "scheme_ids", ) diff --git a/src/pyshocks/burgers/__init__.py b/src/pyshocks/burgers/__init__.py index 7b9bbca..327963c 100644 --- a/src/pyshocks/burgers/__init__.py +++ b/src/pyshocks/burgers/__init__.py @@ -102,17 +102,17 @@ def make_scheme_from_name(name: str, **kwargs: Any) -> Scheme: __all__ = ( - "Scheme", - "FiniteVolumeScheme", - "FiniteDifferenceScheme", - "Godunov", - "Rusanov", - "LaxFriedrichs", - "EngquistOsher", "ESWENO32", "SSMUSCL", "SSWENO242", + "EngquistOsher", + "FiniteDifferenceScheme", + "FiniteVolumeScheme", "FluxSplitRusanov", - "scheme_ids", + "Godunov", + "LaxFriedrichs", + "Rusanov", + "Scheme", "make_scheme_from_name", + "scheme_ids", ) diff --git a/src/pyshocks/continuity/__init__.py b/src/pyshocks/continuity/__init__.py index 5ef3264..8442878 100644 --- a/src/pyshocks/continuity/__init__.py +++ b/src/pyshocks/continuity/__init__.py @@ -121,11 +121,11 @@ def check_oslc(grid: Grid, velocity: SpatialFunction, *, n: int = 512) -> Scalar __all__ = ( - "Scheme", - "FiniteVolumeScheme", "FiniteDifferenceScheme", + "FiniteVolumeScheme", "Godunov", - "scheme_ids", - "make_scheme_from_name", + "Scheme", "check_oslc", + "make_scheme_from_name", + "scheme_ids", ) diff --git a/src/pyshocks/diffusion/__init__.py b/src/pyshocks/diffusion/__init__.py index 62c87fe..9025693 100644 --- a/src/pyshocks/diffusion/__init__.py +++ b/src/pyshocks/diffusion/__init__.py @@ -81,11 +81,11 @@ def make_scheme_from_name(name: str, **kwargs: Any) -> Scheme: # }}} __all__ = ( - "Scheme", - "FiniteVolumeScheme", - "FiniteDifferenceScheme", - "CenteredScheme", "SBPSAT", - "scheme_ids", + "CenteredScheme", + "FiniteDifferenceScheme", + "FiniteVolumeScheme", + "Scheme", "make_scheme_from_name", + "scheme_ids", ) diff --git a/src/pyshocks/logging.py b/src/pyshocks/logging.py index dc52b56..a251409 100644 --- a/src/pyshocks/logging.py +++ b/src/pyshocks/logging.py @@ -4,6 +4,7 @@ from __future__ import annotations import logging +import os def get_logger( @@ -11,28 +12,18 @@ def get_logger( level: int | str | None = None, ) -> logging.Logger: if level is None: - level = logging.INFO + level = os.environ.get("PYSHOCKS_LOGGING_LEVEL", "INFO").upper() if isinstance(level, str): level = getattr(logging, level.upper()) assert isinstance(level, int) - logger = logging.getLogger(module) - logger.propagate = False - logger.setLevel(level) - - try: + root = logging.getLogger("pyshocks") + if not root.handlers: from rich.logging import RichHandler - logger.addHandler(RichHandler()) - except ImportError: - # NOTE: rich is vendored by pip since November 2021 - try: - from pip._vendor.rich.logging import RichHandler # type: ignore - - logger.addHandler(RichHandler()) - except ImportError: - logger.addHandler(logging.StreamHandler()) + root.setLevel(level) + root.addHandler(RichHandler()) - return logger + return logging.getLogger(module)