diff --git a/Pipfile b/Pipfile index d0d3c1e..cb7a3bb 100644 --- a/Pipfile +++ b/Pipfile @@ -11,7 +11,6 @@ ipython = "*" matplotlib = "*" jupyterlab = "*" pytest = "*" -nptyping = "*" pytest-xdist = "*" [requires] diff --git a/Pipfile.lock b/Pipfile.lock index 122906c..e55c920 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "092262682f1ce00183ccc178ed7cd20746fdc03f9a5c9993da685807df273c8c" + "sha256": "55351526ca660f05e095918484fddad02cf83e528a15e2c8905577e6d6534385" }, "pipfile-spec": 6, "requires": { @@ -1008,15 +1008,6 @@ "markers": "python_version >= '3.7'", "version": "==0.2.4" }, - "nptyping": { - "hashes": [ - "sha256:764e51836faae33a7ae2e928af574cfb701355647accadcc89f2ad793630b7c8", - "sha256:e3d35b53af967e6fb407c3016ff9abae954d3a0568f7cc13a461084224e8e20a" - ], - "index": "pypi", - "markers": "python_version >= '3.7'", - "version": "==2.5.0" - }, "numpy": { "hashes": [ "sha256:04494f6ec467ccb5369d1808570ae55f6ed9b5809d7f035059000a37b8d7e86f", diff --git a/src/lupy/types.py b/src/lupy/types.py index 6507d44..b1944b1 100644 --- a/src/lupy/types.py +++ b/src/lupy/types.py @@ -1,16 +1,12 @@ from typing import Any -import warnings import numpy as np import numpy.typing as npt -with warnings.catch_warnings(category=DeprecationWarning): - warnings.simplefilter('ignore') - from nptyping import NDArray, Structure __all__ = ( - 'Floating', 'Complex', 'MeterDtype', 'MeterStruct', 'MeterArray', + 'Floating', 'Complex', 'MeterDtype', 'MeterArray', 'AnyArray', 'BoolArray', 'IndexArray', 'FloatArray', 'ComplexArray', 'Float1dArray', 'Float2dArray', 'Float3dArray', ) @@ -25,7 +21,6 @@ ('s', np.float64), ]) -MeterStruct = Structure['t: Floating, m: Floating, s: Floating'] AnyArray = npt.NDArray[Any] @@ -33,7 +28,7 @@ IndexArray = npt.NDArray[np.intp] FloatArray = npt.NDArray[Floating] ComplexArray = npt.NDArray[Complex] -MeterArray = NDArray[Any, MeterStruct] -Float1dArray = npt.NDArray[Floating]#NDArray[Shape['*'], _Floating] -Float2dArray = npt.NDArray[Floating]#NDArray[Shape['*, *'], _Floating] -Float3dArray = npt.NDArray[Floating]#NDArray[Shape['*, *, *'], _Floating] +MeterArray = npt.NDArray[np.void] +Float1dArray = npt.NDArray[Floating] +Float2dArray = npt.NDArray[Floating] +Float3dArray = npt.NDArray[Floating]