commit 09de72aad036c5b9fb1cca78642cbe04531ea9d8 · pyrox.dev/nixpkgs

-109

pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch

···

       1
       1
       -
       From 360cb75317aecaf6b9abcf24f0577afef75c464e Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: wxt <3264117476@qq.com>

     

       3
       3
       -
       Date: Mon, 6 Jan 2025 20:41:27 +0800

     

       4
       4
       -
       Subject: [PATCH] fix(test): replace np.float_ to np.float64

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        mlxtend/_base/_regressor.py                     | 2 +-

     

       8
       8
       -
        mlxtend/_base/tests/test_classifier.py          | 2 +-

     

       9
       9
       -
        mlxtend/_base/tests/test_cluster.py             | 2 +-

     

       10
       10
       -
        mlxtend/classifier/multilayerperceptron.py      | 2 +-

     

       11
       11
       -
        mlxtend/classifier/softmax_regression.py        | 2 +-

     

       12
       12
       -
        mlxtend/math/linalg.py                          | 2 +-

     

       13
       13
       -
        mlxtend/plotting/tests/test_decision_regions.py | 2 +-

     

       14
       14
       -
        7 files changed, 7 insertions(+), 7 deletions(-)

     

       15
       15
       -
       

     

       16
       16
       -
       diff --git a/mlxtend/_base/_regressor.py b/mlxtend/_base/_regressor.py

     

       17
       17
       -
       index e3d0a1d..1d3a5d6 100644

     

       18
       18
       -
       --- a/mlxtend/_base/_regressor.py

     

       19
       19
       -
       +++ b/mlxtend/_base/_regressor.py

     

       20
       20
       -
       @@ -16,7 +16,7 @@ class _Regressor(object):

     

       21
       21
       -
                pass

     

       22
       22
       -
        

     

       23
       23
       -
            def _check_target_array(self, y, allowed=None):

     

       24
       24
       -
       -        if not isinstance(y[0], (float, np.float_)):

     

       25
       25
       -
       +        if not isinstance(y[0], (float, np.float64)):

     

       26
       26
       -
                    raise AttributeError("y must be a float array.\nFound %s" % y.dtype)

     

       27
       27
       -
        

     

       28
       28
       -
            def fit(self, X, y, init_params=True):

     

       29
       29
       -
       diff --git a/mlxtend/_base/tests/test_classifier.py b/mlxtend/_base/tests/test_classifier.py

     

       30
       30
       -
       index f77f74d..1bbac6d 100644

     

       31
       31
       -
       --- a/mlxtend/_base/tests/test_classifier.py

     

       32
       32
       -
       +++ b/mlxtend/_base/tests/test_classifier.py

     

       33
       33
       -
       @@ -51,7 +51,7 @@ def test_check_labels_not_ok_1():

     

       34
       34
       -
        

     

       35
       35
       -
        

     

       36
       36
       -
        def test_check_labels_integer_notok():

     

       37
       37
       -
       -    y = np.array([1.0, 2.0], dtype=np.float_)

     

       38
       38
       -
       +    y = np.array([1.0, 2.0], dtype=np.float64)

     

       39
       39
       -
            cl = BlankClassifier(print_progress=0, random_seed=1)

     

       40
       40
       -
            with pytest.raises(AttributeError) as excinfo:

     

       41
       41
       -
                cl._check_target_array(y)

     

       42
       42
       -
       diff --git a/mlxtend/_base/tests/test_cluster.py b/mlxtend/_base/tests/test_cluster.py

     

       43
       43
       -
       index 6da1a9d..54c2526 100644

     

       44
       44
       -
       --- a/mlxtend/_base/tests/test_cluster.py

     

       45
       45
       -
       +++ b/mlxtend/_base/tests/test_cluster.py

     

       46
       46
       -
       @@ -51,7 +51,7 @@ def test_check_labels_not_ok_1():

     

       47
       47
       -
        

     

       48
       48
       -
        

     

       49
       49
       -
        def test_check_labels_integer_notok():

     

       50
       50
       -
       -    y = np.array([1.0, 2.0], dtype=np.float_)

     

       51
       51
       -
       +    y = np.array([1.0, 2.0], dtype=np.float64)

     

       52
       52
       -
            cl = BlankClassifier(print_progress=0, random_seed=1)

     

       53
       53
       -
            with pytest.raises(AttributeError) as excinfo:

     

       54
       54
       -
                cl._check_target_array(y)

     

       55
       55
       -
       diff --git a/mlxtend/classifier/multilayerperceptron.py b/mlxtend/classifier/multilayerperceptron.py

     

       56
       56
       -
       index 770dab9..05416c3 100644

     

       57
       57
       -
       --- a/mlxtend/classifier/multilayerperceptron.py

     

       58
       58
       -
       +++ b/mlxtend/classifier/multilayerperceptron.py

     

       59
       59
       -
       @@ -143,7 +143,7 @@ class MultiLayerPerceptron(

     

       60
       60
       -
                        prev_grad_b_out = np.zeros(shape=self.b_["out"].shape)

     

       61
       61
       -
                        prev_grad_w_out = np.zeros(shape=self.w_["out"].shape)

     

       62
       62
       -
        

     

       63
       63
       -
       -        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_)

     

       64
       64
       -
       +        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64)

     

       65
       65
       -
        

     

       66
       66
       -
                self.init_time_ = time()

     

       67
       67
       -
        

     

       68
       68
       -
       diff --git a/mlxtend/classifier/softmax_regression.py b/mlxtend/classifier/softmax_regression.py

     

       69
       69
       -
       index 56444e5..173154e 100644

     

       70
       70
       -
       --- a/mlxtend/classifier/softmax_regression.py

     

       71
       71
       -
       +++ b/mlxtend/classifier/softmax_regression.py

     

       72
       72
       -
       @@ -141,7 +141,7 @@ class SoftmaxRegression(_BaseModel, _IterativeModel, _Classifier, _MultiClass):

     

       73
       73
       -
                    )

     

       74
       74
       -
                    self.cost_ = []

     

       75
       75
       -
        

     

       76
       76
       -
       -        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_)

     

       77
       77
       -
       +        y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64)

     

       78
       78
       -
        

     

       79
       79
       -
                self.init_time_ = time()

     

       80
       80
       -
                rgen = np.random.RandomState(self.random_seed)

     

       81
       81
       -
       diff --git a/mlxtend/math/linalg.py b/mlxtend/math/linalg.py

     

       82
       82
       -
       index 02600f1..ece4c3c 100644

     

       83
       83
       -
       --- a/mlxtend/math/linalg.py

     

       84
       84
       -
       +++ b/mlxtend/math/linalg.py

     

       85
       85
       -
       @@ -45,7 +45,7 @@ def vectorspace_orthonormalization(ary, eps=1e-13):  # method='gram-schmidt',

     

       86
       86
       -
            #   2c) Normalize if linearly independent,

     

       87
       87
       -
            #       and set to zero otherwise

     

       88
       88
       -
        

     

       89
       89
       -
       -    arr = ary.astype(np.float_).copy()

     

       90
       90
       -
       +    arr = ary.astype(np.float64).copy()

     

       91
       91
       -
        

     

       92
       92
       -
            for i in range(arr.shape[1]):

     

       93
       93
       -
                for j in range(i):

     

       94
       94
       -
       diff --git a/mlxtend/plotting/tests/test_decision_regions.py b/mlxtend/plotting/tests/test_decision_regions.py

     

       95
       95
       -
       index fba2255..aad63ff 100644

     

       96
       96
       -
       --- a/mlxtend/plotting/tests/test_decision_regions.py

     

       97
       97
       -
       +++ b/mlxtend/plotting/tests/test_decision_regions.py

     

       98
       98
       -
       @@ -94,7 +94,7 @@ def test_y_int_ary():

     

       99
       99
       -
                "Try passing the array as y.astype(np.int_)",

     

       100
       100
       -
                plot_decision_regions,

     

       101
       101
       -
                X[:, :2],

     

       102
       102
       -
       -        y.astype(np.float_),

     

       103
       103
       -
       +        y.astype(np.float64),

     

       104
       104
       -
                sr,

     

       105
       105
       -
            )

     

       106
       106
       -
        

     

       107
       107
       -
       -- 

     

       108
       108
       -
       2.47.0

     

       109
       109
       -

