public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/
Date: Tue, 14 Feb 2017 11:33:06 +0000 (UTC)	[thread overview]
Message-ID: <1487071979.7bcb0eb7500285331e1539812462d8155a2939b0.heroxbd@gentoo> (raw)

commit:     7bcb0eb7500285331e1539812462d8155a2939b0
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 11:32:43 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 11:32:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bcb0eb7

sci-libs/scikits_learn: sed to counter more bundled imports

  e.g.  from sklearn.externals import joblib

Package-Manager: portage-2.3.3

 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 8f668c735b..865735d2a0 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
@@ -59,7 +59,8 @@ python_prepare_all() {
 	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
+		sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
+			-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
 	done
 
 	rm sklearn/externals/funcsigs.py || die


             reply	other threads:[~2017-02-14 11:33 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-14 11:33 Benda XU [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-11-13  1:14 [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/ Sam James
2020-06-01  6:41 Georgy Yakovlev
2020-05-09 11:24 Mikle Kolyada
2020-05-09 11:24 Mikle Kolyada
2020-04-08  6:56 Patrick McLean
2020-04-03  3:30 Patrick McLean
2020-01-28  8:24 Joonas Niilola
2020-01-16  7:03 Michał Górny
2020-01-16  7:03 Michał Górny
2019-08-03 20:36 Alexey Shvetsov
2019-02-27  4:25 Aaron Bauman
2017-08-16 18:12 Sebastien Fabbro
2017-08-03 17:33 Sebastien Fabbro
2017-06-28  4:02 Sebastien Fabbro
2017-02-14  6:47 Benda XU
2017-02-14  6:47 Benda XU
2016-08-13 18:48 David Seifert
2016-01-26 19:09 Justin Lecher
2016-01-26 19:09 Justin Lecher
2016-01-06 15:07 Justin Lecher
2016-01-06 15:07 Justin Lecher
2016-01-06 15:07 Justin Lecher
2015-11-06 16:22 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1487071979.7bcb0eb7500285331e1539812462d8155a2939b0.heroxbd@gentoo \
    --to=heroxbd@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox