diff --git a/pkgs/development/python-modules/experiment-utilities/default.nix b/pkgs/development/python-modules/experiment-utilities/default.nix index 816133f0b4a4..1c8965b0c4f5 100644 --- a/pkgs/development/python-modules/experiment-utilities/default.nix +++ b/pkgs/development/python-modules/experiment-utilities/default.nix @@ -1,54 +1,66 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # dependencies cloudpickle, dill, fasteners, - fetchFromGitLab, - qgrid, ipynbname, ipywidgets, + notebook, + numpy, odfpy, - scipy, plotly, - pytestCheckHook, pyyaml, + qgrid, + scipy, + six, tabulate, tensorboard, + + # tests + pytestCheckHook, torch, }: buildPythonPackage rec { pname = "experiment-utilities"; - version = "0.3.6"; - format = "setuptools"; + version = "0.3.8"; + pyproject = true; - src = fetchFromGitLab { - owner = "creinke"; + src = fetchFromGitHub { + owner = "ChrisReinke"; repo = "exputils"; - domain = "gitlab.inria.fr"; - rev = "refs/tags/version_${version}"; - hash = "sha256-jo0CBSpUc/F1lJ2vagocngDM1Lopw5/AJnt1QwCunA8="; + rev = "refs/tags/v${version}"; + hash = "sha256-fo8kwxm5/oEuLXVKhBrvKg18S0Yh6SkkNRaHUGJfdw4="; }; - # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its - # owned derivation - postPatch = '' - substituteInPlace setup.cfg \ - --replace "ipywidgets >= 7.5.1,<= 7.6.5" "ipywidgets >= 7.5.1" - ''; + pythonRelaxDeps = [ + "notebook" + "ipywidgets" + ]; - propagatedBuildInputs = [ + pythonRemoveDeps = [ + # Not available anymore in nixpkgs + "jupyter-contrib-nbextensions" + ]; + + dependencies = [ cloudpickle dill fasteners ipynbname ipywidgets + notebook + numpy odfpy plotly pyyaml qgrid scipy + six tabulate tensorboard ]; @@ -62,10 +74,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "exputils" ]; - meta = with lib; { + meta = { description = "Various tools to run scientific computer experiments"; homepage = "https://gitlab.inria.fr/creinke/exputils"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3Plus; + changelog = "https://github.com/ChrisReinke/exputils/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; }