1 |
commit: d71430e877ec01acffeb3f9d988c09103c0fb78a |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 14 06:46:45 2017 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 14 06:47:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71430e8 |
7 |
|
8 |
sci-libs/scikits_learn: version bump. |
9 |
|
10 |
Fix joblib ImportError by replacing all bundled joblib |
11 |
imports with the system one. |
12 |
|
13 |
Bug: 609136 590296 |
14 |
|
15 |
Package-Manager: portage-2.3.3 |
16 |
|
17 |
sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 19 ++++++++----------- |
18 |
1 file changed, 8 insertions(+), 11 deletions(-) |
19 |
|
20 |
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild |
21 |
index 75452bc99b..8f668c735b 100644 |
22 |
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild |
23 |
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild |
24 |
@@ -56,20 +56,17 @@ python_prepare_all() { |
25 |
export SCIPY_FCONFIG="config_fc --noopt --noarch" |
26 |
|
27 |
# use system joblib |
28 |
- rm -r sklearn/externals/joblib/* || die |
29 |
- echo "from joblib import *" > sklearn/externals/joblib/__init__.py |
30 |
- sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die |
31 |
- sed -i -e 's/..externals.joblib/ joblib/g' \ |
32 |
- sklearn/cross_validation.py \ |
33 |
- sklearn/decomposition/tests/test_sparse_pca.py \ |
34 |
- sklearn/metrics/pairwise.py || die |
35 |
+ rm -r sklearn/externals/joblib || die |
36 |
+ sed -i -e '/joblib/d' sklearn/externals/setup.py || die |
37 |
+ for f in sklearn/{*/,}*.py; do |
38 |
+ sed -r -e 's/from (sklearn|\.|)\.externals\.joblib/from joblib/' -i $f || die |
39 |
+ done |
40 |
|
41 |
rm sklearn/externals/funcsigs.py || die |
42 |
rm sklearn/externals/odict.py || die |
43 |
- sed -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \ |
44 |
- -i sklearn/utils/fixes.py || die |
45 |
- sed -e 's:from sklearn.externals.funcsigs import signature:from funcsigs import signature:g' \ |
46 |
- -i sklearn/gaussian_process/{tests/test_,}kernels.py || die |
47 |
+ for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do |
48 |
+ sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die |
49 |
+ done |
50 |
|
51 |
distutils-r1_python_prepare_all |
52 |
} |