diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index f3034ce..e6cdd2d 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 5 15:56:43 UTC 2024 - Ben Greiner + +- 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 diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 11f06be..30f85e3 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,13 +33,12 @@ Summary: Python setuptools handler for SCM tags License: MIT URL: https://github.com/pypa/setuptools_scm 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 build} -BuildRequires: %{python_module packaging >= 20.0} BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools >= 45} -BuildRequires: %{python_module tomli >= 1} -BuildRequires: %{python_module typing-extensions} +BuildRequires: %{python_module setuptools >= 61} +BuildRequires: %{python_module tomli if %python-base < 3.11} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -52,9 +51,9 @@ Requires: python-tomli >= 1 BuildArch: noarch %if %{with test} # Testing requirements +BuildRequires: %{python_module build} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools_scm = %{version}} -BuildRequires: %{python_module virtualenv > 20} BuildRequires: git-core BuildRequires: mercurial %endif @@ -83,9 +82,7 @@ in SCM metadata. It also handles file finders for the supperted SCMs. %check # pip download needs network donttest="test_pip_download" -# tested file not installed into sitelib. Yes the test is named that way. -donttest+=" or test_git_archhival_from_unfiltered" -%pytest -k "not ($donttest)" +%pytest -rsEf -k "not ($donttest)" %endif %if !%{with test} diff --git a/setuptools-scm-issue953-nowarn.patch b/setuptools-scm-issue953-nowarn.patch new file mode 100644 index 0000000..b3b5df8 --- /dev/null +++ b/setuptools-scm-issue953-nowarn.patch @@ -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)