1 |
commit: ad36b2ad4ebe0aeca7b9e8deeb570e8a8fe167f4 |
2 |
Author: Michael Vetter <jubalh <AT> iodoru <DOT> org> |
3 |
AuthorDate: Thu Apr 5 11:31:24 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 5 12:20:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad36b2ad |
7 |
|
8 |
dev-util/spec-cleaner: EAPI-6 bump, drop python2_7 support |
9 |
|
10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
11 |
|
12 |
dev-util/spec-cleaner/spec-cleaner-9999.ebuild | 19 ++++++++++++------- |
13 |
1 file changed, 12 insertions(+), 7 deletions(-) |
14 |
|
15 |
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild |
16 |
index 61a6579ab75..297d0528ae6 100644 |
17 |
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild |
18 |
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild |
19 |
@@ -1,9 +1,9 @@ |
20 |
-# Copyright 1999-2015 Gentoo Foundation |
21 |
+# Copyright 1999-2018 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=5 |
25 |
+EAPI=6 |
26 |
|
27 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
28 |
+PYTHON_COMPAT=( python{3_4,3_5} ) |
29 |
EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" |
30 |
inherit distutils-r1 |
31 |
[[ ${PV} == 9999 ]] && inherit git-r3 |
32 |
@@ -14,20 +14,25 @@ HOMEPAGE="https://github.com/openSUSE/spec-cleaner" |
33 |
|
34 |
LICENSE="BSD" |
35 |
SLOT="0" |
36 |
-[[ ${PV} != 9999 ]] && \ |
37 |
+[[ ${PV} != 9999 ]] && |
38 |
KEYWORDS="~amd64 ~x86" |
39 |
IUSE="test" |
40 |
|
41 |
DEPEND=" |
42 |
test? ( |
43 |
- dev-python/mock[${PYTHON_USEDEP}] |
44 |
- dev-python/nose[${PYTHON_USEDEP}] |
45 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
46 |
) |
47 |
" |
48 |
RDEPEND=" |
49 |
${PYTHON_DEPS} |
50 |
+ >=app-arch/rpm-4.11.0.1 |
51 |
" |
52 |
|
53 |
+PATCHES=( |
54 |
+ # pytest-runner is only needed in test scenario |
55 |
+ "${FILESDIR}/${PN}-1.0.6-pytest-runner.patch" |
56 |
+) |
57 |
+ |
58 |
[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" |
59 |
|
60 |
src_prepare() { |
61 |
@@ -39,5 +44,5 @@ src_prepare() { |
62 |
} |
63 |
|
64 |
python_test() { |
65 |
- nosetests |
66 |
+ esetup.py test |
67 |
} |