Merge pull request #31 from sylvielamythepaut/master

Fixing issues with single elements arrays.
ecmwf · Oct 8, 2020 · e4d79fa · e4d79fa
2 parents 81e9db1 + c1328ac
commit e4d79fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Magics/macro.py b/Magics/macro.py
@@ -456,14 +456,14 @@ def set(self):
                 type = self.find_type(self.args[key])
                 if type == "int":
                     if dim == 2:
-                        Magics.set2i(key, numpy.int64(data), size[0], size[1])
+                        Magics.set2i(key, data.astype(numpy.int64), size[0], size[1])
                     else:
-                        Magics.set1i(key, numpy.int64(data), size[0])
+                        Magics.set1i(key, data.astype(numpy.int64), size[0])
                 elif type == "float":
                     if dim == 2:
-                        Magics.set2r(key, numpy.float64(data), size[1], size[0])
+                        Magics.set2r(key, data.astype(numpy.float64), size[1], size[0])
                     else:
-                        Magics.set1r(key, numpy.float64(data))
+                        Magics.set1r(key, data.astype(numpy.float64))
                 else:
                     print("can not interpret type %s for %s ???->", (type, key))
             else:

diff --git a/setup.py b/setup.py
@@ -25,7 +25,8 @@ def read(fname):
     return io.open(file_path, encoding="utf-8").read()
 
 
-version = "1.5.0"
+
+version = "1.5.2"
 
 
 setuptools.setup(