pandas: fix scipy coo_matrix test

This commit is contained in:
SCOTT-HAMILTON 2021-02-27 21:55:43 +01:00 committed by Tim Steinbach
parent e753d4c226
commit e8cfc61efa
2 changed files with 14 additions and 10 deletions

View file

@ -34,6 +34,8 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "06vhk75hmzgv1sfbjzgnsw9x10h7y6bd6s6z7d6lfnn7wcgc83zi";
};
# See https://github.com/scipy/scipy/issues/13585 and https://github.com/pandas-dev/pandas/pull/40020
patches = [ ./fix-tests.patch ];
nativeBuildInputs = [ cython ];
buildInputs = lib.optional stdenv.isDarwin libcxx;
@ -59,16 +61,6 @@ buildPythonPackage rec {
# https://github.com/NixOS/nixpkgs/issues/39687
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
# For OSX, we need to add a dependency on libcxx, which provides
# `complex.h` and other libraries that pandas depends on to build.
postPatch = lib.optionalString stdenv.isDarwin ''
cpp_sdk="${libcxx}/include/c++/v1";
echo "Adding $cpp_sdk to the setup.py common_include variable"
substituteInPlace setup.py \
--replace "['pandas/src/klib', 'pandas/src']" \
"['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
'';
# Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next
# release. https://github.com/pandas-dev/pandas/pull/30862
setupPyBuildFlags = lib.optionals (!(isPy38 && stdenv.isDarwin)) [

View file

@ -0,0 +1,12 @@
diff --color -ur a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py
--- a/pandas/tests/arrays/sparse/test_array.py 2020-12-07 12:42:08.000000000 +0100
+++ b/pandas/tests/arrays/sparse/test_array.py 2021-02-27 21:48:16.483903149 +0100
@@ -1188,7 +1188,7 @@
row = [0, 3, 1, 0]
col = [0, 3, 1, 2]
data = [4, 5, 7, 9]
- sp_array = scipy.sparse.coo_matrix((data, (row, col)))
+ sp_array = scipy.sparse.coo_matrix((data, (row, col)), dtype="int")
result = pd.Series.sparse.from_coo(sp_array)
index = pd.MultiIndex.from_arrays([[0, 0, 1, 3], [0, 2, 1, 3]])