From 87201d37f3b7ebffbbda3adf303733801adc5e7e Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 06:57:12 -0700 Subject: [PATCH] python310Packages.scikit-fuzzy: fix tests for numpy 1.25 --- .../python-modules/scikit-fuzzy/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index dbb5d2044e21..354c27f01915 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , matplotlib , networkx , nose @@ -24,12 +25,28 @@ buildPythonPackage rec { hash = "sha256-kS48aHC719wUdc2WcJa9geoMUcLHSj7ZsoRZYAhF2a0="; }; + patches = [ + # https://github.com/scikit-fuzzy/scikit-fuzzy/pull/299 + (fetchpatch { + name = "numpy-1.25-test-compatibility-1.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/d7d114cff002e2edf9361a55cb985615e91797b5.patch"; + hash = "sha256-udF/z94tVGRHq7gcOko4BSkvVnqe/A/bAARfCPrc06M="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-2.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/f1612f6aeff34dc9329dbded7cee098fcd22ffd9.patch"; + hash = "sha256-Le1ECR4+RjWCkfqjVrd471GD7tuVaQlZ7RZd3zvFdHU="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-3.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/459b9602cf182b7b42f93aad8bcf3bda6f20bfb5.patch"; + hash = "sha256-gKrhNpGt6XoAlMwQW70OPFZj/ZC8NhQq6dEaBpGE8yY="; + }) + ]; + propagatedBuildInputs = [ networkx numpy scipy ]; nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; - # numpy API breakage: "AttributeError: module 'numpy' has no attribute 'float'" - disabledTests = [ "test_fuzzy_compare" ]; - pythonImportsCheck = [ "skfuzzy" ]; meta = with lib; {