Merge branch 'main' into github_action_exp

PCMDI · Jun 25, 2024 · d7093c1 · d7093c1
2 parents b39e607 + d7346b8
commit d7093c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Src/_cmormodule.c b/Src/_cmormodule.c
@@ -1,4 +1,5 @@
 #include <Python.h>
+#include <signal.h>
 #define NPY_NO_DEPRECATED_API NPY_1_10_API_VERSION
 
 #include "numpy/arrayobject.h"

diff --git a/Src/cmor_tables.c b/Src/cmor_tables.c
@@ -83,7 +83,7 @@ void cmor_init_table(cmor_table_t * table, int id)
  table->cmor_version = 3.0;
  table->mip_era[0] = '\0';
  table->szTable_id[0] = '\0';
- strcpy(table->realm, "REALM");
+ table->realm[0] = '\0';
  table->date[0] = '\0';
  table->missing_value = 1.0e+20;
  table->int_missing_value = 2147483647;

diff --git a/setup.py.in b/setup.py.in
@@ -3,7 +3,7 @@ import numpy
 import os
 from setuptools import setup, Extension
 
-include_dirs = [numpy.lib.utils.get_include(),"include","include/cdTime"]
+include_dirs = [numpy.get_include(),"include","include/cdTime"]
 
 library_dirs = [ os.path.join("@prefix@","lib") ,'.']
 include_dirs.append(os.path.join("@prefix@","include"))