From 639984a46c36f784d2d1dda611a29bded5cc10d7 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Wed, 8 May 2024 18:16:01 +0000 Subject: [PATCH 1/2] python31{1,2}Packages.slicer: unbreak -- remove old patches --- .../python-modules/slicer/default.nix | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index f6900cb63492..41b3e434bc71 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "slicer"; version = "0.0.8"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -25,34 +25,12 @@ buildPythonPackage rec { dos2unix slicer/* ''; - patches = [ - # these patches add support for numpy>=1.24 - (fetchpatch { - url = "https://github.com/interpretml/slicer/commit/028e09e639c4a3c99abe1d537cce30af2eebb081.patch"; - hash = "sha256-jh/cbz7cx2ks6jMNh1gI1n5RS/OHBtSIDZRxUGyrl/I="; - }) - (fetchpatch { - url = "https://github.com/interpretml/slicer/commit/d4bb09f136d7e1f64711633c16a37e7bee738696.patch"; - hash = "sha256-9rh99s4JWF4iKClZ19jvqSeRulL32xB5Use8PGkh/SA="; - }) - (fetchpatch { - url = "https://github.com/interpretml/slicer/commit/74b3683a5a7bd982f9eaaf8d8d665dfdaf2c6604.patch"; - hash = "sha256-R3zsC3udYPFUT93eRhb6wyc9S5n2wceiOunWJ8K+648="; - }) - ]; - nativeBuildInputs = [ dos2unix ]; nativeCheckInputs = [ pytestCheckHook pandas torch scipy ]; - disabledTests = [ - # IndexError: too many indices for array - "test_slicer_sparse" - "test_operations_2d" - ]; - meta = with lib; { description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__"; homepage = "https://github.com/interpretml/slicer"; From ce7904a8e95841034e1260f548bc9da494e92e22 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Wed, 8 May 2024 18:55:00 +0000 Subject: [PATCH 2/2] python31{1,2}Packages.shap: 0.45.0 -> 0.45.1 https://github.com/shap/shap/releases/tag/v0.45.1 --- pkgs/development/python-modules/shap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 2bc1a8f5c2ec..2e0b5c0f814c 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "shap"; - version = "0.45.0"; + version = "0.45.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "slundberg"; repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-x8845saPoLsWu3Z8Thkhqo3HeLmfAZANj3KE0ftVqZc="; + hash = "sha256-REMAubT9WRe0exfhO4UCLt3FFQHq4HApHnI6i2F/V1o="; }; nativeBuildInputs = [