dev-python/path-py: fix setuptools_scm removal
authorPatrick McLean <patrick.mclean@sony.com>
Mon, 25 Nov 2019 08:06:33 +0000 (00:06 -0800)
committerPatrick McLean <chutzpah@gentoo.org>
Mon, 25 Nov 2019 08:06:33 +0000 (00:06 -0800)
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
dev-python/path-py/path-py-11.0.1.ebuild
dev-python/path-py/path-py-11.5.2.ebuild
dev-python/path-py/path-py-12.0.2.ebuild

index 5b22dbd06d9ab3d8c7c8165de91c0d7453369b43..2fc056a01db33cf5908bd6e5b3acbd64e42ffee9 100644 (file)
@@ -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
index 5955abedeba6f140e35490a2e7be810505c438de..2f33ff1c53da309eb96658994b926b5abbe02795 100644 (file)
@@ -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::' \
index 814045bbf8002018c62b2f1c062b39dc5cdc38c8..29d047d7cb6ab24898f9f8b323c58314e44cc8db 100644 (file)
@@ -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::' \