Remove dependency on nptyping completely

Author: alchzh

hpmoc-dev-win.yml

@@ -36,5 +36,4 @@ dependencies:
   #- icc_rt  # -c numba
   #- intelpython3_full  # -c intel
   # pip
-  - pip:
-    - nptyping=1.4.4
+

hpmoc-dev.yml

@@ -40,5 +40,3 @@ dependencies:
   #- icc_rt  # -c numba
   #- intelpython3_full  # -c intel
   # pip
-  - pip:
-    - nptyping=1.4.4

hpmoc/atlas/__init__.py

@@ -1,13 +1,20 @@
 "Work with manifolds."
 
-from nptyping import NDArray, Shape, Int, Bool, Int64
+# This file is currently in a broken state
+
+import numpy as np
+from numpy.typing import NDArray
+
 from typing import Tuple, Callable, List, Union, Optional, Any
 
+Int = np.integer[Any]
+Bool = np.bool_
+
 Connector = Callable[
     [NDArray[Int], NDArray[Int], NDArray[Int]],
     Tuple[NDArray[Bool], NDArray[Int], NDArray[Int], NDArray[Int]]
 ]
-Limits = NDArray[Shape["2, ..."], Int]
+Limits = NDArray[Int]
 
 
 # TODO account for LHS/RHS heterogeneous atlases
@@ -276,8 +283,8 @@ def healpix_grid_limits(nside):
 def idx_in_chart(
         x: NDArray[Int],
         y: NDArray[Int],
-        x_limits: NDArray[Shape["2, ..."], Int],
-        y_limits: NDArray[Shape["2, ..."], Int],
+        x_limits: NDArray[Int],
+        y_limits: NDArray[Int],
 ) -> NDArray[Bool]:
     """
     See which indices are contained in a chart. This notion can be used to
@@ -445,14 +452,14 @@ def _empty_translate():
     import numpy as np
 
     return (
-        np.array([], dtype=np.bool),
+        np.array([], dtype=np.bool_),
         np.array([], dtype=np.int64),
         np.array([], dtype=np.int64),
         np.array([], dtype=np.int64),
     )
 
 
-def square_matrix_connectors() -> NDArray[Shape["4, 4, 2, 3"], Int64]:
+def square_matrix_connectors() -> NDArray[np.int64]:
     """
     Matrices for connecting identically-sized square charts to each other.
 

hpmoc/plot.py

@@ -215,8 +215,8 @@
 )
 from .points import PointsTuple
 
-if TYPE_CHECKING:
-    from nptyping import NDArray, Int
+import numpy as np
+from numpy.typing import NDArray
 
 DEFAULT_CBAR_KWARGS = {
     'orientation': 'horizontal',
@@ -601,12 +601,12 @@ def get_projection(projection, *args, **kwargs):
 def plot(
         skymap: Union[
             'hpmoc.PartialUniqSkymap',
-            NDArray[Any, Any],
+            NDArray[Any],
             Tuple[
-                NDArray[Any, Any],
+                NDArray[Any],
                 Optional[
                     Union[
-                        NDArray[Any, Int],
+                        NDArray[np.integer[Any]],
                         'astropy.wcs.WCS',
                         str,
                     ]
@@ -1050,12 +1050,12 @@ def plot(
 def gridplot(
         *skymaps: Union[
             'hpmoc.PartialUniqSkymap',
-            NDArray[Any, Any],
+            NDArray[Any],
             Tuple[
-                NDArray[Any, Any],
+                NDArray[Any],
                 Optional[
                     Union[
-                        NDArray[Any, Int],
+                        NDArray[np.integer[Any]],
                         'astropy.wcs.WCS',
                         str,
                     ]

pyproject.toml

@@ -11,7 +11,6 @@ requires = [
     "numpy",
     "matplotlib",
     "astropy",
-    "nptyping~=2.4.1",
     "astropy-healpix"
 ]
 requires-python = ">=3.6"