Add last bits that crashed some tests

apache · Jun 12, 2024 · 79533e8 · 79533e8
1 parent 3ac349e
commit 79533e8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/python/pyarrow/array.pxi b/python/pyarrow/array.pxi
@@ -1568,6 +1568,9 @@ cdef class Array(_PandasConvertible):
         -------
         array : numpy.ndarray
         """
+        if not HAS_NUMPY:
+            raise ValueError(
+                "Cannot return a numpy.ndarray if Numpy is not present")
         cdef:
             PyObject* out
             PandasOptions c_options

diff --git a/python/pyarrow/src/arrow/python/python_to_arrow.cc b/python/pyarrow/src/arrow/python/python_to_arrow.cc
@@ -463,7 +463,7 @@ class PyValue {
         default:
           return Status::UnknownError("Invalid time unit");
       }
-    } else if (PyArray_CheckAnyScalarExact(obj)) {
+    } else if (has_numpy() && PyArray_CheckAnyScalarExact(obj)) {
       // validate that the numpy scalar has np.datetime64 dtype
       ARROW_ASSIGN_OR_RAISE(auto numpy_type, NumPyScalarToArrowDataType(obj));
       if (!numpy_type->Equals(*type)) {

diff --git a/python/pyarrow/table.pxi b/python/pyarrow/table.pxi
@@ -495,6 +495,9 @@ cdef class ChunkedArray(_PandasConvertible):
         >>> n_legs.to_numpy()
         array([  2,   2,   4,   4,   5, 100])
         """
+        if not HAS_NUMPY:
+            raise ValueError(
+                "Cannot return a numpy.ndarray if Numpy is not present")
         if zero_copy_only:
             raise ValueError(
                 "zero_copy_only must be False for pyarrow.ChunkedArray.to_numpy"

diff --git a/python/pyarrow/tensor.pxi b/python/pyarrow/tensor.pxi
@@ -107,6 +107,9 @@ strides: {0.strides}""".format(self)
         array([[  2,   2,   4],
                [  4,   5, 100]], dtype=int32)
         """
+        if not HAS_NUMPY:
+            raise ValueError(
+                "Cannot return a numpy.ndarray if Numpy is not present")
         cdef PyObject* out
 
         check_status(TensorToNdarray(self.sp_tensor, self, &out))
@@ -478,6 +481,9 @@ shape: {0.shape}""".format(self)
         """
         Convert arrow::SparseCOOTensor to numpy.ndarrays with zero copy.
         """
+        if not HAS_NUMPY:
+            raise ValueError(
+                "Cannot return a numpy.ndarray if Numpy is not present")
         cdef PyObject* out_data
         cdef PyObject* out_coords
 
@@ -743,6 +749,9 @@ shape: {0.shape}""".format(self)
         """
         Convert arrow::SparseCSRMatrix to numpy.ndarrays with zero copy.
         """
+        if not HAS_NUMPY:
+            raise ValueError(
+                "Cannot return a numpy.ndarray if Numpy is not present")
         cdef PyObject* out_data
         cdef PyObject* out_indptr
         cdef PyObject* out_indices
@@ -981,6 +990,9 @@ shape: {0.shape}""".format(self)
         """
         Convert arrow::SparseCSCMatrix to numpy.ndarrays with zero copy
         """
+        if not HAS_NUMPY:
+            raise ValueError(
+                "Cannot return a numpy.ndarray if Numpy is not present")
         cdef PyObject* out_data
         cdef PyObject* out_indptr
         cdef PyObject* out_indices
@@ -1216,6 +1228,9 @@ shape: {0.shape}""".format(self)
         """
         Convert arrow::SparseCSFTensor to numpy.ndarrays with zero copy
         """
+        if not HAS_NUMPY:
+            raise ValueError(
+                "Cannot return a numpy.ndarray if Numpy is not present")
         cdef PyObject* out_data
         cdef PyObject* out_indptr
         cdef PyObject* out_indices