Hello community,
here is the log from the commit of package python-scikit-learn for
openSUSE:Factory checked in at 2018-05-17 19:33:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-scikit-learn (Old)
and /work/SRC/openSUSE:Factory/.python-scikit-learn.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scikit-learn"
Thu May 17 19:33:18 2018 rev:2 rq:610089 version:0.19.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-scikit-learn/python-scikit-learn.changes
2018-01-22 16:10:06.729529217 +0100
+++
/work/SRC/openSUSE:Factory/.python-scikit-learn.new/python-scikit-learn.changes
2018-05-17 19:33:19.399253026 +0200
@@ -1,0 +2,13 @@
+Thu May 17 13:39:27 UTC 2018 - tchva...@suse.com
+
+- Skip test sklearn.linear_model.tests.test_logistic.test_max_iter
+ * Upstream plans to fix it in next release
+ * scikit-learn-skip-test.patch
+
+-------------------------------------------------------------------
+Thu May 17 12:25:53 UTC 2018 - tchva...@suse.com
+
+- Update package to properly state dependencies as in setup.py
+- Install license file
+
+-------------------------------------------------------------------
New:
----
scikit-learn-skip-test.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-scikit-learn.spec ++++++
--- /var/tmp/diff_new_pack.CDd4jG/_old 2018-05-17 19:33:20.647207432 +0200
+++ /var/tmp/diff_new_pack.CDd4jG/_new 2018-05-17 19:33:20.651207286 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-scikit-learn
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,28 +16,28 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define oldpython python
# test floating-point accuracy issues on non-x86 archs
-%ifarch %ix86 x86_64
+%ifarch %{ix86} x86_64
%bcond_without test
%else
%bcond_with test
%endif
-
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define oldpython python
Name: python-scikit-learn
+Version: 0.19.1
+Release: 0
Summary: Python modules for machine learning and data mining
License: BSD-3-Clause
Group: Development/Libraries/Python
-Version: 0.19.1
-Release: 0
+URL: http://scikit-learn.org/
Source0:
https://files.pythonhosted.org/packages/source/s/scikit-learn/scikit-learn-%{version}.tar.gz
-Url: http://scikit-learn.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# Drop with next update
+Patch0: scikit-learn-skip-test.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module matplotlib}
-BuildRequires: %{python_module numpy-devel >= 1.6.1}
-BuildRequires: %{python_module scipy >= 0.9}
+BuildRequires: %{python_module numpy-devel >= 1.8.2}
+BuildRequires: %{python_module scipy >= 0.13.3}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module xml}
BuildRequires: fdupes
@@ -45,14 +45,14 @@
BuildRequires: gcc-fortran
BuildRequires: openblas-devel
BuildRequires: python-rpm-macros
+Requires: python-matplotlib
+Requires: python-numpy >= 1.8.2
+Requires: python-scipy >= 0.13.3
+Requires: python-xml
%if %{with test}
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module nose}
%endif
-Requires: python-matplotlib
-Requires: python-numpy >= 1.6.1
-Requires: python-scipy >= 0.9
-Requires: python-xml
%ifpython2
Provides: %{oldpython}-scikits-learn = %{version}
Obsoletes: %{oldpython}-scikits-learn < %{version}
@@ -65,6 +65,7 @@
%prep
%setup -q -n scikit-learn-%{version}
+%patch0 -p1
%build
%python_build
@@ -86,7 +87,7 @@
%endif
%files %{python_files}
-%defattr(-,root,root)
+%license COPYING
%doc AUTHORS.rst README.rst
%{python_sitearch}/sklearn/
%{python_sitearch}/scikit_learn-%{version}-py*.egg-info
++++++ scikit-learn-skip-test.patch ++++++
Index: scikit-learn-0.19.1/sklearn/linear_model/tests/test_logistic.py
===================================================================
--- scikit-learn-0.19.1.orig/sklearn/linear_model/tests/test_logistic.py
+++ scikit-learn-0.19.1/sklearn/linear_model/tests/test_logistic.py
@@ -1003,26 +1003,6 @@ def test_logreg_predict_proba_multinomia
assert_greater(clf_wrong_loss, clf_multi_loss)
-@ignore_warnings
-def test_max_iter():
- # Test that the maximum number of iteration is reached
- X, y_bin = iris.data, iris.target.copy()
- y_bin[y_bin == 2] = 0
-
- solvers = ['newton-cg', 'liblinear', 'sag', 'saga', 'lbfgs']
-
- for max_iter in range(1, 5):
- for solver in solvers:
- for multi_class in ['ovr', 'multinomial']:
- if solver == 'liblinear' and multi_class == 'multinomial':
- continue
- lr = LogisticRegression(max_iter=max_iter, tol=1e-15,
- multi_class=multi_class,
- random_state=0, solver=solver)
- lr.fit(X, y_bin)
- assert_equal(lr.n_iter_[0], max_iter)
-
-
def test_n_iter():
# Test that self.n_iter_ has the correct format.
X, y = iris.data, iris.target
