Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jaraco-envs/
Date: Mon, 25 Nov 2019 08:32:50
Message-Id: 1574670736.0949b444806fb05d10bdd19673d525d740bef226.chutzpah@gentoo
1 commit: 0949b444806fb05d10bdd19673d525d740bef226
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Mon Nov 25 08:32:16 2019 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 25 08:32:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0949b444
7
8 dev-python/jaraco-envs-1.0.1: fix setuptools_scm removal
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.79, Repoman-2.3.18
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild | 6 ++++--
15 1 file changed, 4 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
18 index 8c06fc55d5f..c325ff5c459 100644
19 --- a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
20 +++ b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
21 @@ -27,8 +27,10 @@ RESTRICT="test"
22 S="${WORKDIR}/${MY_P}"
23
24 python_prepare_all() {
25 - # avoid a dep on setuptools_scm
26 - sed -i "s:use_scm_version=True:version=\"${PV}\":" setup.py || die
27 + # avoid a setuptools_scm dependency
28 + sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
29 + sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
30 + setup.cfg || die
31
32 distutils-r1_python_prepare_all
33 }