Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 02cd5530926f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8de4148e61d4
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 27, 2019

  1. pythonPackages.pyarrow: fix build 

    Setting setupPyBuildFlags makes builder add an additional target
"build_ext" to setup.py arguments in addition to "bdisst_wheel".
pyarrow's setup.py recently started to try to redo build_ext again which
broke the build.

(cherry picked from commit 49e9194)
    @veprbl
    veprbl committed Mar 27, 2019
    Copy the full SHA
    62b686a View commit details

  2. pythonPackages.pyarrow: enable parallel build 

    (cherry picked from commit 55223a8)
    @veprbl
    veprbl committed Mar 27, 2019
    Copy the full SHA
    afd5e8c View commit details

  3. pyarrow: remove tests that can break on darwin 

    (cherry picked from commit 2645454)
    @veprbl
    veprbl committed Mar 27, 2019
    Copy the full SHA
    8de4148 View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/development/python-modules/pyarrow/default.nix
11 changes: 9 additions & 2 deletions pkgs/development/python-modules/pyarrow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ buildPythonPackage rec {
checkInputs = [ hypothesis pandas pytest ];

PYARROW_BUILD_TYPE = "release";
PYARROW_WITH_PARQUET = true;
PYARROW_CMAKE_OPTIONS = [
"-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"

@@ -24,6 +25,10 @@ buildPythonPackage rec {
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
];

preBuild = ''
export PYARROW_PARALLEL=$NIX_BUILD_CORES
'';

preCheck = ''
rm pyarrow/tests/test_jvm.py
rm pyarrow/tests/test_hdfs.py
@@ -43,13 +48,15 @@ buildPythonPackage rec {
# when it is not intended to be imported at all
rm pyarrow/tests/deserialize_buffer.py
substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled"
# Fails to bind a socket
# "PermissionError: [Errno 1] Operation not permitted"
substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled"
'';

ARROW_HOME = _arrow-cpp;
PARQUET_HOME = _arrow-cpp;

setupPyBuildFlags = ["--with-parquet" ];

checkPhase = ''
mv pyarrow/tests tests
rm -rf pyarrow