From ed734e5eba251f8f6de9b15dbfebdc05f9cfd7d1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 29 Jul 2024 14:52:54 +0200 Subject: [PATCH] python3Packages.scikit-fuzzy: unstable-2022-11-07 -> unstable-2023-09-14 --- .../python-modules/scikit-fuzzy/default.nix | 41 +++++-------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index f3eae80276f22..d184f566657e5 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -1,52 +1,30 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, - fetchpatch, - pythonAtLeast, setuptools, matplotlib, networkx, - nose, numpy, scipy, pytest7CheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "scikit-fuzzy"; - version = "unstable-2022-11-07"; + version = "0.4.2-unstable-2023-09-14"; pyproject = true; - # code depends on distutils - disabled = pythonAtLeast "3.12"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "d8c45c259d62955004379592e45bc64c8e002fc3"; - hash = "sha256-kS48aHC719wUdc2WcJa9geoMUcLHSj7ZsoRZYAhF2a0="; + owner = "scikit-fuzzy"; + repo = "scikit-fuzzy"; + rev = "d7551b649f34c2f5e98836e9b502279226d3b225"; + hash = "sha256-91Udm2dIaIwTVG6V1EqYA/4qryuS4APgaa7tIa3sSQE="; }; - 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="; - }) - ]; - build-system = [ setuptools ]; propagatedBuildInputs = [ @@ -57,10 +35,11 @@ buildPythonPackage rec { nativeCheckInputs = [ matplotlib - nose pytest7CheckHook ]; + preCheck = "rm -rf build"; + pythonImportsCheck = [ "skfuzzy" ]; meta = with lib; {