+2 -7

pkgs/development/python-modules/mlxtend/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "mlxtend";

     

       19
       19
       -
         version = "0.23.3";

     

       19
       19
       +
         version = "0.23.4";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         disabled = isPy27;

     
···

       25
       25
        
           owner = "rasbt";

     

       26
       26
        
           repo = "mlxtend";

     

       27
       27
        
           tag = "v${version}";

     

       28
       28
       -
           hash = "sha256-c6I0dwu4y/Td2G6m2WP/52W4noQUmQMDvpzXA9RZauo=";

     

       28
       28
       +
           hash = "sha256-xoAHYRmqN5SrEWlc18ntTZ6WAznBlVZdf+x5Yev3ysE=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         build-system = [ setuptools ];

     
···

       37
       37
        
           pandas

     

       38
       38
        
           matplotlib

     

       39
       39
        
           joblib

     

       40
       40
       -
         ];

     

       41
       41
       -
       

     

       42
       42
       -
         patches = [

     

       43
       43
       -
           # https://github.com/rasbt/mlxtend/pull/1119

     

       44
       44
       -
           ./0001-fix-test-replace-np.float_-to-np.float64.patch

     

       45
       40
        
         ];

     

       46
       41
        
       

     

       47
       42
        
         nativeCheckInputs = [ pytestCheckHook ];