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

[Michał Górny]

commit:     f38532799d08d32df2f0f92312a6862f3e49fcdd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 20:25:10 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 13 20:25:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3853279

dev-python/setuptools_scm: Fix version conflict on upgrades

Fix loading the wrong version of setuptools_scm, effectively removing
the need for self-blocker.

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

 dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild 
b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
index 4217156ad36..bd949c207fb 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
@@ -18,7 +18,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-       !!<dev-python/setuptools_scm-3
        dev-python/setuptools[${PYTHON_USEDEP}]
        test? (
                dev-python/pytest[${PYTHON_USEDEP}]
@@ -30,11 +29,18 @@ python_prepare_all() {
        sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
        # all fetch specific setuptools versions
        rm testing/test_setuptools_support.py || die
+       # remove self-dependency
+       sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
+               -e "/__main__/i del sys.path[0]" setup.py || die
 
        distutils-r1_python_prepare_all
 }
 
 python_test() {
-       distutils_install_for_testing
+       PYTHONPATH= distutils_install_for_testing
        py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }
+
+python_install() {
+       PYTHONPATH= distutils-r1_python_install
+}