Merge branch 'numpy_no2'

pyproject.toml

@@ -1,14 +1,14 @@
 [build-system]
-requires = ["setuptools", "numpy>=2.0"]
+requires = ["setuptools", "numpy>=1.22,<2.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "spcal"
 version = "1.2.5"
 dependencies = [
-    "numpy>=2.0",
+    "numpy>=1.22,<2.0",
     "PySide6",
-    "pyqtgraph>=0.13.2",
+    "pyqtgraph>=0.13.4",
     "bottleneck",
     "h5py",
 ]

setup.py

@@ -15,7 +15,7 @@
     "spcal.lib.spcalext",
     sources=["src/sort.c", "src/spcalext.c"],
     include_dirs=["include", numpy.get_include()],
-    define_macros=[("NPY_NO_DEPRECATED_API", "NPY_2_0_API_VERSION")],
+    define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
     extra_compile_args=extra_compile_args,
     extra_link_args=extra_link_args,
 )

src/spcalext.c

@@ -59,9 +59,10 @@ static PyObject *pairwise_euclidean(PyObject *self, PyObject *args) {
   const double *X = (const double *)PyArray_DATA(Xarray);
   double *D = (double *)PyArray_DATA(Darray);
 
+  npy_intp i, j;
 #pragma omp parallel for shared(X, n, m)
-  for (npy_intp i = 0; i < n; ++i) {
-    for (npy_intp j = i + 1; j < n; ++j) {
+  for (i = 0; i < n; ++i) {
+    for (j = i + 1; j < n; ++j) {
       D[condensed_index(i, j, n)] = euclidean(X, i, j, m);
     }
   }
@@ -145,8 +146,9 @@ static PyObject *mst_linkage(PyObject *self, PyObject *args) {
 
   // We use Z[:, 2] as M, tracking merged
   // Init arrays (ZD = 0), D = inf
+  npy_intp i;
 #pragma omp parallel for
-  for (npy_intp i = 0; i < n - 1; ++i) {
+  for (i = 0; i < n - 1; ++i) {
     D[i] = INFINITY;
     Z3[i].index = i;
   }
@@ -162,8 +164,9 @@ static PyObject *mst_linkage(PyObject *self, PyObject *args) {
       double tmin = min;
       int ty = y;
 
+      int j;
 #pragma omp for
-      for (int j = 0; j < n; ++j) {
+      for (j = 0; j < n; ++j) {
         if (M[j] == 1)
           continue;