diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 40c841b38536..4add91da0926 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,62 +1,61 @@ { lib, buildPythonPackage, - fetchFromGitHub, - python, - cython, - oldest-supported-numpy, - setuptools, - setuptools-scm, - numpy, - pandas, cramjam, + cython, + fetchFromGitHub, fsspec, - thrift, - python-lzo, - pytestCheckHook, - pythonOlder, + git, + numpy, + oldest-supported-numpy, packaging, + pandas, + pytestCheckHook, + python-lzo, + python, + pythonOlder, + setuptools-scm, + setuptools, wheel, }: buildPythonPackage rec { pname = "fastparquet"; - version = "2024.2.0"; + version = "2024.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dask"; repo = "fastparquet"; rev = "refs/tags/${version}"; - hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg="; + hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"pytest-runner"' "" - - sed -i \ - -e "/pytest-runner/d" \ - -e '/"git", "status"/d' setup.py + --replace-fail "numpy>=2.0.0rc1" "oldest-supported-numpy" ''; - nativeBuildInputs = [ - cython - oldest-supported-numpy + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + cython + git + oldest-supported-numpy + ]; + + dependencies = [ cramjam fsspec numpy - pandas - thrift packaging + pandas ]; passthru.optional-dependencies = { @@ -82,7 +81,8 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the parquet format"; homepage = "https://github.com/dask/fastparquet"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/dask/fastparquet/blob/${version}/docs/source/releasenotes.rst"; + license = licenses.asl20; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index a1b241f92ce4..fe6fa3b2a656 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pandas, dask, fastparquet, + fetchFromGitHub, + pandas, pyarrow, - setuptools, pythonOlder, + setuptools, + versioneer, }: buildPythonPackage rec { @@ -28,11 +29,17 @@ buildPythonPackage rec { # Break circular dependency substituteInPlace requirements.txt \ --replace-fail "intake" "" + + # Remove vendorized versioneer.py + rm versioneer.py ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; - propagatedBuildInputs = [ + dependencies = [ pandas dask fastparquet