From 9f0933cf737d4074d7f838dfc2c0349fc056c9ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 2 Dec 2019 16:19:45 -0500 Subject: [PATCH 1/2] pythonPackages.fastparquet: 0.2.1 -> 0.3.2 --- .../python-modules/fastparquet/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 260d1b7f4b3..4ccc7c34a41 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,20 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, numba, numpy, pandas, -pytestrunner, thrift, pytest, python-snappy, lz4 }: +{ lib, buildPythonPackage, fetchPypi, numba, numpy, pandas, pytestrunner, +thrift, pytest, python-snappy, lz4 }: buildPythonPackage rec { pname = "fastparquet"; - version = "0.2.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "183wdmhnhnlsd7908n3d2g4qnb49fcipqfshghwpbdwdzjpa0day"; - }; - - # Fixes for recent pandas version - # See https://github.com/dask/fastparquet/pull/396 - patches = fetchpatch { - url = https://github.com/dask/fastparquet/commit/31fb3115598d1ab62a5c8bf7923a27c16f861529.patch; - sha256 = "0r1ig4rydmy4j85dgb52qbsx6knxdwn4dn9h032fg3p6xqq0zlpm"; + sha256 = "d81dcec444f4c4829234b9baac57c7125b8fbe9119c2eca2dee922650db49205"; }; postPatch = '' From 437a1dd050ecd3f69656b588535cbcc055d2c998 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 2 Dec 2019 17:44:43 -0500 Subject: [PATCH 2/2] fastparquet: enable tests --- .../python-modules/fastparquet/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 4ccc7c34a41..046fc530969 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,13 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, numba, numpy, pandas, pytestrunner, +{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner, thrift, pytest, python-snappy, lz4 }: buildPythonPackage rec { pname = "fastparquet"; version = "0.3.2"; - src = fetchPypi { - inherit pname version; - sha256 = "d81dcec444f4c4829234b9baac57c7125b8fbe9119c2eca2dee922650db49205"; + src = fetchFromGitHub { + owner = "dask"; + repo = pname; + rev = version; + sha256 = "142kmyddaq6mvmca23abwns1csn8f3lk9c8mbxwxrg4wa1dh0lb4"; }; postPatch = '' @@ -20,9 +22,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numba numpy pandas thrift ]; checkInputs = [ pytest python-snappy lz4 ]; - # test_data/ missing in PyPI tarball - doCheck = false; - meta = with lib; { description = "A python implementation of the parquet format"; homepage = https://github.com/dask/fastparquet;