From c4e5193e9a2782696cae7e455544dc353d7795fc1a3baf84b29062b67525ac43 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Thu, 22 Dec 2022 10:34:09 +0000 Subject: [PATCH] Accepting request 1044125 from home:bnavigator:branches:devel:languages:python - Fix build requirements and version metadata OBS-URL: https://build.opensuse.org/request/show/1044125 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-branca?expand=0&rev=16 --- python-branca.changes | 5 +++++ python-branca.spec | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/python-branca.changes b/python-branca.changes index 3a26f50..c2be2a5 100644 --- a/python-branca.changes +++ b/python-branca.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 21 21:59:34 UTC 2022 - Ben Greiner + +- Fix build requirements and version metadata + ------------------------------------------------------------------- Fri Dec 2 00:53:30 UTC 2022 - Yogalakshmi Arunachalam diff --git a/python-branca.spec b/python-branca.spec index 3c47390..efd0d38 100644 --- a/python-branca.spec +++ b/python-branca.spec @@ -16,8 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-branca Version: 0.6.0 Release: 0 @@ -25,9 +23,13 @@ Summary: HTML+JS page generator License: MIT Group: Development/Languages/Python URL: https://github.com/python-visualization/branca +# Only the Github archive has the tests. Requires manually setting the version for setuptools_scm below Source: https://github.com/python-visualization/branca/archive/v%{version}.tar.gz#/branca-%{version}.tar.gz -BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools >= 41.2} +BuildRequires: %{python_module setuptools_scm} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Jinja2 @@ -48,19 +50,21 @@ Generate HTML+JS pages with Python. %setup -q -n branca-%{version} %build -%python_build +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check # test_rendering_utf8_iframe and test_rendering_figure_notebook require geckodriver -%pytest -k 'not (test_rendering_utf8_iframe or test_rendering_figure_notebook)' -v +%pytest -k 'not (test_rendering_utf8_iframe or test_rendering_figure_notebook)' %files %{python_files} %doc CHANGES.txt README.md %license LICENSE.txt -%{python_sitelib}/* +%{python_sitelib}/branca +%{python_sitelib}/branca-%{version}.dist-info %changelog