From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CEFB2139695 for ; Tue, 14 Feb 2017 06:47:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6A8FE0C57; Tue, 14 Feb 2017 06:47:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9458FE0C57 for ; Tue, 14 Feb 2017 06:47:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4DE9934105A for ; Tue, 14 Feb 2017 06:47:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 382144741 for ; Tue, 14 Feb 2017 06:47:16 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1487054828.d71430e877ec01acffeb3f9d988c09103c0fb78a.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild X-VCS-Directories: sci-libs/scikits_learn/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: d71430e877ec01acffeb3f9d988c09103c0fb78a X-VCS-Branch: master Date: Tue, 14 Feb 2017 06:47:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1bf29e57-7661-4d74-b45e-366a60e494c6 X-Archives-Hash: d822e5c8b8e424bbc581baee8a1b3041 commit: d71430e877ec01acffeb3f9d988c09103c0fb78a Author: Benda Xu gentoo org> AuthorDate: Tue Feb 14 06:46:45 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Feb 14 06:47:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71430e8 sci-libs/scikits_learn: version bump. Fix joblib ImportError by replacing all bundled joblib imports with the system one. Bug: 609136 590296 Package-Manager: portage-2.3.3 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild index 75452bc99b..8f668c735b 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild @@ -56,20 +56,17 @@ python_prepare_all() { export SCIPY_FCONFIG="config_fc --noopt --noarch" # use system joblib - rm -r sklearn/externals/joblib/* || die - echo "from joblib import *" > sklearn/externals/joblib/__init__.py - sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die - sed -i -e 's/..externals.joblib/ joblib/g' \ - sklearn/cross_validation.py \ - sklearn/decomposition/tests/test_sparse_pca.py \ - sklearn/metrics/pairwise.py || die + rm -r sklearn/externals/joblib || die + sed -i -e '/joblib/d' sklearn/externals/setup.py || die + for f in sklearn/{*/,}*.py; do + sed -r -e 's/from (sklearn|\.|)\.externals\.joblib/from joblib/' -i $f || die + done rm sklearn/externals/funcsigs.py || die rm sklearn/externals/odict.py || die - sed -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \ - -i sklearn/utils/fixes.py || die - sed -e 's:from sklearn.externals.funcsigs import signature:from funcsigs import signature:g' \ - -i sklearn/gaussian_process/{tests/test_,}kernels.py || die + for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do + sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die + done distutils-r1_python_prepare_all }