Accepting request 1055958 from home:bnavigator:branches:devel:languages:python:numeric
- Remove pyproject.toml tool.pylint entries not relevant for us and failing old py3.6 pip in 15.X - Old setuptools_scm in 15.X does not pull in toml automatically OBS-URL: https://build.opensuse.org/request/show/1055958 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-scikit-build?expand=0&rev=28
This commit is contained in:
parent
a4badf8d8e
commit
0f666e3967
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 4 16:30:24 UTC 2023 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
- Remove pyproject.toml tool.pylint entries not relevant for us and
|
||||||
|
failing old py3.6 pip in 15.X
|
||||||
|
- Old setuptools_scm in 15.X does not pull in toml automatically
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 21 22:23:44 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
Wed Dec 21 22:23:44 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file
|
# spec file
|
||||||
#
|
#
|
||||||
# Copyright (c) 2022 SUSE LLC
|
# Copyright (c) 2023 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -41,6 +41,9 @@ BuildRequires: %{python_module wheel}
|
|||||||
%if !%{with test}
|
%if !%{with test}
|
||||||
# https://github.com/scikit-build/scikit-build/issues/689
|
# https://github.com/scikit-build/scikit-build/issues/689
|
||||||
BuildRequires: %{python_module setuptools_scm}
|
BuildRequires: %{python_module setuptools_scm}
|
||||||
|
%if 0%{?suse_version} < 1550
|
||||||
|
BuildRequires: %{python_module toml}
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
@ -86,6 +89,8 @@ cp %{S:99} tests/samples/issue-274-support-default-package-dir/setup.cfg
|
|||||||
cp %{S:99} tests/samples/issue-274-support-one-package-without-package-dir/setup.cfg
|
cp %{S:99} tests/samples/issue-274-support-one-package-without-package-dir/setup.cfg
|
||||||
cp %{S:99} tests/samples/issue-334-configure-cmakelist-non-cp1252-encoding/setup.cfg
|
cp %{S:99} tests/samples/issue-334-configure-cmakelist-non-cp1252-encoding/setup.cfg
|
||||||
%endif
|
%endif
|
||||||
|
# remove toml entries not relevant for us and failing old py3.6 pip in 15.X
|
||||||
|
sed -i '/tool.pylint/,/^$/ d' pyproject.toml
|
||||||
|
|
||||||
%if !%{with test}
|
%if !%{with test}
|
||||||
%build
|
%build
|
||||||
@ -108,7 +113,7 @@ donttest="test_pep518"
|
|||||||
%doc AUTHORS.rst README.rst CONTRIBUTING.rst HISTORY.rst docs/
|
%doc AUTHORS.rst README.rst CONTRIBUTING.rst HISTORY.rst docs/
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{python_sitelib}/skbuild
|
%{python_sitelib}/skbuild
|
||||||
%{python_sitelib}/scikit_build-%{version}*-info
|
%{python_sitelib}/scikit_build-%{version}.dist-info
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user