[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools_scm/

[Michał Górny]

commit:     0c9868af0f9dbef1169657d330c4f3f23277f166
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 06:49:33 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 06:51:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9868af

dev-python/setuptools_scm: Improve test coverage

Remove the silly logic attempting to selectively run tests based on USE
flags.  Instead, require complete dependency set and run all tests
except those we explicitly can't run because of network access.

 .../setuptools_scm/setuptools_scm-2.1.0.ebuild     | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild 
b/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
index a8abcb4338f..82df58170f3 100644
--- a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
@@ -14,31 +14,25 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="git mercurial test"
+IUSE="test"
 
 DEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]
-       git? ( dev-vcs/git )
-       mercurial? ( dev-vcs/mercurial )
-       test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+       test? (
+               dev-python/pytest[${PYTHON_USEDEP}]
+               dev-vcs/git
+               dev-vcs/mercurial )"
 
 python_prepare_all() {
        # network access
        sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+       # all fetch specific setuptools versions
+       rm testing/test_setuptools_support.py || die
 
        distutils-r1_python_prepare_all
 }
 
 python_test() {
        distutils_install_for_testing
-       py.test -v -v -x -k testing/test_basic_api.py || die "tests failed 
under ${EPYTHON}"
-       py.test -v -v -x -k testing/test_functions.py || die "tests failed 
under ${EPYTHON}"
-       py.test -v -v -x -k testing/test_main.py || die "tests failed under 
${EPYTHON}"
-       py.test -v -v -x -k testing/test_regressions.py || die "tests failed 
under ${EPYTHON}"
-       if use git; then
-               py.test -v -v -x -k testing/test_git.py || die "tests failed 
under ${EPYTHON}"
-       fi
-       if use mercurial; then
-               py.test -v -v -x -k testing/test_mercurial.py || die "tests 
failed under ${EPYTHON}"
-       fi
+       py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }