From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 25 Mar 2020 11:13:57 +0000 (+0100)
Subject: dev-python/paho-mqtt: Run pytest directly
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4bea3aea63fa191fa77e4ca95de03a7dd4ba1f4e;p=gentoo.git

dev-python/paho-mqtt: Run pytest directly

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
index d37ae460afc2..59c911774320 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
@@ -9,29 +9,24 @@ inherit distutils-r1
 DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
 HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
 SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/paho.mqtt.python-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
 
 RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	) "
 
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
 RESTRICT="test" #659106
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-1.3.1-strip-test-dependency.patch"
 	default
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
index c85da6521637..b72e1c3b5b97 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
@@ -9,29 +9,23 @@ inherit distutils-r1
 DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
 HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
 SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/paho.mqtt.python-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	) "
 
-S="${WORKDIR}/paho.mqtt.python-${PV}"
+distutils_enable_tests pytest
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
 	default
 }
-
-python_test() {
-	esetup.py test
-}