diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2018-10-13 03:12:26 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-13 10:12:26 +0200 |
| commit | 4ed993367f085b8881e71cb86ed1e31800d62279 (patch) | |
| tree | b9a16b144f3e35421dab9b1cfd3ce044640f4ab8 /pkgs/development/python-modules | |
| parent | 045a4a4b724fe344ad1f65edff44b8d824e3e79e (diff) | |
| download | nixlib-4ed993367f085b8881e71cb86ed1e31800d62279.tar nixlib-4ed993367f085b8881e71cb86ed1e31800d62279.tar.gz nixlib-4ed993367f085b8881e71cb86ed1e31800d62279.tar.bz2 nixlib-4ed993367f085b8881e71cb86ed1e31800d62279.tar.lz nixlib-4ed993367f085b8881e71cb86ed1e31800d62279.tar.xz nixlib-4ed993367f085b8881e71cb86ed1e31800d62279.tar.zst nixlib-4ed993367f085b8881e71cb86ed1e31800d62279.zip | |
arrow-cpp: 0.10.0 -> 0.11.0 (#48066)
* arrow-cpp: 0.10.0 -> 0.11.0 * arrow-cpp: enable testing
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pyarrow/default.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index e73b1717331c..8ebb88fa6a73 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,8 +1,7 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }: let - _arrow-cpp = arrow-cpp.override { inherit python;}; - _parquet-cpp = parquet-cpp.override { arrow-cpp = _arrow-cpp; }; + _arrow-cpp = arrow-cpp.override { inherit python; }; in buildPythonPackage rec { @@ -17,18 +16,11 @@ buildPythonPackage rec { checkInputs = [ pandas pytest pytestrunner JPype1 ]; PYARROW_BUILD_TYPE = "release"; - PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib"; - - preBuild = '' - substituteInPlace CMakeLists.txt --replace "\''${ARROW_ABI_VERSION}" '"0.0.0"' - substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"' - - # fix the hardcoded value - substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${_parquet-cpp.version}")' - ''; + PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; preCheck = '' rm pyarrow/tests/test_hdfs.py + rm pyarrow/tests/test_cuda.py # fails: "ArrowNotImplementedError: Unsupported numpy type 22" substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled" @@ -47,7 +39,7 @@ buildPythonPackage rec { ''; ARROW_HOME = _arrow-cpp; - PARQUET_HOME = _parquet-cpp; + PARQUET_HOME = _arrow-cpp; setupPyBuildFlags = ["--with-parquet" ]; |