[arch-commits] Commit in python-scikit-learn/trunk (10342.patch PKGBUILD)

[Andrzej Giniewicz]

    Date: Thursday, May 10, 2018 @ 11:17:22
  Author: aginiewicz
Revision: 320218

upgpkg: python-scikit-learn 0.19.1-2

python-scikit-learn: rebuild

Added:
  python-scikit-learn/trunk/10342.patch
Modified:
  python-scikit-learn/trunk/PKGBUILD

-------------+
 10342.patch |   34 ++++++++++++++++++++++++++++++++++
 PKGBUILD    |   13 ++++++++++---
 2 files changed, 44 insertions(+), 3 deletions(-)

Added: 10342.patch
===================================================================
--- 10342.patch	                        (rev 0)
+++ 10342.patch	2018-05-10 11:17:22 UTC (rev 320218)
@@ -0,0 +1,34 @@
+diff -urN scikit-learn-0.19.1-orig/sklearn/metrics/cluster/setup.py scikit-learn-0.19.1/sklearn/metrics/cluster/setup.py
+--- scikit-learn-0.19.1-orig/sklearn/metrics/cluster/setup.py	2018-05-10 13:03:30.982433283 +0200
++++ scikit-learn-0.19.1/sklearn/metrics/cluster/setup.py	2018-05-10 13:08:30.205392486 +0200
+@@ -5,7 +5,7 @@
+ 
+ 
+ def configuration(parent_package="", top_path=None):
+-    config = Configuration("metrics/cluster", parent_package, top_path)
++    config = Configuration("cluster", parent_package, top_path)
+     libraries = []
+     if os.name == 'posix':
+         libraries.append('m')
+diff -urN scikit-learn-0.19.1-orig/sklearn/metrics/setup.py scikit-learn-0.19.1/sklearn/metrics/setup.py
+--- scikit-learn-0.19.1-orig/sklearn/metrics/setup.py	2018-05-10 13:03:30.982433283 +0200
++++ scikit-learn-0.19.1/sklearn/metrics/setup.py	2018-05-10 13:08:45.125595586 +0200
+@@ -14,6 +14,7 @@
+     if os.name == 'posix':
+         cblas_libs.append('m')
+ 
++    config.add_subpackage('cluster')
+     config.add_extension("pairwise_fast",
+                          sources=["pairwise_fast.pyx"],
+                          include_dirs=[os.path.join('..', 'src', 'cblas'),
+diff -urN scikit-learn-0.19.1-orig/sklearn/setup.py scikit-learn-0.19.1/sklearn/setup.py
+--- scikit-learn-0.19.1-orig/sklearn/setup.py	2018-05-10 13:03:30.945766331 +0200
++++ scikit-learn-0.19.1/sklearn/setup.py	2018-05-10 13:08:53.652377292 +0200
+@@ -51,7 +51,6 @@
+     config.add_subpackage('feature_extraction')
+     config.add_subpackage('manifold')
+     config.add_subpackage('metrics')
+-    config.add_subpackage('metrics/cluster')
+     config.add_subpackage('neighbors')
+     config.add_subpackage('tree')
+     config.add_subpackage('svm')

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-10 11:16:43 UTC (rev 320217)
+++ PKGBUILD	2018-05-10 11:17:22 UTC (rev 320218)
@@ -4,7 +4,7 @@
 pkgbase=python-scikit-learn
 pkgname=('python2-scikit-learn' 'python-scikit-learn')
 pkgver=0.19.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of python modules for machine learning and data mining"
 arch=('x86_64')
 url="http://scikit-learn.sourceforge.net/"
@@ -12,11 +12,18 @@
 makedepends=('python2-scipy' 'python-scipy' 'python2-setuptools' 'python-setuptools' 'cython' 'cython2')
 options=(!emptydirs)
 
-source=("https://github.com/scikit-learn/scikit-learn/archive/${pkgver}.tar.gz")
-md5sums=('8fce5acd7d2d12c45d3381bbfa953d61')
+source=("https://github.com/scikit-learn/scikit-learn/archive/${pkgver}.tar.gz"
+        "10342.patch")
+md5sums=('8fce5acd7d2d12c45d3381bbfa953d61'
+         'd6bcd7551850dc1afb1c872b9b69eb24')
 
 prepare() {
   cd "$srcdir"
+
+  # see https://github.com/scikit-learn/scikit-learn/issues/10342
+  # and https://github.com/scikit-learn/scikit-learn/pull/10851
+  patch -p 0 < 10342.patch
+
   cp -a scikit-learn-$pkgver scikit-learn-py2-$pkgver
   cd scikit-learn-py2-$pkgver