public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87638 from veprbl/pr/arrow_cpp_0_17_0

Browse Source 
arrow-cpp: 0.16.0 -> 0.17.1
This commit is contained in:
Dmitry Kalinkin
2020-05-20 18:31:47 -04:00
committed by GitHub
parent 0f1eb8cd79 1fc90ff164
commit 4a302d1b9a
4 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/awkward/default.nix
View File

@@ -3,7 +3,6 @@
, fetchPypi
, numpy
, pandas
, pyarrow
, pytestrunner
, pytest
, h5py
@@ -19,7 +18,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ pytestrunner ];
checkInputs = [ pandas pyarrow pytest h5py ];
checkInputs = [ pandas pytest h5py ];
propagatedBuildInputs = [ numpy ];
checkPhase = ''

17
pkgs/development/python-modules/pyarrow/default.nix
View File

@@ -1,28 +1,19 @@
{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
let
_arrow-cpp = arrow-cpp.override { inherit python; };
_arrow-cpp = arrow-cpp.override { python3 = python; };
in
buildPythonPackage rec {
pname = "pyarrow";
disabled = !isPy3k;
inherit (_arrow-cpp) version src;
patches = [
# Remove when updating pkgs.arrow-cpp to 0.17
(fetchpatch {
name = "ARROW-8106-fix-conversion-test";
url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch";
sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd";
stripLen = 1;
})
];
sourceRoot = "apache-arrow-${version}/python";
nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
propagatedBuildInputs = [ numpy six ];
checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
PYARROW_BUILD_TYPE = "release";