From cadd0800a1db5a0c76842cf4ad3098259bfa8ea2 Mon Sep 17 00:00:00 2001 From: Alexandru Fikl <alexfikl@gmail.com> Date: Fri, 14 Mar 2025 20:07:21 +0200 Subject: [PATCH] feat: enable and fix PGH ruff rules --- pyproject.toml | 7 ++++--- pytools/__init__.py | 2 +- pytools/mpiwrap.py | 11 +++++------ pytools/py_codegen.py | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 80c7b8e..6c2af6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,12 +72,13 @@ extend-select = [ "I", # flake8-isort "N", # pep8-naming "NPY", # numpy + "PGH", # pygrep-hooks "Q", # flake8-quotes - "UP", # pyupgrade "RUF", # ruff + "SIM", # flake8-simplify + "TC", # flake8-type-checking + "UP", # pyupgrade "W", # pycodestyle - "TC", - "SIM", ] extend-ignore = [ "C90", # McCabe complexity diff --git a/pytools/__init__.py b/pytools/__init__.py index 08307a8..6a882df 100644 --- a/pytools/__init__.py +++ b/pytools/__init__.py @@ -716,7 +716,7 @@ def memoize(*args: F, **kwargs: Any) -> F: return wrapper if not args: - return _decorator # type: ignore + return _decorator # type: ignore[return-value] if callable(args[0]) and len(args) == 1: return _decorator(args[0]) raise TypeError( diff --git a/pytools/mpiwrap.py b/pytools/mpiwrap.py index b744b43..f8334ed 100644 --- a/pytools/mpiwrap.py +++ b/pytools/mpiwrap.py @@ -6,7 +6,7 @@ import mpi4py.rc # pylint:disable=import-error mpi4py.rc.initialize = False -from mpi4py.MPI import * # noqa pylint:disable=wildcard-import,wrong-import-position +from mpi4py.MPI import * # noqa: F403 pylint:disable=wildcard-import,wrong-import-position import pytools.prefork # pylint:disable=wrong-import-position @@ -14,13 +14,12 @@ import pytools.prefork # pylint:disable=wrong-import-position pytools.prefork.enable_prefork() -# pylint: disable-next=undefined-variable -if Is_initialized(): # type: ignore[name-defined,unused-ignore] # noqa +if Is_initialized(): # type: ignore[name-defined] # noqa: F405 raise RuntimeError("MPI already initialized before MPI wrapper import") -def InitWithAutoFinalize(*args, **kwargs): # noqa - result = Init(*args, **kwargs) # noqa pylint:disable=undefined-variable +def InitWithAutoFinalize(*args, **kwargs): # noqa: N802 + result = Init(*args, **kwargs) # noqa: F405 import atexit - atexit.register(Finalize) # noqa pylint:disable=undefined-variable + atexit.register(Finalize) # # noqa: F405 return result diff --git a/pytools/py_codegen.py b/pytools/py_codegen.py index a1d8749..a3f6e60 100644 --- a/pytools/py_codegen.py +++ b/pytools/py_codegen.py @@ -27,7 +27,7 @@ import marshal from importlib.util import MAGIC_NUMBER as BYTECODE_VERSION from types import FunctionType, ModuleType -from pytools.codegen import ( # noqa +from pytools.codegen import ( # noqa: F401 CodeGenerator as CodeGeneratorBase, Indentation, remove_common_indentation, -- GitLab