clean up numpy includes and target numpy 2.0 C API

Author: ngoldbaum

stringdtype/stringdtype/src/casts.h

@@ -1,15 +1,15 @@
 #ifndef _NPY_CASTS_H
 #define _NPY_CASTS_H
 
+// needed for Py_UCS4
 #include <Python.h>
 
+// need these defines and includes for PyArrayMethod_Spec
 #define PY_ARRAY_UNIQUE_SYMBOL stringdtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
 #define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
 #include "numpy/experimental_dtype_api.h"
-#include "numpy/halffloat.h"
-#include "numpy/ndarraytypes.h"
 
 PyArrayMethod_Spec **
 get_casts();

stringdtype/stringdtype/src/dtype.h

@@ -7,12 +7,15 @@
 // clang-format on
 
 #define PY_ARRAY_UNIQUE_SYMBOL stringdtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
 #define NO_IMPORT_ARRAY
 #include "numpy/arrayobject.h"
 #include "numpy/experimental_dtype_api.h"
+#include "numpy/halffloat.h"
 #include "numpy/ndarraytypes.h"
 #include "numpy/npy_math.h"
+#include "numpy/ufuncobject.h"
 
 typedef struct {
     PyArray_Descr base;

stringdtype/stringdtype/src/main.c

@@ -1,7 +1,8 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL stringdtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
 #include "numpy/arrayobject.h"
 #include "numpy/experimental_dtype_api.h"
 
@@ -88,9 +89,8 @@ static struct PyModuleDef moduledef = {
 PyMODINIT_FUNC
 PyInit__main(void)
 {
-    if (_import_array() < 0) {
-        return NULL;
-    }
+    import_array();
+
     if (import_experimental_dtype_api(13) < 0) {
         return NULL;
     }

stringdtype/stringdtype/src/umath.c

@@ -1,17 +1,10 @@
 #include <Python.h>
 
-#define PY_ARRAY_UNIQUE_SYMBOL stringdtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
-#include "numpy/ndarraytypes.h"
-#include "numpy/ufuncobject.h"
+#include "umath.h"
 
 #include "dtype.h"
 #include "static_string.h"
 #include "string.h"
-#include "umath.h"
 
 static NPY_CASTING
 multiply_resolve_descriptors(