From d2534d083759f8769c42c1979054aa3b6a94aa5f Mon Sep 17 00:00:00 2001 From: mdtanker Date: Sun, 4 Aug 2024 19:51:42 -0600 Subject: [PATCH] fix: remove nptyping as dependency --- docs/conf.py | 1 - pyproject.toml | 1 - src/invert4geom/cross_validation.py | 2 +- src/invert4geom/inversion.py | 2 +- src/invert4geom/optimization.py | 2 +- src/invert4geom/regional.py | 2 +- src/invert4geom/synthetic.py | 2 +- src/invert4geom/uncertainty.py | 2 +- src/invert4geom/utils.py | 2 +- tests/test_inversion.py | 2 +- 10 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 132cf3c8..ec68fbeb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,6 @@ "polartoolkit": ("https://polartoolkit.readthedocs.io/en/latest/", None), "numba": ("https://numba.pydata.org/numba-doc/latest/", None), "scipy": ("https://docs.scipy.org/doc/scipy/", None), - # nptyping # numba_progress "sklearn": ("https://scikit-learn.org/stable/", None), "dask": ("https://docs.dask.org/en/stable/", None), diff --git a/pyproject.toml b/pyproject.toml index 0fdea9f5..f9e23375 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,6 @@ dependencies = [ "pygmt", "dask", "deprecation", - "nptyping", ### # optimization ### diff --git a/src/invert4geom/cross_validation.py b/src/invert4geom/cross_validation.py index 44188384..09e5920c 100644 --- a/src/invert4geom/cross_validation.py +++ b/src/invert4geom/cross_validation.py @@ -15,7 +15,7 @@ import sklearn import verde as vd import xarray as xr -from nptyping import NDArray +from numpy.typing import NDArray from polartoolkit import maps from polartoolkit import utils as polar_utils from tqdm.autonotebook import tqdm diff --git a/src/invert4geom/inversion.py b/src/invert4geom/inversion.py index df4f116e..6c6181ea 100644 --- a/src/invert4geom/inversion.py +++ b/src/invert4geom/inversion.py @@ -16,7 +16,7 @@ import pandas as pd import scipy as sp import xarray as xr -from nptyping import NDArray +from numpy.typing import NDArray from tqdm.autonotebook import tqdm from invert4geom import cross_validation, log, optimization, plotting, regional, utils diff --git a/src/invert4geom/optimization.py b/src/invert4geom/optimization.py index e95f01ff..64d2000a 100644 --- a/src/invert4geom/optimization.py +++ b/src/invert4geom/optimization.py @@ -20,7 +20,7 @@ import pandas as pd import psutil import xarray as xr -from nptyping import NDArray +from numpy.typing import NDArray from optuna.storages import JournalFileStorage, JournalStorage from tqdm.autonotebook import tqdm diff --git a/src/invert4geom/regional.py b/src/invert4geom/regional.py index 1c1b1b13..cc109bd2 100644 --- a/src/invert4geom/regional.py +++ b/src/invert4geom/regional.py @@ -7,7 +7,7 @@ import pandas as pd import pygmt import verde as vd -from nptyping import NDArray +from numpy.typing import NDArray from invert4geom import cross_validation, log, optimization, utils diff --git a/src/invert4geom/synthetic.py b/src/invert4geom/synthetic.py index d08cfb8f..3209005f 100644 --- a/src/invert4geom/synthetic.py +++ b/src/invert4geom/synthetic.py @@ -8,7 +8,7 @@ import pooch import verde as vd import xarray as xr -from nptyping import NDArray +from numpy.typing import NDArray from polartoolkit import fetch, maps from polartoolkit import utils as polar_utils diff --git a/src/invert4geom/uncertainty.py b/src/invert4geom/uncertainty.py index c8522c3a..a75374cc 100644 --- a/src/invert4geom/uncertainty.py +++ b/src/invert4geom/uncertainty.py @@ -10,7 +10,7 @@ import pandas as pd import UQpy import xarray as xr -from nptyping import NDArray +from numpy.typing import NDArray from polartoolkit import utils as polar_utils from tqdm.autonotebook import tqdm from UQpy.sampling import LatinHypercubeSampling as LHS diff --git a/src/invert4geom/utils.py b/src/invert4geom/utils.py index a5f00823..cf9d6820 100644 --- a/src/invert4geom/utils.py +++ b/src/invert4geom/utils.py @@ -15,7 +15,7 @@ import verde as vd import xarray as xr import xrft -from nptyping import NDArray +from numpy.typing import NDArray from pykdtree.kdtree import KDTree # pylint: disable=no-name-in-module import invert4geom diff --git a/tests/test_inversion.py b/tests/test_inversion.py index 53691da4..e1c307e4 100644 --- a/tests/test_inversion.py +++ b/tests/test_inversion.py @@ -7,7 +7,7 @@ import pytest import verde as vd import xarray as xr -from nptyping import NDArray +from numpy.typing import NDArray from invert4geom import inversion