commit: 59fb85ef4034ce8f0689997141764173ab2e121b Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Fri Feb 23 19:53:25 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Fri Feb 23 19:53:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fb85ef
sci-geosciences/folium: fix version Closes: https://bugs.gentoo.org/923313 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> sci-geosciences/folium/files/folium-0.12.1-scm.patch | 12 ------------ sci-geosciences/folium/folium-0.15.1-r2.ebuild | 6 ++++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sci-geosciences/folium/files/folium-0.12.1-scm.patch b/sci-geosciences/folium/files/folium-0.12.1-scm.patch deleted file mode 100644 index 78992bafa059..000000000000 --- a/sci-geosciences/folium/files/folium-0.12.1-scm.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py 2021-07-30 23:29:57.320896714 +0200 -+++ b/setup.py 2021-07-30 23:30:05.608787963 +0200 -@@ -89,9 +89,4 @@ - extras_require={"testing": ["pytest"]}, - install_requires=install_requires, - zip_safe=False, -- use_scm_version={ -- "write_to": "folium/_version.py", -- "write_to_template": '__version__ = "{version}"', -- "tag_regex": r"^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$", -- }, - ) diff --git a/sci-geosciences/folium/folium-0.15.1-r2.ebuild b/sci-geosciences/folium/folium-0.15.1-r2.ebuild index 22eaed0b7b88..43b520782e7b 100644 --- a/sci-geosciences/folium/folium-0.15.1-r2.ebuild +++ b/sci-geosciences/folium/folium-0.15.1-r2.ebuild @@ -5,6 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} inherit distutils-r1 DESCRIPTION="Python Data, Leaflet.js Maps" @@ -16,7 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" PATCHES=( - "${FILESDIR}"/${PN}-0.12.1-scm.patch "${FILESDIR}"/${P}-gentoo.patch ) @@ -25,7 +25,9 @@ RDEPEND="sci-geosciences/xyzservices[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/setuptools-scm test? ( dev-python/pillow[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}]
