Accepting request 1137104 from home:bnavigator:branches:devel:languages:python
- Add setuptools-scm-issue953-nowarn.patch * gh#pypa/setuptools_scm#953 * don't warn if setuptools_scm is present but not directly used OBS-URL: https://build.opensuse.org/request/show/1137104 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=79
This commit is contained in:
parent
1fda20a7b0
commit
36be66b30a
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 5 15:56:43 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
- Add setuptools-scm-issue953-nowarn.patch
|
||||||
|
* gh#pypa/setuptools_scm#953
|
||||||
|
* don't warn if setuptools_scm is present but not directly used
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 27 11:40:15 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
Wed Dec 27 11:40:15 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file
|
# spec file
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 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
|
||||||
@ -33,13 +33,12 @@ Summary: Python setuptools handler for SCM tags
|
|||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/pypa/setuptools_scm
|
URL: https://github.com/pypa/setuptools_scm
|
||||||
Source: https://files.pythonhosted.org/packages/source/s/setuptools-scm/setuptools-scm-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/s/setuptools-scm/setuptools-scm-%{version}.tar.gz
|
||||||
|
# PATCH-FEATURE-OPENSUSE setuptools-scm-issue953-nowarn.patch gh#pypa/setuptools_scm#953 -- don't warn if setuptools_scm is present but not directly used
|
||||||
|
Patch0: setuptools-scm-issue953-nowarn.patch
|
||||||
BuildRequires: %{python_module base >= 3.8}
|
BuildRequires: %{python_module base >= 3.8}
|
||||||
BuildRequires: %{python_module build}
|
|
||||||
BuildRequires: %{python_module packaging >= 20.0}
|
|
||||||
BuildRequires: %{python_module pip}
|
BuildRequires: %{python_module pip}
|
||||||
BuildRequires: %{python_module setuptools >= 45}
|
BuildRequires: %{python_module setuptools >= 61}
|
||||||
BuildRequires: %{python_module tomli >= 1}
|
BuildRequires: %{python_module tomli if %python-base < 3.11}
|
||||||
BuildRequires: %{python_module typing-extensions}
|
|
||||||
BuildRequires: %{python_module wheel}
|
BuildRequires: %{python_module wheel}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
@ -52,9 +51,9 @@ Requires: python-tomli >= 1
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with test}
|
%if %{with test}
|
||||||
# Testing requirements
|
# Testing requirements
|
||||||
|
BuildRequires: %{python_module build}
|
||||||
BuildRequires: %{python_module pytest}
|
BuildRequires: %{python_module pytest}
|
||||||
BuildRequires: %{python_module setuptools_scm = %{version}}
|
BuildRequires: %{python_module setuptools_scm = %{version}}
|
||||||
BuildRequires: %{python_module virtualenv > 20}
|
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
BuildRequires: mercurial
|
BuildRequires: mercurial
|
||||||
%endif
|
%endif
|
||||||
@ -83,9 +82,7 @@ in SCM metadata. It also handles file finders for the supperted SCMs.
|
|||||||
%check
|
%check
|
||||||
# pip download needs network
|
# pip download needs network
|
||||||
donttest="test_pip_download"
|
donttest="test_pip_download"
|
||||||
# tested file not installed into sitelib. Yes the test is named that way.
|
%pytest -rsEf -k "not ($donttest)"
|
||||||
donttest+=" or test_git_archhival_from_unfiltered"
|
|
||||||
%pytest -k "not ($donttest)"
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if !%{with test}
|
%if !%{with test}
|
||||||
|
12
setuptools-scm-issue953-nowarn.patch
Normal file
12
setuptools-scm-issue953-nowarn.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
https://github.com/pypa/setuptools_scm/issues/953
|
||||||
|
|
||||||
|
--- setuptools-scm-8.0.4.orig/src/setuptools_scm/_integration/setuptools.py
|
||||||
|
+++ setuptools-scm-8.0.4/src/setuptools_scm/_integration/setuptools.py
|
||||||
|
@@ -116,6 +116,6 @@
|
||||||
|
try:
|
||||||
|
config = _config.Configuration.from_file(dist_name=dist_name)
|
||||||
|
except LookupError as e:
|
||||||
|
- log.warning(e)
|
||||||
|
+ log.info(e)
|
||||||
|
else:
|
||||||
|
_assign_version(dist, config)
|
Loading…
x
Reference in New Issue
Block a user