From a28fd8f2f04a9f672d7ba3543d66a191fe914e7b Mon Sep 17 00:00:00 2001
From: Arthur Zamarin <arthurzam@gentoo.org>
Date: Thu, 16 Sep 2021 14:35:48 +0300
Subject: [PATCH] dev-python/rosdistro: enable py3.10, use d_e_t

passes tests

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---
 dev-python/rosdistro/rosdistro-0.8.3.ebuild | 18 +++++-------------
 dev-python/rosdistro/rosdistro-9999.ebuild  | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/dev-python/rosdistro/rosdistro-0.8.3.ebuild b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
index 8bd21ec57713a..87bc969239f4b 100644
--- a/dev-python/rosdistro/rosdistro-0.8.3.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
@@ -24,31 +25,22 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
 
+distutils_enable_tests nose
+
 src_prepare() {
 	# Requires network access
 	rm -f test/test_manifest_providers.py
 	default
 }
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index 8bd21ec57713a..87bc969239f4b 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
@@ -24,31 +25,22 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
 
+distutils_enable_tests nose
+
 src_prepare() {
 	# Requires network access
 	rm -f test/test_manifest_providers.py
 	default
 }
-
-python_test() {
-	nosetests --with-xunit test || die
-}