From 3e6b50cabeb9b86e23eea51a0cc96875488929df Mon Sep 17 00:00:00 2001 From: Patrick Roddy Date: Tue, 31 Oct 2023 09:02:50 +0000 Subject: [PATCH] Remove `ignore` in favor of `noqa` (#274) --- examples/arbitrary/__init__.py | 1 + .../arbitrary/_denoising_slepian_wavelet.py | 2 +- examples/arbitrary/africa/__init__.py | 1 + examples/arbitrary/south_america/__init__.py | 1 + examples/mesh/__init__.py | 1 + examples/misc/__init__.py | 1 + examples/misc/_denoising_axisym.py | 2 +- examples/polar_cap/__init__.py | 1 + examples/wavelets/__init__.py | 1 + pyproject.toml | 3 --- ...xisymmetric_wavelet_coefficients_africa.py | 6 +++++- ...axisymmetric_wavelet_coefficients_earth.py | 6 +++++- ...tric_wavelet_coefficients_south_america.py | 6 +++++- .../functions/axisymmetric_wavelets.py | 6 +++++- src/sleplet/functions/ridgelets.py | 6 +++++- src/sleplet/functions/slepian.py | 5 ++++- .../slepian_wavelet_coefficients_africa.py | 6 +++++- ...pian_wavelet_coefficients_south_america.py | 6 +++++- src/sleplet/functions/slepian_wavelets.py | 6 +++++- src/sleplet/functions/spherical_harmonic.py | 12 +++++++++-- src/sleplet/meshes/mesh_basis_functions.py | 5 ++++- src/sleplet/meshes/mesh_slepian_functions.py | 5 ++++- .../mesh_slepian_wavelet_coefficients.py | 6 +++++- src/sleplet/meshes/mesh_slepian_wavelets.py | 6 +++++- src/sleplet/slepian/region.py | 20 +++++++++++++++---- src/sleplet/slepian/slepian_polar_cap.py | 5 ++++- tests/__init__.py | 1 + 27 files changed, 102 insertions(+), 25 deletions(-) diff --git a/examples/arbitrary/__init__.py b/examples/arbitrary/__init__.py index e69de29bb..6e031999e 100644 --- a/examples/arbitrary/__init__.py +++ b/examples/arbitrary/__init__.py @@ -0,0 +1 @@ +# noqa: D104 diff --git a/examples/arbitrary/_denoising_slepian_wavelet.py b/examples/arbitrary/_denoising_slepian_wavelet.py index 9854c9a8f..f2e136a92 100644 --- a/examples/arbitrary/_denoising_slepian_wavelet.py +++ b/examples/arbitrary/_denoising_slepian_wavelet.py @@ -21,7 +21,7 @@ def denoising_slepian_wavelet( ) # compute wavelet noise - sigma_j = sleplet.noise._compute_slepian_sigma_j( + sigma_j = sleplet.noise._compute_slepian_sigma_j( # noqa: SLF001 signal.L, signal.coefficients, slepian_wavelets.wavelets, diff --git a/examples/arbitrary/africa/__init__.py b/examples/arbitrary/africa/__init__.py index e69de29bb..6e031999e 100644 --- a/examples/arbitrary/africa/__init__.py +++ b/examples/arbitrary/africa/__init__.py @@ -0,0 +1 @@ +# noqa: D104 diff --git a/examples/arbitrary/south_america/__init__.py b/examples/arbitrary/south_america/__init__.py index e69de29bb..6e031999e 100644 --- a/examples/arbitrary/south_america/__init__.py +++ b/examples/arbitrary/south_america/__init__.py @@ -0,0 +1 @@ +# noqa: D104 diff --git a/examples/mesh/__init__.py b/examples/mesh/__init__.py index e69de29bb..6e031999e 100644 --- a/examples/mesh/__init__.py +++ b/examples/mesh/__init__.py @@ -0,0 +1 @@ +# noqa: D104 diff --git a/examples/misc/__init__.py b/examples/misc/__init__.py index e69de29bb..6e031999e 100644 --- a/examples/misc/__init__.py +++ b/examples/misc/__init__.py @@ -0,0 +1 @@ +# noqa: D104 diff --git a/examples/misc/_denoising_axisym.py b/examples/misc/_denoising_axisym.py index 210f0e255..561bb5f94 100644 --- a/examples/misc/_denoising_axisym.py +++ b/examples/misc/_denoising_axisym.py @@ -30,7 +30,7 @@ def denoising_axisym( # noqa: PLR0913 ) # compute wavelet noise - sigma_j = sleplet.noise._compute_sigma_j( + sigma_j = sleplet.noise._compute_sigma_j( # noqa: SLF001 signal.coefficients, axisymmetric_wavelets.wavelets[1:], snr_in, diff --git a/examples/polar_cap/__init__.py b/examples/polar_cap/__init__.py index e69de29bb..6e031999e 100644 --- a/examples/polar_cap/__init__.py +++ b/examples/polar_cap/__init__.py @@ -0,0 +1 @@ +# noqa: D104 diff --git a/examples/wavelets/__init__.py b/examples/wavelets/__init__.py index e69de29bb..6e031999e 100644 --- a/examples/wavelets/__init__.py +++ b/examples/wavelets/__init__.py @@ -0,0 +1 @@ +# noqa: D104 diff --git a/pyproject.toml b/pyproject.toml index 45fff7afb..ea5f12139 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -122,14 +122,11 @@ isort = {known-first-party = [ ]}} per-file-ignores = {"examples*" = [ "D100", - "D104", - "SLF001", "T201", ], "src*" = [ "SLF001", ], "tests*" = [ "D100", - "D104", "S101", "SLF001", ]} diff --git a/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py b/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py index a338d372f..bb2a90e93 100644 --- a/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py +++ b/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py @@ -90,7 +90,11 @@ def _create_wavelet_coefficients( return wavelets, wavelet_coefficients @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"], diff --git a/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py b/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py index 18ffc3adc..a863537fd 100644 --- a/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py +++ b/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py @@ -87,7 +87,11 @@ def _create_wavelet_coefficients( return wavelets, wavelet_coefficients @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"], diff --git a/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py b/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py index 509ce0a62..ab513299c 100644 --- a/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py +++ b/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py @@ -89,7 +89,11 @@ def _create_wavelet_coefficients( return wavelets, wavelet_coefficients @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"], diff --git a/src/sleplet/functions/axisymmetric_wavelets.py b/src/sleplet/functions/axisymmetric_wavelets.py index 8116b49cd..94d9b4009 100644 --- a/src/sleplet/functions/axisymmetric_wavelets.py +++ b/src/sleplet/functions/axisymmetric_wavelets.py @@ -74,7 +74,11 @@ def _create_wavelets(self: typing_extensions.Self) -> npt.NDArray[np.complex_]: ) @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"], diff --git a/src/sleplet/functions/ridgelets.py b/src/sleplet/functions/ridgelets.py index 9131e6641..359d49194 100644 --- a/src/sleplet/functions/ridgelets.py +++ b/src/sleplet/functions/ridgelets.py @@ -109,7 +109,11 @@ def _compute_ring(self: typing_extensions.Self) -> npt.NDArray[np.complex_]: return ring_lm @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"], diff --git a/src/sleplet/functions/slepian.py b/src/sleplet/functions/slepian.py index 55034bcb8..e130f40a4 100644 --- a/src/sleplet/functions/slepian.py +++ b/src/sleplet/functions/slepian.py @@ -77,7 +77,10 @@ def _validate_rank(self: typing_extensions.Self) -> None: raise ValueError(msg) @pydantic.field_validator("rank") - def _check_rank(cls, v: int) -> int: # noqa: ANN101 + def _check_rank( + cls, # noqa: ANN101 + v: int, + ) -> int: if not isinstance(v, int): msg = "rank should be an integer" raise TypeError(msg) diff --git a/src/sleplet/functions/slepian_wavelet_coefficients_africa.py b/src/sleplet/functions/slepian_wavelet_coefficients_africa.py index a02145c70..1180f646b 100644 --- a/src/sleplet/functions/slepian_wavelet_coefficients_africa.py +++ b/src/sleplet/functions/slepian_wavelet_coefficients_africa.py @@ -95,7 +95,11 @@ def _create_wavelet_coefficients( return wavelets, wavelet_coefficients @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"] ** 2, diff --git a/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py b/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py index c5a28c6d8..fa8fc74ee 100644 --- a/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py +++ b/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py @@ -95,7 +95,11 @@ def _create_wavelet_coefficients( return wavelets, wavelet_coefficients @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"] ** 2, diff --git a/src/sleplet/functions/slepian_wavelets.py b/src/sleplet/functions/slepian_wavelets.py index 4b0fc5739..489f93552 100644 --- a/src/sleplet/functions/slepian_wavelets.py +++ b/src/sleplet/functions/slepian_wavelets.py @@ -68,7 +68,11 @@ def _create_wavelets(self: typing_extensions.Self) -> npt.NDArray[np.float_]: return sleplet.wavelet_methods.create_kappas(self.L**2, self.B, self.j_min) @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["L"] ** 2, diff --git a/src/sleplet/functions/spherical_harmonic.py b/src/sleplet/functions/spherical_harmonic.py index ca73fcd3c..907db76cb 100644 --- a/src/sleplet/functions/spherical_harmonic.py +++ b/src/sleplet/functions/spherical_harmonic.py @@ -49,7 +49,11 @@ def _setup_args(self: typing_extensions.Self) -> None: self.ell, self.m = self.extra_args @pydantic.field_validator("ell") - def _check_ell(cls, v: int, info: pydantic.ValidationInfo) -> int: # noqa: ANN101 + def _check_ell( + cls, # noqa: ANN101 + v: int, + info: pydantic.ValidationInfo, + ) -> int: if not isinstance(v, int): msg = "ell should be an integer" raise TypeError(msg) @@ -62,7 +66,11 @@ def _check_ell(cls, v: int, info: pydantic.ValidationInfo) -> int: # noqa: ANN1 return v @pydantic.field_validator("m") - def _check_m(cls, v: int, info: pydantic.ValidationInfo) -> int: # noqa: ANN101 + def _check_m( + cls, # noqa: ANN101 + v: int, + info: pydantic.ValidationInfo, + ) -> int: if not isinstance(v, int): msg = "m should be an integer" raise TypeError(msg) diff --git a/src/sleplet/meshes/mesh_basis_functions.py b/src/sleplet/meshes/mesh_basis_functions.py index ae41ce779..5c93477b6 100644 --- a/src/sleplet/meshes/mesh_basis_functions.py +++ b/src/sleplet/meshes/mesh_basis_functions.py @@ -64,7 +64,10 @@ def _validate_rank(self: typing_extensions.Self) -> None: raise ValueError(msg) @pydantic.field_validator("rank") - def _check_rank(cls, v: int) -> int: # noqa: ANN101 + def _check_rank( + cls, # noqa: ANN101 + v: int, + ) -> int: if not isinstance(v, int): msg = "rank should be an integer" raise TypeError(msg) diff --git a/src/sleplet/meshes/mesh_slepian_functions.py b/src/sleplet/meshes/mesh_slepian_functions.py index 9e8b35273..78f9ad705 100644 --- a/src/sleplet/meshes/mesh_slepian_functions.py +++ b/src/sleplet/meshes/mesh_slepian_functions.py @@ -66,7 +66,10 @@ def _validate_rank(self: typing_extensions.Self) -> None: raise ValueError(msg) @pydantic.field_validator("rank") - def _check_rank(cls, v: int) -> int: # noqa: ANN101 + def _check_rank( + cls, # noqa: ANN101 + v: int, + ) -> int: if not isinstance(v, int): msg = "rank should be an integer" raise TypeError(msg) diff --git a/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py b/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py index 5b9e9b27c..daab80e94 100644 --- a/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py +++ b/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py @@ -79,7 +79,11 @@ def _create_wavelet_coefficients( return wavelets, wavelet_coefficients @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["mesh"].mesh_eigenvalues.shape[0], diff --git a/src/sleplet/meshes/mesh_slepian_wavelets.py b/src/sleplet/meshes/mesh_slepian_wavelets.py index 37d8806b7..6f24bed6f 100644 --- a/src/sleplet/meshes/mesh_slepian_wavelets.py +++ b/src/sleplet/meshes/mesh_slepian_wavelets.py @@ -65,7 +65,11 @@ def _create_wavelets(self: typing_extensions.Self) -> npt.NDArray[np.float_]: ) @pydantic.field_validator("j") - def _check_j(cls, v: int | None, info: pydantic.ValidationInfo) -> int | None: # noqa: ANN101 + def _check_j( + cls, # noqa: ANN101 + v: int | None, + info: pydantic.ValidationInfo, + ) -> int | None: j_max = pys2let.pys2let_j_max( info.data["B"], info.data["mesh"].mesh_eigenvalues.shape[0], diff --git a/src/sleplet/slepian/region.py b/src/sleplet/slepian/region.py index 7c3c7dcc4..a96309157 100644 --- a/src/sleplet/slepian/region.py +++ b/src/sleplet/slepian/region.py @@ -92,7 +92,10 @@ def _identify_region(self: typing_extensions.Self) -> None: raise AttributeError(msg) @pydantic.field_validator("phi_max") - def _check_phi_max(cls, v: float) -> float: # noqa: ANN101 + def _check_phi_max( + cls, # noqa: ANN101 + v: float, + ) -> float: if v < sleplet._vars.PHI_MIN_DEFAULT: msg = "phi_max cannot be negative" raise ValueError(msg) @@ -105,7 +108,10 @@ def _check_phi_max(cls, v: float) -> float: # noqa: ANN101 return v @pydantic.field_validator("phi_min") - def _check_phi_min(cls, v: float) -> float: # noqa: ANN101 + def _check_phi_min( + cls, # noqa: ANN101 + v: float, + ) -> float: if v < sleplet._vars.PHI_MIN_DEFAULT: msg = "phi_min cannot be negative" raise ValueError(msg) @@ -118,7 +124,10 @@ def _check_phi_min(cls, v: float) -> float: # noqa: ANN101 return v @pydantic.field_validator("theta_max") - def _check_theta_max(cls, v: float) -> float: # noqa: ANN101 + def _check_theta_max( + cls, # noqa: ANN101 + v: float, + ) -> float: if v < sleplet._vars.THETA_MIN_DEFAULT: msg = "theta_max cannot be negative" raise ValueError(msg) @@ -131,7 +140,10 @@ def _check_theta_max(cls, v: float) -> float: # noqa: ANN101 return v @pydantic.field_validator("theta_min") - def _check_theta_min(cls, v: float) -> float: # noqa: ANN101 + def _check_theta_min( + cls, # noqa: ANN101 + v: float, + ) -> float: if v < sleplet._vars.THETA_MIN_DEFAULT: msg = "theta_min cannot be negative" raise ValueError(msg) diff --git a/src/sleplet/slepian/slepian_polar_cap.py b/src/sleplet/slepian/slepian_polar_cap.py index 70ae5667e..9603aeafd 100644 --- a/src/sleplet/slepian/slepian_polar_cap.py +++ b/src/sleplet/slepian/slepian_polar_cap.py @@ -406,7 +406,10 @@ def _check_order( return v @pydantic.field_validator("theta_max") - def _check_theta_max(cls, v: float) -> float: # noqa: ANN101 + def _check_theta_max( + cls, # noqa: ANN101 + v: float, + ) -> float: if v == 0: msg = "theta_max cannot be zero" raise ValueError(msg) diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..6e031999e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1 @@ +# noqa: D104