From 9ea632eadd875b9990d17bbc0b4f6da1c0ab7ce5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 17 Sep 2023 19:12:34 +0200 Subject: [PATCH] python310Packages.skorch: 0.14.0 -> 0.15.0 --- .../python-modules/skorch/default.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 2f8b842d9a9a9..13757f13e1aac 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -2,28 +2,46 @@ , stdenv , buildPythonPackage , fetchPypi -, pytestCheckHook -, flaky +, pythonOlder , numpy -, pandas -, torch , scikit-learn , scipy , tabulate +, torch , tqdm +, flaky +, pandas +, pytestCheckHook +, safetensors +, pythonAtLeast }: buildPythonPackage rec { pname = "skorch"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - hash = "sha256-/d0s0N40W18uGfVbD9VEbhbWfduoo+TBqDjmTkjMUxs="; + hash = "sha256-39XVBlCmbg162z9uL84GZrU+v+M8waXbGdVV72ZYf84="; }; - propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; - nativeCheckInputs = [ flaky pandas pytestCheckHook ]; + disabled = pythonOlder "3.8"; + + propagatedBuildInputs = [ + numpy + scikit-learn + scipy + tabulate + torch + tqdm + ]; + + nativeCheckInputs = [ + flaky + pandas + pytestCheckHook + safetensors + ]; # patch out pytest-cov dep/invocation postPatch = '' @@ -41,6 +59,10 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ # there is a problem with the compiler selection "test_fit_and_predict_with_compile" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Python 3.11+ not yet supported for torch.compile + # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/_dynamo/eval_frame.py#L376-L377 + "test_fit_and_predict_with_compile" ]; disabledTestPaths = [