diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index b95559a00ae8..4208ccb17ad2 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, fetchpatch, dask, @@ -13,34 +13,31 @@ sqlalchemy, pytestCheckHook, pytz, + setuptools, + orjson, }: buildPythonPackage rec { pname = "crate"; - version = "1.0.1"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-lDMm7FkdSgvyN0gxmZZHd9WbSXPZUeil15MzWO3uyns="; + # pypi archive does not have tests + src = fetchFromGitHub { + owner = "crate"; + repo = "crate-python"; + tag = version; + hash = "sha256-K09jezBINTw4sUl1Xvm4lJa68ZpwMy9ju/pxdRwnaE4="; }; - patches = [ - # Fix a pandas issue https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979 - (fetchpatch { - url = "https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979.patch"; - hash = "sha256-20g8T0t5gPMbK6kRJ2bzc4BNbB1Dg4hvngXNUPvxi5I="; - name = "python-crate-fix-pandas-error.patch"; - # Patch doesn't apply due to other changes to these files - excludes = [ - "setup.py" - "docs/by-example/sqlalchemy/dataframe.rst" - ]; - }) + + build-system = [ + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + orjson urllib3 sqlalchemy geojson @@ -69,7 +66,7 @@ buildPythonPackage rec { disabledTestPaths = [ # imports setuptools.ssl_support, which doesn't exist anymore - "src/crate/client/test_http.py" + "tests/client/test_http.py" ]; meta = with lib; {