From 611aecf0fdace20e428f30a982bace8caf0acc30 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Oct 28 2016 09:43:25 +0000
Subject: New upstream (0.18)


- Updatd patch blas-name
- Removed patch sklearn-np11 (already in upstream)

---

diff --git a/.gitignore b/.gitignore
index 23b21be..7ec7bc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /scikit-learn-0.16.1.tar.gz
 /scikit-learn-0.17.tar.gz
 /scikit-learn-0.17.1.tar.gz
+/scikit-learn-0.18.tar.gz
diff --git a/blas-name.patch b/blas-name.patch
index 4f3923b..c393296 100644
--- a/blas-name.patch
+++ b/blas-name.patch
@@ -1,7 +1,7 @@
-diff --git a/sklearn/_build_utils.py~ b/sklearn/_build_utils.py
+diff --git a/sklearn/_build_utils/__init__..py~ b/sklearn/_build_utils/__init__.py
 index 166f46f382..ee69ee81c1 100644
---- python3-python-scikit-learn-0.16.1-3.fc24/sklearn/_build_utils.py~
-+++ python3-python-scikit-learn-0.16.1-3.fc24/sklearn/_build_utils.py
+--- python3-python-scikit-learn-0.16.1-3.fc24/sklearn/_build_utils/__init__.py~
++++ python3-python-scikit-learn-0.16.1-3.fc24/sklearn/_build_utils/__init__.py
 @@ -24,7 +24,7 @@ def get_blas_info():
  
      blas_info = get_info('blas_opt', 0)
diff --git a/python-scikit-learn.spec b/python-scikit-learn.spec
index 04f639c..4fd7073 100644
--- a/python-scikit-learn.spec
+++ b/python-scikit-learn.spec
@@ -10,18 +10,17 @@ simple and efficient, accessible to everybody, and reusable                  \
 in various contexts.
 
 Name: python-scikit-learn
-Version: 0.17.1
-Release: 6%{?dist}
+Version: 0.18
+Release: 1%{?dist}
 Summary: %{sum}
 License: BSD
 
 URL: http://scikit-learn.org/
-Source0: https://pypi.python.org/packages/source/s/scikit-learn/%{srcname}-%{version}.tar.gz
+Source0: https://pypi.io/packages/source/s/scikit-learn/%{srcname}-%{version}.tar.gz
 Source1: system-six.py
 Source2: system-joblib.py
 Patch0: sklearn-unbundle-joblib.patch
 Patch1: blas-name.patch
-Patch2: sklearn-np11.patch
 
 BuildRequires: python2-devel python3-devel
 BuildRequires: atlas-devel blas-devel
@@ -34,40 +33,32 @@ BuildRequires: atlas-devel blas-devel
 
 %package -n python2-%{srcname}
 Summary: %{sum}
-BuildRequires: python2-devel python2-nose
-BuildRequires: numpy scipy python2-matplotlib
-BuildRequires: python2-joblib >= 0.9.4
+BuildRequires: python2-nose
+BuildRequires: python2-numpy python2-scipy python2-matplotlib
+BuildRequires: python2-joblib
 BuildRequires: python2-six >= 1.4.1
 BuildRequires: Cython python2-pillow
-Requires: numpy
-Requires: scipy
-Requires: python2-joblib >= 0.9.4
+Requires: python2-numpy
+Requires: python2-scipy
+Requires: python2-joblib
 
-Provides: python-sklearn = %{version}-%{release}
-Provides: python-sklearn%{?_isa} = %{version}-%{release}
-Provides: python2-sklearn = %{version}-%{release}
-Provides: python2-sklearn%{?_isa} = %{version}-%{release}
-
-Provides: %{name} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: %{name} <= 0.17.1-2
-Obsoletes: %{name}%{?_isa} <= 0.17.1-2
+%{?python_provide:%python_provide python2-%{srcname}}
+%{?python_provide:%python_provide python2-sklearn}
 
 %description -n python2-%{srcname}
 %{common_description}
 
 %package -n python3-%{srcname}
 Summary: %{sum}
-BuildRequires: python3-devel python3-nose
+BuildRequires: python3-nose
 BuildRequires: python3-numpy python3-scipy python3-matplotlib
-BuildRequires: python3-joblib >= 0.9.4
+BuildRequires: python3-joblib
 BuildRequires: python3-six >= 1.4.1
-BuildRequires: atlas-devel
 BuildRequires: python3-Cython python3-pillow
-Requires: python3-numpy python3-scipy python3-joblib >= 0.9.4
+Requires: python3-numpy python3-scipy python3-joblib
 
-Provides: python3-sklearn = %{version}-%{release}
-Provides: python3-sklearn%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{srcname}}
+%{?python_provide:%python_provide python3-sklearn}
 
 %description -n python3-%{srcname}
 %{common_description}
@@ -122,6 +113,11 @@ popd
 %{python3_sitearch}/scikit_learn-*.egg-info
 
 %changelog
+* Thu Oct 27 2016 Sergio Pascual <sergiopr@fedoraproject.org> - 0.18-1
+- New upstream (0.18)
+- Updatd patch blas-name
+- Removed patch sklearn-np11 (already in upstream)
+
 * Sat Oct 15 2016 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.1-6
 - rebuilt for matplotlib-2.0.0
 
diff --git a/sklearn-np11.patch b/sklearn-np11.patch
deleted file mode 100644
index dc9d1e5..0000000
--- a/sklearn-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/sources b/sources
index a979dae..6e646ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2f8b877e6d99b1ed737144f5a478dfc  scikit-learn-0.17.1.tar.gz
+cda5d2f87baae33294b8e9294df95013  scikit-learn-0.18.tar.gz