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.
main
Frederik Rietdijk 2 years ago
parent e67331103e
commit 51ef95e6fa
  1. 8
      pkgs/development/python-modules/dask/default.nix
  2. 2
      pkgs/development/python-modules/datashader/default.nix
  3. 4
      pkgs/top-level/python-packages.nix

@ -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/";

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

@ -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 { };

Loading…
Cancel
Save