diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f7d239a7..d79b3224d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ --- repos: - repo: https://github.com/paddyroddy/.github - rev: v0.146.0 + rev: v0.148.0 hooks: - id: general-hooks - id: python-hooks diff --git a/src/sleplet/_string_methods.py b/src/sleplet/_string_methods.py index 4a50402bd..31cdced15 100644 --- a/src/sleplet/_string_methods.py +++ b/src/sleplet/_string_methods.py @@ -70,7 +70,7 @@ def multiples_of_pi(angle: float) -> str: i.e. pi, 2pi, 3pi. """ multiple = int(angle / np.pi) - return f"{multiple if multiple != 1 else ''}\u03C0" + return f"{multiple if multiple != 1 else ''}\u03c0" def angle_as_degree(radian: float) -> int: diff --git a/src/sleplet/functions/africa.py b/src/sleplet/functions/africa.py index e1bdf227a..3b45c6d1e 100644 --- a/src/sleplet/functions/africa.py +++ b/src/sleplet/functions/africa.py @@ -1,4 +1,5 @@ """Contains the `Africa` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py b/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py index ec5b11c1f..c133bfbfc 100644 --- a/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py +++ b/src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py @@ -1,4 +1,5 @@ """Contains the `AxisymmetricWaveletCoefficientsAfrica` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py b/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py index ae4f410ab..6dbbc6755 100644 --- a/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py +++ b/src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py @@ -1,4 +1,5 @@ """Contains the `AxisymmetricWaveletCoefficientsEarth` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py b/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py index 4a2ee796b..4ca3f87f5 100644 --- a/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py +++ b/src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py @@ -1,4 +1,5 @@ """Contains the `AxisymmetricWaveletCoefficientsSouthAmerica` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/axisymmetric_wavelets.py b/src/sleplet/functions/axisymmetric_wavelets.py index ee2cf387c..f733d1709 100644 --- a/src/sleplet/functions/axisymmetric_wavelets.py +++ b/src/sleplet/functions/axisymmetric_wavelets.py @@ -1,4 +1,5 @@ """Contains the `AxisymmetricWavelets` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/coefficients.py b/src/sleplet/functions/coefficients.py index 285bc0ee0..2093b2d29 100644 --- a/src/sleplet/functions/coefficients.py +++ b/src/sleplet/functions/coefficients.py @@ -1,4 +1,5 @@ """Contains the abstract `Coefficients` class.""" + import abc import dataclasses @@ -35,12 +36,12 @@ class Coefficients: """Whether to set a region or not, used in the Slepian case.""" smoothing: int | None = None """How much to smooth the topographic map of the Earth by.""" - _unnoised_coefficients: ( - npt.NDArray[np.complex128 | np.float64] | None - ) = pydantic.Field( - default=None, - init_var=False, - repr=False, + _unnoised_coefficients: npt.NDArray[np.complex128 | np.float64] | None = ( + pydantic.Field( + default=None, + init_var=False, + repr=False, + ) ) coefficients: npt.NDArray[np.complex128 | np.float64] = pydantic.Field( default_factory=lambda: np.empty(0), diff --git a/src/sleplet/functions/dirac_delta.py b/src/sleplet/functions/dirac_delta.py index 2124c7ee6..012c98e82 100644 --- a/src/sleplet/functions/dirac_delta.py +++ b/src/sleplet/functions/dirac_delta.py @@ -1,4 +1,5 @@ """Contains the `DiracDelta` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/earth.py b/src/sleplet/functions/earth.py index 8966a7f38..a52dade7c 100644 --- a/src/sleplet/functions/earth.py +++ b/src/sleplet/functions/earth.py @@ -1,4 +1,5 @@ """Contains the `Earth` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/elongated_gaussian.py b/src/sleplet/functions/elongated_gaussian.py index e7935fccf..8aa54b1a9 100644 --- a/src/sleplet/functions/elongated_gaussian.py +++ b/src/sleplet/functions/elongated_gaussian.py @@ -1,4 +1,5 @@ """Contains the `ElongatedGaussian` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/flm.py b/src/sleplet/functions/flm.py index 442f09d12..fe17a1e64 100644 --- a/src/sleplet/functions/flm.py +++ b/src/sleplet/functions/flm.py @@ -1,4 +1,5 @@ """Contains the abstract `Flm` class.""" + import abc import numpy as np diff --git a/src/sleplet/functions/fp.py b/src/sleplet/functions/fp.py index 077e7570a..440dabcf5 100644 --- a/src/sleplet/functions/fp.py +++ b/src/sleplet/functions/fp.py @@ -1,4 +1,5 @@ """Contains the abstract `Fp` class.""" + import abc import numpy as np diff --git a/src/sleplet/functions/gaussian.py b/src/sleplet/functions/gaussian.py index 565292b82..71a48df11 100644 --- a/src/sleplet/functions/gaussian.py +++ b/src/sleplet/functions/gaussian.py @@ -1,4 +1,5 @@ """Contains the `Gaussian` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/harmonic_gaussian.py b/src/sleplet/functions/harmonic_gaussian.py index 1ad6bd6a8..37c3cae33 100644 --- a/src/sleplet/functions/harmonic_gaussian.py +++ b/src/sleplet/functions/harmonic_gaussian.py @@ -1,4 +1,5 @@ """Contains the `HarmonicGaussian` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/identity.py b/src/sleplet/functions/identity.py index 68aa732f7..d930104cb 100644 --- a/src/sleplet/functions/identity.py +++ b/src/sleplet/functions/identity.py @@ -1,4 +1,5 @@ """Contains the `Identity` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/noise_earth.py b/src/sleplet/functions/noise_earth.py index 816ec6dae..ee7cfb052 100644 --- a/src/sleplet/functions/noise_earth.py +++ b/src/sleplet/functions/noise_earth.py @@ -1,4 +1,5 @@ """Contains the `NoiseEarth` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/ridgelets.py b/src/sleplet/functions/ridgelets.py index d4b46f58e..126765c8d 100644 --- a/src/sleplet/functions/ridgelets.py +++ b/src/sleplet/functions/ridgelets.py @@ -1,4 +1,5 @@ """Contains the `Ridgelets` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/slepian.py b/src/sleplet/functions/slepian.py index c72afabc9..e5a579c1e 100644 --- a/src/sleplet/functions/slepian.py +++ b/src/sleplet/functions/slepian.py @@ -1,4 +1,5 @@ """Contains the `Slepian` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/slepian_africa.py b/src/sleplet/functions/slepian_africa.py index c0b257349..63f215a02 100644 --- a/src/sleplet/functions/slepian_africa.py +++ b/src/sleplet/functions/slepian_africa.py @@ -1,4 +1,5 @@ """Contains the `SlepianAfrica` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/slepian_dirac_delta.py b/src/sleplet/functions/slepian_dirac_delta.py index 2d27666c4..b4b40cff3 100644 --- a/src/sleplet/functions/slepian_dirac_delta.py +++ b/src/sleplet/functions/slepian_dirac_delta.py @@ -1,4 +1,5 @@ """Contains the `SlepianDiracDelta` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/slepian_identity.py b/src/sleplet/functions/slepian_identity.py index 1c5d94011..44dda60be 100644 --- a/src/sleplet/functions/slepian_identity.py +++ b/src/sleplet/functions/slepian_identity.py @@ -1,4 +1,5 @@ """Contains the `SlepianIdentity` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/slepian_noise_africa.py b/src/sleplet/functions/slepian_noise_africa.py index 9bdbfa65f..b58ca5892 100644 --- a/src/sleplet/functions/slepian_noise_africa.py +++ b/src/sleplet/functions/slepian_noise_africa.py @@ -1,4 +1,5 @@ """Contains the `SlepianNoiseAfrica` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/slepian_noise_south_america.py b/src/sleplet/functions/slepian_noise_south_america.py index d0f0b4f86..d43f9160c 100644 --- a/src/sleplet/functions/slepian_noise_south_america.py +++ b/src/sleplet/functions/slepian_noise_south_america.py @@ -1,4 +1,5 @@ """Contains the `SlepianNoiseSouthAmerica` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/slepian_south_america.py b/src/sleplet/functions/slepian_south_america.py index f06401342..1eb2729a3 100644 --- a/src/sleplet/functions/slepian_south_america.py +++ b/src/sleplet/functions/slepian_south_america.py @@ -1,4 +1,5 @@ """Contains the `SlepianSouthAmerica` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/slepian_wavelet_coefficients_africa.py b/src/sleplet/functions/slepian_wavelet_coefficients_africa.py index 7dafded6c..012e6d62d 100644 --- a/src/sleplet/functions/slepian_wavelet_coefficients_africa.py +++ b/src/sleplet/functions/slepian_wavelet_coefficients_africa.py @@ -1,4 +1,5 @@ """Contains the `SlepianWaveletCoefficientsAfrica` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py b/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py index 794a9b892..80d007c35 100644 --- a/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py +++ b/src/sleplet/functions/slepian_wavelet_coefficients_south_america.py @@ -1,4 +1,5 @@ """Contains the `SlepianWaveletCoefficientsSouthAmerica` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/slepian_wavelets.py b/src/sleplet/functions/slepian_wavelets.py index cc956da4f..c57273d22 100644 --- a/src/sleplet/functions/slepian_wavelets.py +++ b/src/sleplet/functions/slepian_wavelets.py @@ -1,4 +1,5 @@ """Contains the `SlepianWavelets` class.""" + import logging import numpy as np diff --git a/src/sleplet/functions/south_america.py b/src/sleplet/functions/south_america.py index 8a5965290..303150bbc 100644 --- a/src/sleplet/functions/south_america.py +++ b/src/sleplet/functions/south_america.py @@ -1,4 +1,5 @@ """Contains the `SouthAmerica` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/spherical_harmonic.py b/src/sleplet/functions/spherical_harmonic.py index 1317251c9..8f01c6e59 100644 --- a/src/sleplet/functions/spherical_harmonic.py +++ b/src/sleplet/functions/spherical_harmonic.py @@ -1,4 +1,5 @@ """Contains the `SphericalHarmonic` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/squashed_gaussian.py b/src/sleplet/functions/squashed_gaussian.py index dd99ea891..99bde1d62 100644 --- a/src/sleplet/functions/squashed_gaussian.py +++ b/src/sleplet/functions/squashed_gaussian.py @@ -1,4 +1,5 @@ """Contains the `SquashedGaussian` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/functions/wmap.py b/src/sleplet/functions/wmap.py index de12286be..406f3e9d2 100644 --- a/src/sleplet/functions/wmap.py +++ b/src/sleplet/functions/wmap.py @@ -1,4 +1,5 @@ """Contains the `Wmap` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/harmonic_methods.py b/src/sleplet/harmonic_methods.py index dd3aabc1f..15abdcd9e 100644 --- a/src/sleplet/harmonic_methods.py +++ b/src/sleplet/harmonic_methods.py @@ -1,4 +1,5 @@ """Methods to perform operations in Fourier space of the sphere or mesh.""" + import collections import typing diff --git a/src/sleplet/meshes/mesh.py b/src/sleplet/meshes/mesh.py index 636f829b1..99c02caff 100644 --- a/src/sleplet/meshes/mesh.py +++ b/src/sleplet/meshes/mesh.py @@ -1,4 +1,5 @@ """Contains the `Mesh` class.""" + import dataclasses import numpy as np diff --git a/src/sleplet/meshes/mesh_basis_functions.py b/src/sleplet/meshes/mesh_basis_functions.py index ff3b9b300..a29d46d1c 100644 --- a/src/sleplet/meshes/mesh_basis_functions.py +++ b/src/sleplet/meshes/mesh_basis_functions.py @@ -1,4 +1,5 @@ """Contains the `MeshBasisFunctions` class.""" + import logging import numpy as np diff --git a/src/sleplet/meshes/mesh_coefficients.py b/src/sleplet/meshes/mesh_coefficients.py index 6e81451d6..965ab77a9 100644 --- a/src/sleplet/meshes/mesh_coefficients.py +++ b/src/sleplet/meshes/mesh_coefficients.py @@ -1,4 +1,5 @@ """Contains the abstract `MeshCoefficients` class.""" + import abc import dataclasses @@ -30,12 +31,12 @@ class MeshCoefficients: """How much to noise the data.""" region: bool = False """Whether to set a region or not, used in the Slepian case.""" - _unnoised_coefficients: ( - npt.NDArray[np.complex128 | np.float64] | None - ) = pydantic.Field( - default=None, - init_var=False, - repr=False, + _unnoised_coefficients: npt.NDArray[np.complex128 | np.float64] | None = ( + pydantic.Field( + default=None, + init_var=False, + repr=False, + ) ) coefficients: npt.NDArray[np.complex128 | np.float64] = pydantic.Field( default_factory=lambda: np.empty(0), diff --git a/src/sleplet/meshes/mesh_field.py b/src/sleplet/meshes/mesh_field.py index 9f747e7d6..a6b185eef 100644 --- a/src/sleplet/meshes/mesh_field.py +++ b/src/sleplet/meshes/mesh_field.py @@ -1,4 +1,5 @@ """Contains the `MeshField` class.""" + import igl import numpy as np import numpy.typing as npt diff --git a/src/sleplet/meshes/mesh_harmonic_coefficients.py b/src/sleplet/meshes/mesh_harmonic_coefficients.py index 6b5482939..0e2602542 100644 --- a/src/sleplet/meshes/mesh_harmonic_coefficients.py +++ b/src/sleplet/meshes/mesh_harmonic_coefficients.py @@ -1,4 +1,5 @@ """Contains the abstract `MeshHarmonicCoefficients` class.""" + import abc import numpy as np diff --git a/src/sleplet/meshes/mesh_noise_field.py b/src/sleplet/meshes/mesh_noise_field.py index 039fddfaf..9e3f85346 100644 --- a/src/sleplet/meshes/mesh_noise_field.py +++ b/src/sleplet/meshes/mesh_noise_field.py @@ -1,4 +1,5 @@ """Contains the `MeshNoiseField` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/meshes/mesh_slepian.py b/src/sleplet/meshes/mesh_slepian.py index 37fd36d4e..51922a19b 100644 --- a/src/sleplet/meshes/mesh_slepian.py +++ b/src/sleplet/meshes/mesh_slepian.py @@ -1,4 +1,5 @@ """Contains the `MeshSlepian` class.""" + import concurrent.futures import logging import os diff --git a/src/sleplet/meshes/mesh_slepian_coefficients.py b/src/sleplet/meshes/mesh_slepian_coefficients.py index 62f3539de..8a14276b0 100644 --- a/src/sleplet/meshes/mesh_slepian_coefficients.py +++ b/src/sleplet/meshes/mesh_slepian_coefficients.py @@ -1,4 +1,5 @@ """Contains the abstract `MeshSlepianCoefficients` class.""" + import abc import numpy as np diff --git a/src/sleplet/meshes/mesh_slepian_field.py b/src/sleplet/meshes/mesh_slepian_field.py index ade2d7d21..356e86c0f 100644 --- a/src/sleplet/meshes/mesh_slepian_field.py +++ b/src/sleplet/meshes/mesh_slepian_field.py @@ -1,4 +1,5 @@ """Contains the `MeshSlepianField` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/meshes/mesh_slepian_functions.py b/src/sleplet/meshes/mesh_slepian_functions.py index ebfed3051..1bd29a732 100644 --- a/src/sleplet/meshes/mesh_slepian_functions.py +++ b/src/sleplet/meshes/mesh_slepian_functions.py @@ -1,4 +1,5 @@ """Contains the `MeshSlepianFunctions` class.""" + import logging import numpy as np diff --git a/src/sleplet/meshes/mesh_slepian_noise_field.py b/src/sleplet/meshes/mesh_slepian_noise_field.py index d02f726df..80edd284b 100644 --- a/src/sleplet/meshes/mesh_slepian_noise_field.py +++ b/src/sleplet/meshes/mesh_slepian_noise_field.py @@ -1,4 +1,5 @@ """Contains the `MeshSlepianNoiseField` class.""" + import numpy as np import numpy.typing as npt import pydantic diff --git a/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py b/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py index 5a6d6b9cf..6931ce2da 100644 --- a/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py +++ b/src/sleplet/meshes/mesh_slepian_wavelet_coefficients.py @@ -1,4 +1,5 @@ """Contains the `MeshSlepianWaveletCoefficients` class.""" + import logging import numpy as np diff --git a/src/sleplet/meshes/mesh_slepian_wavelets.py b/src/sleplet/meshes/mesh_slepian_wavelets.py index 13c26dacb..a3ac07b3e 100644 --- a/src/sleplet/meshes/mesh_slepian_wavelets.py +++ b/src/sleplet/meshes/mesh_slepian_wavelets.py @@ -1,4 +1,5 @@ """Contains the `MeshSlepianWavelets` class.""" + import logging import numpy as np diff --git a/src/sleplet/noise.py b/src/sleplet/noise.py index deb6742c1..282a441df 100644 --- a/src/sleplet/noise.py +++ b/src/sleplet/noise.py @@ -1,4 +1,5 @@ """Methods to handle noise in Fourier or wavelet space.""" + import logging import numpy as np diff --git a/src/sleplet/plot_methods.py b/src/sleplet/plot_methods.py index f14332bd7..661f7927b 100644 --- a/src/sleplet/plot_methods.py +++ b/src/sleplet/plot_methods.py @@ -1,4 +1,5 @@ """Methods to help in creating plots.""" + import logging import matplotlib as mpl diff --git a/src/sleplet/slepian/region.py b/src/sleplet/slepian/region.py index a96309157..63c2f3b98 100644 --- a/src/sleplet/slepian/region.py +++ b/src/sleplet/slepian/region.py @@ -1,4 +1,5 @@ """Contains the `Region` class.""" + import logging import pydantic diff --git a/src/sleplet/slepian/slepian_arbitrary.py b/src/sleplet/slepian/slepian_arbitrary.py index e819f0a5d..0f44e29a1 100644 --- a/src/sleplet/slepian/slepian_arbitrary.py +++ b/src/sleplet/slepian/slepian_arbitrary.py @@ -1,4 +1,5 @@ """Contains the `SlepianArbitrary` class.""" + import concurrent.futures import logging import os diff --git a/src/sleplet/slepian/slepian_functions.py b/src/sleplet/slepian/slepian_functions.py index 36131f26c..9d0da8085 100644 --- a/src/sleplet/slepian/slepian_functions.py +++ b/src/sleplet/slepian/slepian_functions.py @@ -1,4 +1,5 @@ """Contains the abstract `SlepianFunctions` class.""" + import abc import dataclasses import logging diff --git a/src/sleplet/slepian/slepian_polar_cap.py b/src/sleplet/slepian/slepian_polar_cap.py index 7a2b4887a..a73882323 100644 --- a/src/sleplet/slepian/slepian_polar_cap.py +++ b/src/sleplet/slepian/slepian_polar_cap.py @@ -1,4 +1,5 @@ """Contains the `SlepianPolarCap` class.""" + import concurrent.futures import dataclasses import logging diff --git a/src/sleplet/slepian_methods.py b/src/sleplet/slepian_methods.py index 284f58ab1..bdd3f1ce5 100644 --- a/src/sleplet/slepian_methods.py +++ b/src/sleplet/slepian_methods.py @@ -1,4 +1,5 @@ """Methods to work with Slepian coefficients.""" + import logging import numpy as np diff --git a/src/sleplet/wavelet_methods.py b/src/sleplet/wavelet_methods.py index 90b349852..7a35862ae 100644 --- a/src/sleplet/wavelet_methods.py +++ b/src/sleplet/wavelet_methods.py @@ -1,4 +1,5 @@ """Methods to work with wavelet and wavelet coefficients.""" + import numpy as np import numpy.typing as npt diff --git a/tests/test_strings.py b/tests/test_strings.py index 03606eab4..2734b1ca2 100644 --- a/tests/test_strings.py +++ b/tests/test_strings.py @@ -39,7 +39,7 @@ def test_add_angle_to_filename() -> None: def test_print_multiple_of_pi() -> None: """Test that the pi prefix is added.""" arguments = [0, 1, 2, 2.5] - output = ["0\u03C0", "\u03C0", "2\u03C0", "2\u03C0"] + output = ["0\u03c0", "\u03c0", "2\u03c0", "2\u03c0"] for c, arg in enumerate(arguments): np.testing.assert_equal( sleplet._string_methods.multiples_of_pi(arg * np.pi),