| 1 |
commit: 86afcdf9222f5f3f32398c12777aba22f192054b |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Mon Nov 25 08:06:33 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 25 08:06:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86afcdf9 |
| 7 |
|
| 8 |
dev-python/path-py: 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/path-py/path-py-11.0.1.ebuild | 2 ++ |
| 15 |
dev-python/path-py/path-py-11.5.2.ebuild | 5 ++++- |
| 16 |
dev-python/path-py/path-py-12.0.2.ebuild | 5 ++++- |
| 17 |
3 files changed, 10 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/path-py/path-py-11.0.1.ebuild b/dev-python/path-py/path-py-11.0.1.ebuild |
| 20 |
index 5b22dbd06d9..2fc056a01db 100644 |
| 21 |
--- a/dev-python/path-py/path-py-11.0.1.ebuild |
| 22 |
+++ b/dev-python/path-py/path-py-11.0.1.ebuild |
| 23 |
@@ -31,6 +31,8 @@ S="${WORKDIR}/${MY_P}" |
| 24 |
|
| 25 |
python_prepare_all() { |
| 26 |
sed '/setuptools_scm/d' -i setup.py || die |
| 27 |
+ sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ |
| 28 |
+ setup.cfg || die |
| 29 |
|
| 30 |
# disable flake8 tests |
| 31 |
sed -i 's/ --flake8//' pytest.ini || die |
| 32 |
|
| 33 |
diff --git a/dev-python/path-py/path-py-11.5.2.ebuild b/dev-python/path-py/path-py-11.5.2.ebuild |
| 34 |
index 5955abedeba..2f33ff1c53d 100644 |
| 35 |
--- a/dev-python/path-py/path-py-11.5.2.ebuild |
| 36 |
+++ b/dev-python/path-py/path-py-11.5.2.ebuild |
| 37 |
@@ -35,7 +35,10 @@ S="${WORKDIR}/${MY_P}" |
| 38 |
distutils_enable_tests pytest |
| 39 |
|
| 40 |
python_prepare_all() { |
| 41 |
- sed -i "s:use_scm_version=True:version='${PV}',name='path.py':" setup.py || die |
| 42 |
+ # avoid a setuptools_scm dependency |
| 43 |
+ sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die |
| 44 |
+ sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ |
| 45 |
+ setup.cfg || die |
| 46 |
|
| 47 |
# disable flake8 tests |
| 48 |
sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \ |
| 49 |
|
| 50 |
diff --git a/dev-python/path-py/path-py-12.0.2.ebuild b/dev-python/path-py/path-py-12.0.2.ebuild |
| 51 |
index 814045bbf80..29d047d7cb6 100644 |
| 52 |
--- a/dev-python/path-py/path-py-12.0.2.ebuild |
| 53 |
+++ b/dev-python/path-py/path-py-12.0.2.ebuild |
| 54 |
@@ -35,7 +35,10 @@ S="${WORKDIR}/${MY_P}" |
| 55 |
distutils_enable_tests pytest |
| 56 |
|
| 57 |
python_prepare_all() { |
| 58 |
- sed -i "s:use_scm_version=True:version='${PV}',name='path.py':" setup.py || die |
| 59 |
+ # avoid a setuptools_scm dependency |
| 60 |
+ sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die |
| 61 |
+ sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \ |
| 62 |
+ setup.cfg || die |
| 63 |
|
| 64 |
# disable flake8 tests |
| 65 |
sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' \ |
Archives