Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/debtcollector/, dev-python/oslo-config/, dev-python/oslotest/
Date: Tue, 01 Sep 2015 15:39:39
Message-Id: 1441121740.c209fcd3e3f3de9877bd1a7284de820b5da197d0.prometheanfire@gentoo
1 commit: c209fcd3e3f3de9877bd1a7284de820b5da197d0
2 Author: Matthew Thode <mthode <AT> mthode <DOT> org>
3 AuthorDate: Tue Sep 1 15:35:40 2015 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 1 15:35:40 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c209fcd3
7
8 dev-python/oslo*: fixing seds and prepare statements
9
10 dev-python/debtcollector/debtcollector-0.7.0.ebuild | 6 +++++-
11 dev-python/oslo-config/oslo-config-2.3.0.ebuild | 5 +++--
12 dev-python/oslotest/oslotest-1.10.0.ebuild | 2 +-
13 3 files changed, 9 insertions(+), 4 deletions(-)
14
15 diff --git a/dev-python/debtcollector/debtcollector-0.7.0.ebuild b/dev-python/debtcollector/debtcollector-0.7.0.ebuild
16 index fae6fae..7baebb5 100644
17 --- a/dev-python/debtcollector/debtcollector-0.7.0.ebuild
18 +++ b/dev-python/debtcollector/debtcollector-0.7.0.ebuild
19 @@ -44,8 +44,12 @@ RDEPEND="
20 >=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
21 "
22
23 -python_compile_all() {
24 +python_prepare_all() {
25 sed -i '/^hacking/d' test-requirements.txt || die
26 + distutils-r1_python_prepare_all
27 +}
28 +
29 +python_compile_all() {
30 use doc && esetup.py build_sphinx
31 }
32
33
34 diff --git a/dev-python/oslo-config/oslo-config-2.3.0.ebuild b/dev-python/oslo-config/oslo-config-2.3.0.ebuild
35 index 3d4c587..b275cba 100644
36 --- a/dev-python/oslo-config/oslo-config-2.3.0.ebuild
37 +++ b/dev-python/oslo-config/oslo-config-2.3.0.ebuild
38 @@ -47,9 +47,10 @@ RDEPEND="
39 "
40
41 python_prepare_all() {
42 - sed -i '/^hacking/d' test-requirements.txt
43 - sed -i '/^argparse/d' requirements.txt
44 + sed -i '/^hacking/d' test-requirements.txt || die
45 + sed -i '/^argparse/d' requirements.txt || die
46 use doc && esetup.py build_sphinx
47 + distutils-r1_python_prepare_all
48 }
49
50 python_test() {
51
52 diff --git a/dev-python/oslotest/oslotest-1.10.0.ebuild b/dev-python/oslotest/oslotest-1.10.0.ebuild
53 index 7af4e9b..a5967d0 100644
54 --- a/dev-python/oslotest/oslotest-1.10.0.ebuild
55 +++ b/dev-python/oslotest/oslotest-1.10.0.ebuild
56 @@ -40,7 +40,7 @@ RDEPEND="
57 "
58
59 python_prepare() {
60 - sed -i '/^hacking/d' test-requirements.txt
61 + sed -i '/^hacking/d' test-requirements.txt || die
62 distutils-r1_python_prepare
63 }