Import pydantic.v1 with v2

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
     hooks:
       - id: blacken-docs
         additional_dependencies:
-          - black==23.7.0
+          - black==23.9.1
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.5
     hooks:

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "platformdirs>=3.2.0",
     "plotly>=5.14.0",
     "pooch>=1.7.0",
-    "pydantic<2",
+    "pydantic>=2.3.0",
     "pys2let>=2.2.6",
     "pyssht>=1.5.2",
     "scipy>=1.10.1",

src/sleplet/functions/africa.py

@@ -1,7 +1,7 @@
 """Contains the `Africa` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._data.create_earth_flm

src/sleplet/functions/axisymmetric_wavelet_coefficients_africa.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 
 import sleplet._string_methods
@@ -79,7 +79,7 @@ def _create_wavelet_coefficients(
         return wavelets, wavelet_coefficients
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"],

src/sleplet/functions/axisymmetric_wavelet_coefficients_earth.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 
 import sleplet._string_methods
@@ -76,7 +76,7 @@ def _create_wavelet_coefficients(
         return wavelets, wavelet_coefficients
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"],

src/sleplet/functions/axisymmetric_wavelet_coefficients_south_america.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 
 import sleplet._string_methods
@@ -78,7 +78,7 @@ def _create_wavelet_coefficients(
         return wavelets, wavelet_coefficients
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"],

src/sleplet/functions/axisymmetric_wavelets.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 
 import sleplet._string_methods
@@ -69,7 +69,7 @@ def _create_wavelets(self) -> npt.NDArray[np.complex_]:
         )
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"],

src/sleplet/functions/coefficients.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._convolution_methods
 import sleplet._mask_methods
@@ -114,7 +114,7 @@ def _add_details_to_name(self) -> None:
         self.name += f"_L{self.L}"
 
     @pydantic.validator("coefficients", check_fields=False)
-    def _check_coefficients(cls, v, values):
+    def _check_coefficients(cls, v, values):  # noqa: N805
         if (
             values["region"]
             and not set(values["name"].split("_")) & _COEFFICIENTS_TO_NOT_MASK

src/sleplet/functions/dirac_delta.py

@@ -1,7 +1,7 @@
 """Contains the `DiracDelta` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._string_methods

src/sleplet/functions/directional_spin_wavelets.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 import pyssht as ssht
 
@@ -83,7 +83,7 @@ def _create_wavelets(self) -> npt.NDArray[np.complex_]:
         return wavelets
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"],

src/sleplet/functions/earth.py

@@ -1,7 +1,7 @@
 """Contains the `Earth` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._data.create_earth_flm
 import sleplet._string_methods

src/sleplet/functions/elongated_gaussian.py

@@ -1,7 +1,7 @@
 """Contains the `ElongatedGaussian` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/flm.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._validation

src/sleplet/functions/fp.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._mask_methods
 import sleplet._validation

src/sleplet/functions/gaussian.py

@@ -1,7 +1,7 @@
 """Contains the `Gaussian` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._string_methods

src/sleplet/functions/harmonic_gaussian.py

@@ -1,7 +1,7 @@
 """Contains the `HarmonicGaussian` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._string_methods

src/sleplet/functions/identity.py

@@ -1,7 +1,7 @@
 """Contains the `Identity` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/noise_earth.py

@@ -1,7 +1,7 @@
 """Contains the `NoiseEarth` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/ridgelets.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 import pyssht as ssht
 import scipy.special
@@ -104,7 +104,7 @@ def _compute_ring(self) -> npt.NDArray[np.complex_]:
         return ring_lm
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"],

src/sleplet/functions/slepian.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._validation
 import sleplet.slepian_methods
@@ -73,7 +73,7 @@ def _validate_rank(self) -> None:
                 raise ValueError(f"rank should be less than {limit}")
 
     @pydantic.validator("rank")
-    def _check_rank(cls, v):
+    def _check_rank(cls, v):  # noqa: N805
         if not isinstance(v, int):
             raise TypeError("rank should be an integer")
         if v < 0:

src/sleplet/functions/slepian_africa.py

@@ -1,7 +1,7 @@
 """Contains the `SlepianAfrica` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/slepian_dirac_delta.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._string_methods

src/sleplet/functions/slepian_identity.py

@@ -1,7 +1,7 @@
 """Contains the `SlepianIdentity` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/slepian_noise_africa.py

@@ -1,7 +1,7 @@
 """Contains the `SlepianNoiseAfrica` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/slepian_noise_south_america.py

@@ -1,7 +1,7 @@
 """Contains the `SlepianNoiseSouthAmerica` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/slepian_south_america.py

@@ -1,7 +1,7 @@
 """Contains the `SlepianSouthAmerica` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 
 import sleplet._string_methods
 import sleplet._validation

src/sleplet/functions/slepian_wavelet_coefficients_africa.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 
 import sleplet._string_methods
@@ -89,7 +89,7 @@ def _create_wavelet_coefficients(
         return wavelets, wavelet_coefficients
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"] ** 2,

src/sleplet/functions/slepian_wavelet_coefficients_south_america.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 
 import sleplet._string_methods
@@ -89,7 +89,7 @@ def _create_wavelet_coefficients(
         return wavelets, wavelet_coefficients
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"] ** 2,

src/sleplet/functions/slepian_wavelets.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pys2let
 
 import sleplet._string_methods
@@ -63,7 +63,7 @@ def _create_wavelets(self) -> npt.NDArray[np.float_]:
         return sleplet.wavelet_methods.create_kappas(self.L**2, self.B, self.j_min)
 
     @pydantic.validator("j")
-    def _check_j(cls, v, values):
+    def _check_j(cls, v, values):  # noqa: N805
         j_max = pys2let.pys2let_j_max(
             values["B"],
             values["L"] ** 2,

src/sleplet/functions/south_america.py

@@ -1,7 +1,7 @@
 """Contains the `SouthAmerica` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._data.create_earth_flm

src/sleplet/functions/spherical_harmonic.py

@@ -1,7 +1,7 @@
 """Contains the `SphericalHarmonic` class."""
 import numpy as np
 import numpy.typing as npt
-import pydantic
+import pydantic.v1 as pydantic
 import pyssht as ssht
 
 import sleplet._string_methods
@@ -44,7 +44,7 @@ def _setup_args(self) -> None:
             self.ell, self.m = self.extra_args
 
     @pydantic.validator("ell")
-    def _check_ell(cls, v, values):
+    def _check_ell(cls, v, values):  # noqa: N805
         if not isinstance(v, int):
             raise TypeError("ell should be an integer")
         if v < 0:
@@ -54,7 +54,7 @@ def _check_ell(cls, v, values):
         return v
 
     @pydantic.validator("m")
-    def _check_m(cls, v, values):
+    def _check_m(cls, v, values):  # noqa: N805
         if not isinstance(v, int):
             raise TypeError("m should be an integer")
         if abs(v) > values["ell"]: