summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Zamarin <arthurzam@gentoo.org>2021-09-16 13:57:33 +0300
committerArthur Zamarin <arthurzam@gentoo.org>2021-09-23 17:04:58 +0300
commita67bc0bd6902d5f0f55fc3b94a4542866bff5567 (patch)
treefad287ae141b709b111f4ba3e8a1be9cfcac66b2 /dev-python/catkin_pkg
parentmedia-libs/harfbuzz: amd64 stable wrt bug #814377 (diff)
downloadgentoo-a67bc0bd6902d5f0f55fc3b94a4542866bff5567.tar.gz
gentoo-a67bc0bd6902d5f0f55fc3b94a4542866bff5567.tar.bz2
gentoo-a67bc0bd6902d5f0f55fc3b94a4542866bff5567.zip
dev-python/catkin_pkg: enable py3.10, use d_e_t
passes tests Closes: https://bugs.gentoo.org/812332 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-python/catkin_pkg')
-rw-r--r--dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild21
-rw-r--r--dev-python/catkin_pkg/catkin_pkg-9999.ebuild21
2 files changed, 10 insertions, 32 deletions
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
index 5a64a0e6f182..79e5eb6b91bf 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,27 +24,18 @@ fi
LICENSE="BSD"
SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
-"
+ !<dev-util/catkin-0.7.14"
BDEPEND="
test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
-DEPEND="${RDEPEND} ${BDEPEND}
- test? (
dev-python/flake8[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)"
-RDEPEND="${RDEPEND}
- !<dev-util/catkin-0.7.14"
+
PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
@@ -52,6 +43,4 @@ PATCHES=(
"${FILESDIR}/summary_single_line.patch"
)
-python_test() {
- nosetests -s --tests test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 5a64a0e6f182..79e5eb6b91bf 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,27 +24,18 @@ fi
LICENSE="BSD"
SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
-"
+ !<dev-util/catkin-0.7.14"
BDEPEND="
test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
-DEPEND="${RDEPEND} ${BDEPEND}
- test? (
dev-python/flake8[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)"
-RDEPEND="${RDEPEND}
- !<dev-util/catkin-0.7.14"
+
PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
@@ -52,6 +43,4 @@ PATCHES=(
"${FILESDIR}/summary_single_line.patch"
)
-python_test() {
- nosetests -s --tests test || die
-}
+distutils_enable_tests nose