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