[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     380a5cbd2745ddfea53724246bf3b98976982064
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 18:44:50 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 09:36:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=380a5cbd

distutils-r1.eclass: Refactor `distutils_enable_tests pytest`

Refactor `distutils_enable_tests pytest` to move `test_pkgs` logic
straight into pytest block, as it is not used by any other variant
anymore.

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

 eclass/distutils-r1.eclass | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 44553f8da6f3..a1617999a037 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -606,16 +606,23 @@ distutils_enable_tests() {
        [[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: 
test-runner"
 
        local test_deps=${RDEPEND}
-       local test_pkgs
        case ${1} in
                pytest)
-                       test_pkgs='>=dev-python/pytest-7.4.4[${PYTHON_USEDEP}]'
+                       local 
test_pkgs='>=dev-python/pytest-7.4.4[${PYTHON_USEDEP}]'
                        if [[ -n ${EPYTEST_TIMEOUT} ]]; then
                                test_pkgs+=' 
dev-python/pytest-timeout[${PYTHON_USEDEP}]'
                        fi
                        if [[ ${EPYTEST_XDIST} ]]; then
                                test_pkgs+=' 
dev-python/pytest-xdist[${PYTHON_USEDEP}]'
                        fi
+
+                       if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+                               test_deps+=" 
${test_pkgs//'${PYTHON_USEDEP}'/${PYTHON_USEDEP}}"
+                       else
+                               test_deps+=" $(python_gen_cond_dep "
+                                       ${test_pkgs}
+                               ")"
+                       fi
                        ;;
                setup.py)
                        ;;
@@ -634,15 +641,6 @@ distutils_enable_tests() {
        _DISTUTILS_TEST_RUNNER=${1}
        python_test() { distutils-r1_python_test; }
 
-       if [[ -n ${test_pkgs} ]]; then
-               if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-                       test_deps+=" 
${test_pkgs//'${PYTHON_USEDEP}'/${PYTHON_USEDEP}}"
-               else
-                       test_deps+=" $(python_gen_cond_dep "
-                               ${test_pkgs}
-                       ")"
-               fi
-       fi
        if [[ -n ${test_deps} ]]; then
                IUSE+=" test"
                RESTRICT+=" !test? ( test )"