| 1 |
commit: a67bc0bd6902d5f0f55fc3b94a4542866bff5567 |
| 2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 16 10:57:33 2021 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 23 14:04:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67bc0bd |
| 7 |
|
| 8 |
dev-python/catkin_pkg: enable py3.10, use d_e_t |
| 9 |
|
| 10 |
passes tests |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/812332 |
| 13 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild | 21 +++++---------------- |
| 16 |
dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 21 +++++---------------- |
| 17 |
2 files changed, 10 insertions(+), 32 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild |
| 20 |
index 5a64a0e6f18..79e5eb6b91b 100644 |
| 21 |
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild |
| 22 |
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.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} pypy3 ) |
| 28 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 29 |
+ |
| 30 |
+PYTHON_COMPAT=( python3_{8..10} pypy3 ) |
| 31 |
|
| 32 |
SCM="" |
| 33 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 34 |
@@ -24,27 +24,18 @@ fi |
| 35 |
|
| 36 |
LICENSE="BSD" |
| 37 |
SLOT="0" |
| 38 |
-IUSE="test" |
| 39 |
-RESTRICT="!test? ( test )" |
| 40 |
|
| 41 |
RDEPEND=" |
| 42 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 43 |
dev-python/docutils[${PYTHON_USEDEP}] |
| 44 |
dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 45 |
dev-python/pyparsing[${PYTHON_USEDEP}] |
| 46 |
-" |
| 47 |
+ !<dev-util/catkin-0.7.14" |
| 48 |
BDEPEND=" |
| 49 |
- test? ( |
| 50 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 51 |
- ) |
| 52 |
-" |
| 53 |
-DEPEND="${RDEPEND} ${BDEPEND} |
| 54 |
test? ( |
| 55 |
dev-python/flake8[${PYTHON_USEDEP}] |
| 56 |
dev-python/mock[${PYTHON_USEDEP}] |
| 57 |
)" |
| 58 |
-RDEPEND="${RDEPEND} |
| 59 |
- !<dev-util/catkin-0.7.14" |
| 60 |
+ |
| 61 |
PATCHES=( |
| 62 |
"${FILESDIR}/catkin_prefix2.patch" |
| 63 |
"${FILESDIR}/ros_packages.patch" |
| 64 |
@@ -52,6 +43,4 @@ PATCHES=( |
| 65 |
"${FILESDIR}/summary_single_line.patch" |
| 66 |
) |
| 67 |
|
| 68 |
-python_test() { |
| 69 |
- nosetests -s --tests test || die |
| 70 |
-} |
| 71 |
+distutils_enable_tests nose |
| 72 |
|
| 73 |
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 74 |
index 5a64a0e6f18..79e5eb6b91b 100644 |
| 75 |
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 76 |
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 77 |
@@ -2,8 +2,8 @@ |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=7 |
| 81 |
-PYTHON_COMPAT=( python{3_7,3_8,3_9} pypy3 ) |
| 82 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 83 |
+ |
| 84 |
+PYTHON_COMPAT=( python3_{8..10} pypy3 ) |
| 85 |
|
| 86 |
SCM="" |
| 87 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 88 |
@@ -24,27 +24,18 @@ fi |
| 89 |
|
| 90 |
LICENSE="BSD" |
| 91 |
SLOT="0" |
| 92 |
-IUSE="test" |
| 93 |
-RESTRICT="!test? ( test )" |
| 94 |
|
| 95 |
RDEPEND=" |
| 96 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 97 |
dev-python/docutils[${PYTHON_USEDEP}] |
| 98 |
dev-python/python-dateutil[${PYTHON_USEDEP}] |
| 99 |
dev-python/pyparsing[${PYTHON_USEDEP}] |
| 100 |
-" |
| 101 |
+ !<dev-util/catkin-0.7.14" |
| 102 |
BDEPEND=" |
| 103 |
- test? ( |
| 104 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 105 |
- ) |
| 106 |
-" |
| 107 |
-DEPEND="${RDEPEND} ${BDEPEND} |
| 108 |
test? ( |
| 109 |
dev-python/flake8[${PYTHON_USEDEP}] |
| 110 |
dev-python/mock[${PYTHON_USEDEP}] |
| 111 |
)" |
| 112 |
-RDEPEND="${RDEPEND} |
| 113 |
- !<dev-util/catkin-0.7.14" |
| 114 |
+ |
| 115 |
PATCHES=( |
| 116 |
"${FILESDIR}/catkin_prefix2.patch" |
| 117 |
"${FILESDIR}/ros_packages.patch" |
| 118 |
@@ -52,6 +43,4 @@ PATCHES=( |
| 119 |
"${FILESDIR}/summary_single_line.patch" |
| 120 |
) |
| 121 |
|
| 122 |
-python_test() { |
| 123 |
- nosetests -s --tests test || die |
| 124 |
-} |
| 125 |
+distutils_enable_tests nose |
Archives