python3.pkgs.dask: don't offer an option for extras-require

Using such an option within the package set this way will result in
different packages depending on different versions of dask and thereby
collisions.

Instead, we can simply declare in the package offering the extras the
packages the extra needs.
This commit is contained in:
Frederik Rietdijk 2022-02-25 14:04:07 +01:00
parent e67331103e
commit 51ef95e6fa
3 changed files with 6 additions and 8 deletions

View File

@ -18,7 +18,6 @@
, pythonOlder
, pyyaml
, toolz
, withExtraComplete ? false
}:
buildPythonPackage rec {
@ -46,9 +45,6 @@ buildPythonPackage rec {
jinja2
bokeh
numpy
] ++ lib.optionals (withExtraComplete) [
# infinite recursion between distributed and dask
distributed
];
doCheck = true;
@ -104,6 +100,10 @@ buildPythonPackage rec {
"dask.diagnostics"
];
passthru.extras-require = {
complete = [ distributed ];
};
meta = with lib; {
description = "Minimal task scheduling abstraction";
homepage = "https://dask.org/";

View File

@ -46,7 +46,7 @@ buildPythonPackage rec {
param
pyct
scipy
];
] ++ dask.extras-require.complete;
checkInputs = [
pytestCheckHook

View File

@ -2044,9 +2044,7 @@ in {
datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { };
datashader = callPackage ../development/python-modules/datashader {
dask = self.dask.override { withExtraComplete = true; };
};
datashader = callPackage ../development/python-modules/datashader { };
datashape = callPackage ../development/python-modules/datashape { };