git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115360 from SuperSandro2000/datashader
commit39acd7f220b81b7e644a97b78da6dc13664cff1c authorSandro <sandro.jaeckel@gmail.com> dateMon 8 Mar 2021, 01:37 (6 years ago) parentbb81636a2a44a9
4 files changed+48−57
pkgs/development/python-modules/dask/default.nix+21−17 pkgs/development/python-modules/datashader/default.nix+18−33 pkgs/development/python-modules/distributed/default.nix+6−6 pkgs/top-level/python-packages.nix+3−1
pkgs/development/python-modules/dask/default.nix+21−17
@@ -12,12 +12,14 @@
1212, dill
1313, pandas
1414, partd
15+, pytest-xdist
16+, withExtraComplete ? false
17+, distributed
1518}:
1619
1720buildPythonPackage rec {
1821 pname = "dask";
1922 version = "2021.03.0";
20−
2123 disabled = pythonOlder "3.5";
2224
2325 src = fetchFromGitHub {
@@ -27,13 +29,6 @@ buildPythonPackage rec {
2729 sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI=";
2830 };
2931
30− checkInputs = [
31− pytestCheckHook
32− pytest-rerunfailures
33− ];
34−
35− dontUseSetuptoolsCheck = true;
36−
3732 propagatedBuildInputs = [
3833 bokeh
3934 cloudpickle
@@ -43,8 +38,20 @@ buildPythonPackage rec {
4338 pandas
4439 partd
4540 toolz
41+ ] ++ lib.optionals withExtraComplete [
42+ distributed
4643 ];
4744
45+ doCheck = false;
46+
47+ checkInputs = [
48+ pytestCheckHook
49+ pytest-rerunfailures
50+ pytest-xdist
51+ ];
52+
53+ dontUseSetuptoolsCheck = true;
54+
4855 postPatch = ''
4956 # versioneer hack to set version of github package
5057 echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
@@ -54,21 +61,18 @@ buildPythonPackage rec {
5461 --replace "cmdclass=versioneer.get_cmdclass()," ""
5562 '';
5663
57− #pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
64+ pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
5865
5966 disabledTests = [
60− "test_argwhere_str"
61− "test_count_nonzero_str"
62− "rolling_methods" # floating percision error ~0.1*10^8 small
63− "num_workers_config" # flaky
64− "test_2args_with_array[pandas1-darray1-ldexp]" # flaky
67+ "test_annotation_pack_unpack"
68+ "test_annotations_blockwise_unpack"
6569 ];
6670
67− meta = {
71+ meta = with lib; {
6872 description = "Minimal task scheduling abstraction";
6973 homepage = "https://dask.org/";
7074 changelog = "https://docs.dask.org/en/latest/changelog.html";
71− license = lib.licenses.bsd3;
72− maintainers = with lib.maintainers; [ fridh ];
75+ license = licenses.bsd3;
76+ maintainers = with maintainers; [ fridh ];
7377 };
7478}
pkgs/development/python-modules/datashader/default.nix+18−33
@@ -1,9 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, fetchpatch
54, dask
6−, distributed
75, bokeh
86, toolz
97, datashape
@@ -15,38 +13,26 @@
1513, colorcet
1614, param
1715, pyct
18−, pyyaml
19−, requests
20−, scikitimage
2116, scipy
22−, pytest
23−, pytest-benchmark
24−, flake8
17+, pytestCheckHook
2518, nbsmoke
2619, fastparquet
27−, testpath
2820, nbconvert
29−, pytest_xdist
21+, pytest-xdist
22+, netcdf4
3023}:
3124
3225buildPythonPackage rec {
3326 pname = "datashader";
34− version = "0.11.1";
27+ version = "0.12.0";
3528
3629 src = fetchPypi {
3730 inherit pname version;
38− sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6";
31+ sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es=";
3932 };
40− patches = [ (fetchpatch {
41− # Unpins pyct==0.46 (Sep. 11, 2020).
42− # Will be incorporated into the next datashader release after 0.11.1
43− url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch";
44− sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x";
45− })];
4633
4734 propagatedBuildInputs = [
4835 dask
49− distributed
5036 bokeh
5137 toolz
5238 datashape
@@ -58,30 +44,29 @@ buildPythonPackage rec {
5844 colorcet
5945 param
6046 pyct
61− pyyaml
62− requests
63− scikitimage
6447 scipy
65− testpath
6648 ];
6749
6850 checkInputs = [
69− pytest
70− pytest-benchmark
71− pytest_xdist # not needed
72− flake8
51+ pytestCheckHook
52+ pytest-xdist # not needed
7353 nbsmoke
7454 fastparquet
75− pandas
7655 nbconvert
56+ netcdf4
57+ ];
58+
59+ pytestFlagsArray = [
60+ "-n $NIX_BUILD_CORES"
61+ "datashader"
7762 ];
7863
79− # dask doesn't do well with large core counts
80− checkPhase = ''
81− pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested'
82− '';
64+ disabledTestPaths = [
65+ # 31/50 tests fail with TypeErrors
66+ "datashader/tests/test_datatypes.py"
67+ ];
8368
84− meta = with lib; {
69+ meta = with lib;{
8570 description = "Data visualization toolchain based on aggregating into a grid";
8671 homepage = "https://datashader.org";
8772 license = licenses.bsd3;
pkgs/development/python-modules/distributed/default.nix+6−6
@@ -20,13 +20,13 @@
2020
2121buildPythonPackage rec {
2222 pname = "distributed";
23− version = "2.30.1";
23+ version = "2021.3.0";
2424 disabled = pythonOlder "3.6";
2525
2626 # get full repository need conftest.py to run tests
2727 src = fetchPypi {
2828 inherit pname version;
29− sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
29+ sha256 = "sha256-Qn/n4Ee7rXQTxl1X5W+k1rHPkh/SBqPSyquUv5FTw9s=";
3030 };
3131
3232 propagatedBuildInputs = [
@@ -38,11 +38,11 @@ buildPythonPackage rec {
3838 doCheck = false;
3939 pythonImportsCheck = [ "distributed" ];
4040
41− meta = {
41+ meta = with lib; {
4242 description = "Distributed computation in Python.";
4343 homepage = "https://distributed.readthedocs.io/en/latest/";
44− license = lib.licenses.bsd3;
45− platforms = lib.platforms.x86; # fails on aarch64
46− maintainers = with lib.maintainers; [ teh costrouc ];
44+ license = licenses.bsd3;
45+ platforms = platforms.x86; # fails on aarch64
46+ maintainers = with maintainers; [ teh costrouc ];
4747 };
4848}
pkgs/top-level/python-packages.nix+3−1
@@ -1660,7 +1660,9 @@ in {
16601660
16611661 datasette = callPackage ../development/python-modules/datasette { };
16621662
1663− datashader = callPackage ../development/python-modules/datashader { };
1663+ datashader = callPackage ../development/python-modules/datashader {
1664+ dask = self.dask.override { withExtraComplete = true; };
1665+ };
16641666
16651667 datashape = callPackage ../development/python-modules/datashape { };
16661668