Python: Multiple package updates (#4517)

* python-pandas: Update to 0.23.4

* python-scikit-learn: Update to 0.19.2

* python-ipykernel: Update to 4.9.0

* python-olefile: Update to 0.46

* python-openmdao: Update to 2.4.0

* python-networkx: Update to 2.2

* python-jupyter_client: fix dependencies

* python-ipykernel: Fix dependencies

* python-openmdao: Fix executables
This commit is contained in:
Peter Budai
2018-10-09 07:43:01 +03:00
committed by Алексей
parent abca0f9174
commit a96d80966f
8 changed files with 64 additions and 62 deletions

View File

@@ -1,34 +0,0 @@
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')

View File

@@ -3,7 +3,7 @@
_realname=scikit-learn
pkgbase=mingw-w64-python-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
pkgver=0.19.1
pkgver=0.19.2
pkgrel=2
pkgdesc="A set of python modules for machine learning and data mining (mingw-w64)"
arch=('any')
@@ -18,14 +18,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
"${MINGW_PACKAGE_PREFIX}-cython2"
"${MINGW_PACKAGE_PREFIX}-cython"
)
source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn/${_realname}/archive/${pkgver}.tar.gz"
001-10342.patch)
sha256sums=('2947f531ad52e81b2436b26608d8198778ac0b4baa7d2925db8b3b3fcb39c8a2'
'fc2cc84cc0cc3f049f275813e8b5ff17efa14b03ae96be166946588b1bf28276')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn/${_realname}/archive/${pkgver}.tar.gz")
sha256sums=('3024e3dc85ca8b26de33c2c5aec7c7a5f1f4a750463cb1378f1c61b4dc28ec58')
prepare() {
cd "$srcdir"/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/001-10342.patch
cd "$srcdir"