From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1089961-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id AA4B6138334
	for <garchives@archives.gentoo.org>; Mon, 13 May 2019 20:25:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7D3EFE07C9;
	Mon, 13 May 2019 20:25:55 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5FE75E07C9
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 May 2019 20:25:55 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 946133441C3
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 May 2019 20:25:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 042862A5
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 May 2019 20:25:52 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1557779142.f38532799d08d32df2f0f92312a6862f3e49fcdd.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools_scm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
X-VCS-Directories: dev-python/setuptools_scm/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: f38532799d08d32df2f0f92312a6862f3e49fcdd
X-VCS-Branch: master
Date: Mon, 13 May 2019 20:25:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 65ab098b-073d-467a-aa22-0a4c044d4082
X-Archives-Hash: 2b486e523b091f285ed2a95c293c83f2

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
+}