commit: 86afcdf9222f5f3f32398c12777aba22f192054b Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Mon Nov 25 08:06:33 2019 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Mon Nov 25 08:06:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86afcdf9
dev-python/path-py: fix setuptools_scm removal Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-python/path-py/path-py-11.0.1.ebuild | 2 ++ dev-python/path-py/path-py-11.5.2.ebuild | 5 ++++- dev-python/path-py/path-py-12.0.2.ebuild | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-python/path-py/path-py-11.0.1.ebuild b/dev-python/path-py/path-py-11.0.1.ebuild index 5b22dbd06d9..2fc056a01db 100644 --- a/dev-python/path-py/path-py-11.0.1.ebuild +++ b/dev-python/path-py/path-py-11.0.1.ebuild @@ -31,6 +31,8 @@ S="${WORKDIR}/${MY_P}" python_prepare_all() { sed '/setuptools_scm/d' -i setup.py || die + sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ + setup.cfg || die # disable flake8 tests sed -i 's/ --flake8//' pytest.ini || die diff --git a/dev-python/path-py/path-py-11.5.2.ebuild b/dev-python/path-py/path-py-11.5.2.ebuild index 5955abedeba..2f33ff1c53d 100644 --- a/dev-python/path-py/path-py-11.5.2.ebuild +++ b/dev-python/path-py/path-py-11.5.2.ebuild @@ -35,7 +35,10 @@ S="${WORKDIR}/${MY_P}" distutils_enable_tests pytest python_prepare_all() { - sed -i "s:use_scm_version=True:version='${PV}',name='path.py':" setup.py || die + # avoid a setuptools_scm dependency + sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die + sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ + setup.cfg || die # disable flake8 tests sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \ diff --git a/dev-python/path-py/path-py-12.0.2.ebuild b/dev-python/path-py/path-py-12.0.2.ebuild index 814045bbf80..29d047d7cb6 100644 --- a/dev-python/path-py/path-py-12.0.2.ebuild +++ b/dev-python/path-py/path-py-12.0.2.ebuild @@ -35,7 +35,10 @@ S="${WORKDIR}/${MY_P}" distutils_enable_tests pytest python_prepare_all() { - sed -i "s:use_scm_version=True:version='${PV}',name='path.py':" setup.py || die + # avoid a setuptools_scm dependency + sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die + sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ + setup.cfg || die # disable flake8 tests sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \