[arch-commits] Commit in python-scikit-learn/repos/community-x86_64 (3 files)

Andrzej Giniewicz aginiewicz at archlinux.org
Thu May 10 11:17:32 UTC 2018


    Date: Thursday, May 10, 2018 @ 11:17:31
  Author: aginiewicz
Revision: 320219

archrelease: copy trunk to community-x86_64

Added:
  python-scikit-learn/repos/community-x86_64/10342.patch
    (from rev 320218, python-scikit-learn/trunk/10342.patch)
  python-scikit-learn/repos/community-x86_64/PKGBUILD
    (from rev 320218, python-scikit-learn/trunk/PKGBUILD)
Deleted:
  python-scikit-learn/repos/community-x86_64/PKGBUILD

-------------+
 10342.patch |   34 ++++++++++++++
 PKGBUILD    |  133 ++++++++++++++++++++++++++++++----------------------------
 2 files changed, 104 insertions(+), 63 deletions(-)

Copied: python-scikit-learn/repos/community-x86_64/10342.patch (from rev 320218, python-scikit-learn/trunk/10342.patch)
===================================================================
--- 10342.patch	                        (rev 0)
+++ 10342.patch	2018-05-10 11:17:31 UTC (rev 320219)
@@ -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')

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-10 11:17:22 UTC (rev 320218)
+++ PKGBUILD	2018-05-10 11:17:31 UTC (rev 320219)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
-
-pkgbase=python-scikit-learn
-pkgname=('python2-scikit-learn' 'python-scikit-learn')
-pkgver=0.19.1
-pkgrel=1
-pkgdesc="A set of python modules for machine learning and data mining"
-arch=('x86_64')
-url="http://scikit-learn.sourceforge.net/"
-license=('BSD')
-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')
-
-prepare() {
-  cd "$srcdir"
-  cp -a scikit-learn-$pkgver scikit-learn-py2-$pkgver
-  cd scikit-learn-py2-$pkgver
-
-  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-      -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-      -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-      -i $(find . -name '*.py')
-}
-
-build() {
-  msg "Building Python2"
-  cd "$srcdir"/scikit-learn-py2-$pkgver
-  python2 setup.py build
-
-  msg "Building Python3"
-  cd "$srcdir"/scikit-learn-$pkgver
-  python setup.py build
-}
-
-package_python2-scikit-learn() {
-  depends=('python2-scipy')
-  cd "$srcdir"/scikit-learn-py2-$pkgver
-
-  python2 setup.py install --root="$pkgdir"/ --optimize=1
-
-  install -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-  # See FS#49651
-  install -d "$pkgdir"/usr/share/doc/$pkgname
-  cp -r doc/tutorial "$pkgdir"/usr/share/doc/$pkgname/tutorial
-}
-
-package_python-scikit-learn() {
-  depends=('python-scipy')
-  cd "$srcdir"/scikit-learn-$pkgver
-
-  python setup.py install --root="$pkgdir"/ --optimize=1
-
-  install -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-  # See FS#49651
-  install -d "$pkgdir"/usr/share/doc/$pkgname
-  cp -r doc/tutorial "$pkgdir"/usr/share/doc/$pkgname/tutorial
-}

Copied: python-scikit-learn/repos/community-x86_64/PKGBUILD (from rev 320218, python-scikit-learn/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-10 11:17:31 UTC (rev 320219)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Andrzej Giniewicz <gginiu at gmail.com>
+
+pkgbase=python-scikit-learn
+pkgname=('python2-scikit-learn' 'python-scikit-learn')
+pkgver=0.19.1
+pkgrel=2
+pkgdesc="A set of python modules for machine learning and data mining"
+arch=('x86_64')
+url="http://scikit-learn.sourceforge.net/"
+license=('BSD')
+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"
+        "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
+
+  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+      -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+      -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+      -i $(find . -name '*.py')
+}
+
+build() {
+  msg "Building Python2"
+  cd "$srcdir"/scikit-learn-py2-$pkgver
+  python2 setup.py build
+
+  msg "Building Python3"
+  cd "$srcdir"/scikit-learn-$pkgver
+  python setup.py build
+}
+
+package_python2-scikit-learn() {
+  depends=('python2-scipy')
+  cd "$srcdir"/scikit-learn-py2-$pkgver
+
+  python2 setup.py install --root="$pkgdir"/ --optimize=1
+
+  install -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+  # See FS#49651
+  install -d "$pkgdir"/usr/share/doc/$pkgname
+  cp -r doc/tutorial "$pkgdir"/usr/share/doc/$pkgname/tutorial
+}
+
+package_python-scikit-learn() {
+  depends=('python-scipy')
+  cd "$srcdir"/scikit-learn-$pkgver
+
+  python setup.py install --root="$pkgdir"/ --optimize=1
+
+  install -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+  # See FS#49651
+  install -d "$pkgdir"/usr/share/doc/$pkgname
+  cp -r doc/tutorial "$pkgdir"/usr/share/doc/$pkgname/tutorial
+}



More information about the arch-commits mailing list