1 |
commit: 67ef28832c62b655353a438c7a886270f8993b1f |
2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 16 11:29:15 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 23 14:06:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ef2883 |
7 |
|
8 |
dev-python/rospkg: enable py3.10, use d_e_t |
9 |
|
10 |
passes tests |
11 |
|
12 |
Closes: https://bugs.gentoo.org/806860 |
13 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
14 |
|
15 |
dev-python/rospkg/rospkg-1.3.0.ebuild | 16 +++------------- |
16 |
dev-python/rospkg/rospkg-9999.ebuild | 16 +++------------- |
17 |
2 files changed, 6 insertions(+), 26 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/rospkg/rospkg-1.3.0.ebuild b/dev-python/rospkg/rospkg-1.3.0.ebuild |
20 |
index 9a43e2fb6d1..fbd4db374f3 100644 |
21 |
--- a/dev-python/rospkg/rospkg-1.3.0.ebuild |
22 |
+++ b/dev-python/rospkg/rospkg-1.3.0.ebuild |
23 |
@@ -2,8 +2,8 @@ |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=7 |
27 |
-PYTHON_COMPAT=( python{3_7,3_8,3_9} ) |
28 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
29 |
+ |
30 |
+PYTHON_COMPAT=( python3_{8..10} ) |
31 |
|
32 |
SCM="" |
33 |
if [ "${PV#9999}" != "${PV}" ] ; then |
34 |
@@ -27,26 +27,16 @@ fi |
35 |
|
36 |
LICENSE="BSD" |
37 |
SLOT="0" |
38 |
-IUSE="test" |
39 |
-RESTRICT="!test? ( test )" |
40 |
|
41 |
RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}] |
42 |
dev-python/catkin_pkg[${PYTHON_USEDEP}] |
43 |
dev-python/distro[${PYTHON_USEDEP}] |
44 |
" |
45 |
BDEPEND=" |
46 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
47 |
- test? ( |
48 |
- dev-python/nose[${PYTHON_USEDEP}] |
49 |
- )" |
50 |
-DEPEND="${RDEPEND} ${BDEPEND} |
51 |
test? ( |
52 |
- dev-python/coverage[${PYTHON_USEDEP}] |
53 |
dev-python/mock[${PYTHON_USEDEP}] |
54 |
) |
55 |
" |
56 |
PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" ) |
57 |
|
58 |
-python_test() { |
59 |
- nosetests --with-coverage --cover-package=rospkg --with-xunit test || die |
60 |
-} |
61 |
+distutils_enable_tests nose |
62 |
|
63 |
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild |
64 |
index 9a43e2fb6d1..fbd4db374f3 100644 |
65 |
--- a/dev-python/rospkg/rospkg-9999.ebuild |
66 |
+++ b/dev-python/rospkg/rospkg-9999.ebuild |
67 |
@@ -2,8 +2,8 @@ |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
|
70 |
EAPI=7 |
71 |
-PYTHON_COMPAT=( python{3_7,3_8,3_9} ) |
72 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
73 |
+ |
74 |
+PYTHON_COMPAT=( python3_{8..10} ) |
75 |
|
76 |
SCM="" |
77 |
if [ "${PV#9999}" != "${PV}" ] ; then |
78 |
@@ -27,26 +27,16 @@ fi |
79 |
|
80 |
LICENSE="BSD" |
81 |
SLOT="0" |
82 |
-IUSE="test" |
83 |
-RESTRICT="!test? ( test )" |
84 |
|
85 |
RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}] |
86 |
dev-python/catkin_pkg[${PYTHON_USEDEP}] |
87 |
dev-python/distro[${PYTHON_USEDEP}] |
88 |
" |
89 |
BDEPEND=" |
90 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
91 |
- test? ( |
92 |
- dev-python/nose[${PYTHON_USEDEP}] |
93 |
- )" |
94 |
-DEPEND="${RDEPEND} ${BDEPEND} |
95 |
test? ( |
96 |
- dev-python/coverage[${PYTHON_USEDEP}] |
97 |
dev-python/mock[${PYTHON_USEDEP}] |
98 |
) |
99 |
" |
100 |
PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" ) |
101 |
|
102 |
-python_test() { |
103 |
- nosetests --with-coverage --cover-package=rospkg --with-xunit test || die |
104 |
-} |
105 |
+distutils_enable_tests nose |