Merge pull request #186609 from cpcloud/bump-ibis-framework

authored by Martin Weinelt and committed by GitHub df5f0ec2 978c89cb

+19 -21
+19 -21
pkgs/development/python-modules/ibis-framework/default.nix
··· 5 , pythonOlder 6 , pytestCheckHook 7 , atpublic 8 - , cached-property 9 , click 10 , clickhouse-cityhash 11 , clickhouse-driver ··· 13 , datafusion 14 , duckdb 15 , duckdb-engine 16 , geoalchemy2 17 , geopandas 18 , graphviz-nox 19 - , importlib-metadata 20 , lz4 21 , multipledispatch 22 , numpy ··· 37 , python 38 , pytz 39 , regex 40 , shapely 41 , sqlalchemy 42 , sqlite ··· 55 ibisTestingData = fetchFromGitHub { 56 owner = "ibis-project"; 57 repo = "testing-data"; 58 - rev = "a88a4b3c3b54a88e7f77e59de70f5bf20fb62f19"; 59 - sha256 = "sha256-BnRhVwPcWFwiBJ2ySgiiuUdnF4gesnTq1/dLcuvc868="; 60 }; 61 in 62 63 buildPythonPackage rec { 64 pname = "ibis-framework"; 65 - version = "3.0.2"; 66 format = "pyproject"; 67 68 disabled = pythonOlder "3.8"; ··· 71 repo = "ibis"; 72 owner = "ibis-project"; 73 rev = version; 74 - hash = "sha256-7ywDMAHQAl39kiHfxVkq7voUEKqbb9Zq8qlaug7+ukI="; 75 }; 76 77 patches = [ 78 (fetchpatch { 79 - url = "https://github.com/ibis-project/ibis/commit/a6f64c6c32b49098d39bb205952cbce4bdfea657.patch"; 80 - sha256 = "sha256-puVMjiJXWk8C9yhuXPD9HKrgUBYcYmUPacQz5YO5xYQ="; 81 - includes = [ "pyproject.toml" ]; 82 }) 83 ]; 84 ··· 86 87 propagatedBuildInputs = [ 88 atpublic 89 - cached-property 90 - importlib-metadata 91 multipledispatch 92 numpy 93 packaging ··· 104 checkInputs = [ 105 pytestCheckHook 106 click 107 pytest-benchmark 108 pytest-mock 109 pytest-randomly 110 pytest-xdist 111 ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; 112 113 preBuild = '' 114 # setup.py exists only for developer convenience and is automatically generated 115 rm setup.py 116 ''; 117 ··· 119 "--dist=loadgroup" 120 "-m" 121 "'${lib.concatStringsSep " or " testBackends} or core'" 122 ]; 123 124 preCheck = '' ··· 127 export IBIS_TEST_DATA_DIRECTORY 128 IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)" 129 130 - # copy the test data to a writable directory 131 - cp -r ${ibisTestingData}/* "$IBIS_TEST_DATA_DIRECTORY" 132 - 133 - find "$IBIS_TEST_DATA_DIRECTORY" -type d -exec chmod u+rwx {} + 134 - find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} + 135 - 136 - # load data 137 - for backend in ${lib.concatStringsSep " " testBackends}; do 138 - ${python.interpreter} ci/datamgr.py load "$backend" 139 - done 140 ''; 141 142 postCheck = ''
··· 5 , pythonOlder 6 , pytestCheckHook 7 , atpublic 8 , click 9 , clickhouse-cityhash 10 , clickhouse-driver ··· 12 , datafusion 13 , duckdb 14 , duckdb-engine 15 + , filelock 16 , geoalchemy2 17 , geopandas 18 , graphviz-nox 19 , lz4 20 , multipledispatch 21 , numpy ··· 36 , python 37 , pytz 38 , regex 39 + , rsync 40 , shapely 41 , sqlalchemy 42 , sqlite ··· 55 ibisTestingData = fetchFromGitHub { 56 owner = "ibis-project"; 57 repo = "testing-data"; 58 + rev = "3c39abfdb4b284140ff481e8f9fbb128b35f157a"; 59 + sha256 = "sha256-BZWi4kEumZemQeYoAtlUSw922p+R6opSWp/bmX0DjAo="; 60 }; 61 in 62 63 buildPythonPackage rec { 64 pname = "ibis-framework"; 65 + version = "3.1.0"; 66 format = "pyproject"; 67 68 disabled = pythonOlder "3.8"; ··· 71 repo = "ibis"; 72 owner = "ibis-project"; 73 rev = version; 74 + hash = "sha256-/mQWQLiJa1DRZiyiA6F0/lMyn3wSY1IUwJl2S0IFkvs="; 75 }; 76 77 patches = [ 78 (fetchpatch { 79 + name = "xfail-datafusion-0.4.0"; 80 + url = "https://github.com/ibis-project/ibis/compare/c162abba4df24e0d531bd2e6a3be3109c16b43b9...6219d6caee19b6fd3171983c49cd8d6872e3564b.patch"; 81 + hash = "sha256-pCYPntj+TwzqCtYWRf6JF5/tJC4crSXHp0aepRocHck="; 82 + excludes = ["poetry.lock"]; 83 }) 84 ]; 85 ··· 87 88 propagatedBuildInputs = [ 89 atpublic 90 multipledispatch 91 numpy 92 packaging ··· 103 checkInputs = [ 104 pytestCheckHook 105 click 106 + filelock 107 pytest-benchmark 108 pytest-mock 109 pytest-randomly 110 pytest-xdist 111 + rsync 112 ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; 113 114 preBuild = '' 115 # setup.py exists only for developer convenience and is automatically generated 116 + # it gets in the way in nixpkgs so we remove it 117 rm setup.py 118 ''; 119 ··· 121 "--dist=loadgroup" 122 "-m" 123 "'${lib.concatStringsSep " or " testBackends} or core'" 124 + # this test fails on nixpkgs datafusion version (0.4.0), but works on 125 + # datafusion 0.6.0 126 + "-k" 127 + "'not datafusion-no_op'" 128 ]; 129 130 preCheck = '' ··· 133 export IBIS_TEST_DATA_DIRECTORY 134 IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)" 135 136 + # copy the test data to a directory 137 + rsync --chmod=Du+rwx,Fu+rw --archive "${ibisTestingData}/" "$IBIS_TEST_DATA_DIRECTORY" 138 ''; 139 140 postCheck = ''