Merge pull request #115360 from SuperSandro2000/datashader
This commit is contained in:
commit
39acd7f220
|
@ -12,12 +12,14 @@
|
||||||
, dill
|
, dill
|
||||||
, pandas
|
, pandas
|
||||||
, partd
|
, partd
|
||||||
|
, pytest-xdist
|
||||||
|
, withExtraComplete ? false
|
||||||
|
, distributed
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dask";
|
pname = "dask";
|
||||||
version = "2021.03.0";
|
version = "2021.03.0";
|
||||||
|
|
||||||
disabled = pythonOlder "3.5";
|
disabled = pythonOlder "3.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -27,13 +29,6 @@ buildPythonPackage rec {
|
||||||
sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI=";
|
sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
pytestCheckHook
|
|
||||||
pytest-rerunfailures
|
|
||||||
];
|
|
||||||
|
|
||||||
dontUseSetuptoolsCheck = true;
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
bokeh
|
bokeh
|
||||||
cloudpickle
|
cloudpickle
|
||||||
|
@ -43,8 +38,20 @@ buildPythonPackage rec {
|
||||||
pandas
|
pandas
|
||||||
partd
|
partd
|
||||||
toolz
|
toolz
|
||||||
|
] ++ lib.optionals withExtraComplete [
|
||||||
|
distributed
|
||||||
];
|
];
|
||||||
|
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
pytest-rerunfailures
|
||||||
|
pytest-xdist
|
||||||
|
];
|
||||||
|
|
||||||
|
dontUseSetuptoolsCheck = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# versioneer hack to set version of github package
|
# versioneer hack to set version of github package
|
||||||
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
|
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
|
||||||
|
@ -54,21 +61,18 @@ buildPythonPackage rec {
|
||||||
--replace "cmdclass=versioneer.get_cmdclass()," ""
|
--replace "cmdclass=versioneer.get_cmdclass()," ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
#pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
|
pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
"test_argwhere_str"
|
"test_annotation_pack_unpack"
|
||||||
"test_count_nonzero_str"
|
"test_annotations_blockwise_unpack"
|
||||||
"rolling_methods" # floating percision error ~0.1*10^8 small
|
|
||||||
"num_workers_config" # flaky
|
|
||||||
"test_2args_with_array[pandas1-darray1-ldexp]" # flaky
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "Minimal task scheduling abstraction";
|
description = "Minimal task scheduling abstraction";
|
||||||
homepage = "https://dask.org/";
|
homepage = "https://dask.org/";
|
||||||
changelog = "https://docs.dask.org/en/latest/changelog.html";
|
changelog = "https://docs.dask.org/en/latest/changelog.html";
|
||||||
license = lib.licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [ fridh ];
|
maintainers = with maintainers; [ fridh ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, fetchpatch
|
|
||||||
, dask
|
, dask
|
||||||
, distributed
|
|
||||||
, bokeh
|
, bokeh
|
||||||
, toolz
|
, toolz
|
||||||
, datashape
|
, datashape
|
||||||
|
@ -15,38 +13,26 @@
|
||||||
, colorcet
|
, colorcet
|
||||||
, param
|
, param
|
||||||
, pyct
|
, pyct
|
||||||
, pyyaml
|
|
||||||
, requests
|
|
||||||
, scikitimage
|
|
||||||
, scipy
|
, scipy
|
||||||
, pytest
|
, pytestCheckHook
|
||||||
, pytest-benchmark
|
|
||||||
, flake8
|
|
||||||
, nbsmoke
|
, nbsmoke
|
||||||
, fastparquet
|
, fastparquet
|
||||||
, testpath
|
|
||||||
, nbconvert
|
, nbconvert
|
||||||
, pytest_xdist
|
, pytest-xdist
|
||||||
|
, netcdf4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "datashader";
|
pname = "datashader";
|
||||||
version = "0.11.1";
|
version = "0.12.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6";
|
sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es=";
|
||||||
};
|
};
|
||||||
patches = [ (fetchpatch {
|
|
||||||
# Unpins pyct==0.46 (Sep. 11, 2020).
|
|
||||||
# Will be incorporated into the next datashader release after 0.11.1
|
|
||||||
url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch";
|
|
||||||
sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x";
|
|
||||||
})];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
dask
|
dask
|
||||||
distributed
|
|
||||||
bokeh
|
bokeh
|
||||||
toolz
|
toolz
|
||||||
datashape
|
datashape
|
||||||
|
@ -58,30 +44,29 @@ buildPythonPackage rec {
|
||||||
colorcet
|
colorcet
|
||||||
param
|
param
|
||||||
pyct
|
pyct
|
||||||
pyyaml
|
|
||||||
requests
|
|
||||||
scikitimage
|
|
||||||
scipy
|
scipy
|
||||||
testpath
|
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pytest
|
pytestCheckHook
|
||||||
pytest-benchmark
|
pytest-xdist # not needed
|
||||||
pytest_xdist # not needed
|
|
||||||
flake8
|
|
||||||
nbsmoke
|
nbsmoke
|
||||||
fastparquet
|
fastparquet
|
||||||
pandas
|
|
||||||
nbconvert
|
nbconvert
|
||||||
|
netcdf4
|
||||||
];
|
];
|
||||||
|
|
||||||
# dask doesn't do well with large core counts
|
pytestFlagsArray = [
|
||||||
checkPhase = ''
|
"-n $NIX_BUILD_CORES"
|
||||||
pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested'
|
"datashader"
|
||||||
'';
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
disabledTestPaths = [
|
||||||
|
# 31/50 tests fail with TypeErrors
|
||||||
|
"datashader/tests/test_datatypes.py"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib;{
|
||||||
description = "Data visualization toolchain based on aggregating into a grid";
|
description = "Data visualization toolchain based on aggregating into a grid";
|
||||||
homepage = "https://datashader.org";
|
homepage = "https://datashader.org";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
|
|
@ -20,13 +20,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "distributed";
|
pname = "distributed";
|
||||||
version = "2.30.1";
|
version = "2021.3.0";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
# get full repository need conftest.py to run tests
|
# get full repository need conftest.py to run tests
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
|
sha256 = "sha256-Qn/n4Ee7rXQTxl1X5W+k1rHPkh/SBqPSyquUv5FTw9s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -38,11 +38,11 @@ buildPythonPackage rec {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
pythonImportsCheck = [ "distributed" ];
|
pythonImportsCheck = [ "distributed" ];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "Distributed computation in Python.";
|
description = "Distributed computation in Python.";
|
||||||
homepage = "https://distributed.readthedocs.io/en/latest/";
|
homepage = "https://distributed.readthedocs.io/en/latest/";
|
||||||
license = lib.licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
platforms = lib.platforms.x86; # fails on aarch64
|
platforms = platforms.x86; # fails on aarch64
|
||||||
maintainers = with lib.maintainers; [ teh costrouc ];
|
maintainers = with maintainers; [ teh costrouc ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1660,7 +1660,9 @@ in {
|
||||||
|
|
||||||
datasette = callPackage ../development/python-modules/datasette { };
|
datasette = callPackage ../development/python-modules/datasette { };
|
||||||
|
|
||||||
datashader = callPackage ../development/python-modules/datashader { };
|
datashader = callPackage ../development/python-modules/datashader {
|
||||||
|
dask = self.dask.override { withExtraComplete = true; };
|
||||||
|
};
|
||||||
|
|
||||||
datashape = callPackage ../development/python-modules/datashape { };
|
datashape = callPackage ../development/python-modules/datashape { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue