diff --git a/python-scikit-learn.spec b/python-scikit-learn.spec index 9cbd2a4..d5c331e 100644 --- a/python-scikit-learn.spec +++ b/python-scikit-learn.spec @@ -21,7 +21,7 @@ Source1: system-six.py Source2: system-joblib.py Patch0: sklearn-unbundle-joblib.patch Patch1: blas-name.patch -Patch2: sklean-np11.patch +Patch2: sklearn-np11.patch BuildRequires: python2-devel python3-devel BuildRequires: atlas-devel blas-devel @@ -95,7 +95,7 @@ pushd %{buildroot}/%{python3_sitearch} popd pushd %{buildroot}/%{python2_sitearch} -# nosetests-%{python2_version} -x sklearn + nosetests-%{python2_version} -x sklearn popd %files -n python2-%{srcname} diff --git a/sklean-np11.patch b/sklean-np11.patch deleted file mode 100644 index dc9d1e5..0000000 --- a/sklean-np11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur scikit-learn-0.17.1/sklearn/feature_selection/univariate_selection.py scikit-learn-0.17.1.np11/sklearn/feature_selection/univariate_selection.py ---- scikit-learn-0.17.1/sklearn/feature_selection/univariate_selection.py 2016-02-18 19:00:45.000000000 +0100 -+++ scikit-learn-0.17.1.np11/sklearn/feature_selection/univariate_selection.py 2016-03-29 16:51:42.312649582 +0200 -@@ -403,7 +403,7 @@ - mask = scores > treshold - ties = np.where(scores == treshold)[0] - if len(ties): -- max_feats = len(scores) * self.percentile // 100 -+ max_feats = int(len(scores) * self.percentile / 100) - kept_ties = ties[:max_feats - mask.sum()] - mask[kept_ties] = True - return mask diff --git a/sklearn-np11.patch b/sklearn-np11.patch new file mode 100644 index 0000000..dc9d1e5 --- /dev/null +++ b/sklearn-np11.patch @@ -0,0 +1,12 @@ +diff -ur scikit-learn-0.17.1/sklearn/feature_selection/univariate_selection.py scikit-learn-0.17.1.np11/sklearn/feature_selection/univariate_selection.py +--- scikit-learn-0.17.1/sklearn/feature_selection/univariate_selection.py 2016-02-18 19:00:45.000000000 +0100 ++++ scikit-learn-0.17.1.np11/sklearn/feature_selection/univariate_selection.py 2016-03-29 16:51:42.312649582 +0200 +@@ -403,7 +403,7 @@ + mask = scores > treshold + ties = np.where(scores == treshold)[0] + if len(ties): +- max_feats = len(scores) * self.percentile // 100 ++ max_feats = int(len(scores) * self.percentile / 100) + kept_ties = ties[:max_feats - mask.sum()] + mask[kept_ties] = True + return mask