Sync from SUSE:SLFO:Main python-setuptools_scm revision 76bdf2643c4a34d7e523286cd247c7b4

python-setuptools_scm.changes

@@ -1,7 +1,77 @@
+-------------------------------------------------------------------
+Wed Aug 14 06:22:51 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- add explicit ca-certificates-mozilla for the testsuite with
+  pip 24.2
+
+-------------------------------------------------------------------
+Mon Jun 10 07:55:55 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 8.1.0:
+  * correctly handle project config overrides when the version
+    keyword is used together with pyproject.toml
+  * Reword docker usage hint
+  * Updated `entangled-cli` to account for not having `rich`
+    extra
+  * Documenting
+    `SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${NORMALIZED_DIST_NAME}`
+  * Update URL
+  * Fix misspelling found by codespell
+  * Only depend on typing_extensions for Python < 3.10
+  * fix 1018 allow non normalized semver
+- drop setuptools-scm-issue1038-git-2-45-0.patch,
+  setuptools-scm-issue953-nowarn.patch: obsolete
+
+-------------------------------------------------------------------
+Fri May  3 17:19:17 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fix tests with git 2.45.0 (boo#1223839)
+  adding setuptools-scm-issue1038-git-2-45-0.patch
+
+-------------------------------------------------------------------
+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>
+
+- update to 8.0.4:
+  * introduce scriv for changelog management
+  * reconfigure local build backend to use an attribute instead
+    of star imports from setuptools
+  * introduce ruff as a linter
+  * ensure the setuptools version keyword correctly load
+    pyproject.toml configuration
+  * add build and wheel to the test requirements for regression
+    testing
+  * move internal toml handling to own module
+  * remove legacy version parser api - config arg always required
+    turn Configuration into a dataclass
+  * require configuration to always pass into helpers
+  * hide file-finders implementation in private module
+  * renamed setuptools_scm.hacks to setuptools_scm.fallbacks and
+    drop support for pip-egg-info
+  * remove trace function and use logging instead
+  * unify `distance=None` and `distance=0` they should mean the
+    same andwhere hiding dirty states that are now explicitly
+    dirty
+  * depend on later importlib for the full selectable api
+  * move setuptools integration code to private sub-package
+  * use normalized dist names for the
+    `SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DIST_NAME}` env var
+  * drop support for python 3.7
+  * introduce `version_file` as replacement for `write_to`
+  * created a directory for the vcs-versioning package and added
+    it to pypi
+- drop setuptools-68.patch (upstream)
+
 -------------------------------------------------------------------
 Mon Sep  4 22:23:27 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
-- add setuptools-68.patch to fix tests with newer setuptools 
+- add setuptools-68.patch to fix tests with newer setuptools
 
 -------------------------------------------------------------------
 Wed May 10 23:05:26 UTC 2023 - Ben Greiner <code@bnavigator.de>
@@ -252,7 +322,7 @@ Thu Jul 18 09:21:17 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 Tue May 14 11:26:42 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
 - update to 3.3.3
-  * adding the fallback_version option, which sets the version to 
+  * adding the fallback_version option, which sets the version to
     be used when everything else fails.
   * use a specific fallback root when calling fallbacks.
   * fix python3.8 support and add builds for up to python3.8
@@ -275,7 +345,7 @@ Fri Mar  1 12:37:15 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
 
 - Update to 3.2.0:
   * adding the option git_describe_command to allow the user to control the
-    way that git describe is called. 
+    way that git describe is called.
 
 -------------------------------------------------------------------
 Thu Jan 24 15:37:06 UTC 2019 - Matěj Cepl <mcepl@suse.com>
@@ -285,7 +355,7 @@ Thu Jan 24 15:37:06 UTC 2019 - Matěj Cepl <mcepl@suse.com>
 -------------------------------------------------------------------
 Mon Sep 17 15:20:50 UTC 2018 - Ondřej Súkup <mimi.vx@gmail.com>
 
-- remove tox.ini - it breaks tests with pytest-3.8.0 
+- remove tox.ini - it breaks tests with pytest-3.8.0
 
 -------------------------------------------------------------------
 Wed Aug 29 08:02:35 UTC 2018 - tchvatal@suse.com
@@ -549,7 +619,7 @@ Mon Dec  5 20:18:07 UTC 2016 - buschmann23@opensuse.org
     Rodgers for reporting and fixing)
 - Update to 1.11.0:
   * always run tag_to_version so in order to handle prefixes on old
-    setuptools (thanks to Brian May) 
+    setuptools (thanks to Brian May)
   * drop support for python 3.2
   * extend the error message on missing scm metadata (thanks Markus
     Unterwaditzer)
@@ -564,7 +634,7 @@ v1.10.1
 * fix issue #73 - in hg pre commit merge, consider parent1 instead of failing
 
 v1.10.0
-* add support for overriding the version number via the 
+* add support for overriding the version number via the
   environment variable SETUPTOOLS_SCM_PRETEND_VERSION
 * fix isssue #63 by adding the --match parameter to the git describe call
   and prepare the possibility of passing more options to scm backends

python-setuptools_scm.spec

@@ -1,7 +1,8 @@
 #
-# spec file
+# spec file for package python-setuptools_scm
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,40 +25,34 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
-
 %{?sle15_python_module_pythons}
 Name:           python-setuptools_scm%{psuffix}
-Version:        7.1.0
+Version:        8.1.0
 Release:        0
 Summary:        Python setuptools handler for SCM tags
 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-FIX-UPSTREAM: https://github.com/pypa/setuptools_scm/pull/867
+BuildRequires:  %{python_module base >= 3.8}
-Patch1:         setuptools-68.patch
-BuildRequires:  %{python_module base >= 3.7}
-BuildRequires:  %{python_module packaging >= 20.0}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module setuptools >= 45}
+BuildRequires:  %{python_module setuptools >= 61}
-BuildRequires:  %{python_module typing-extensions}
+BuildRequires:  %{python_module tomli if %python-base < 3.11}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-packaging >= 20.0
 Requires:       python-setuptools
-Requires:       python-typing-extensions
+BuildArch:      noarch
-%if 0%{?python_version_nodots} < 38
-Requires:       python-importlib-metadata
-%endif
 %if 0%{?python_version_nodots} < 311
 Requires:       python-tomli >= 1
 %endif
-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:  %{python_module typing-extensions if %python-base < 3.11}
+BuildRequires:  ca-certificates-mozilla
 BuildRequires:  git-core
 BuildRequires:  mercurial
 %endif
@@ -86,15 +81,13 @@ 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.
+%pytest -rsEf -k "not ($donttest)"
-donttest+=" or test_git_archhival_from_unfiltered"
-%pytest -k "not ($donttest)"
 %endif
 
 %if !%{with test}
 %files %{python_files}
 %license LICENSE
-%doc README.rst CHANGELOG.rst
+%doc README.md CHANGELOG.md
 %{python_sitelib}/setuptools_scm
 %{python_sitelib}/setuptools_scm-%{version}*-info
 %endif

setuptools-68.patch

@@ -1,34 +0,0 @@
-From acb8a720bd6a74152bcd34401552221cc63e3817 Mon Sep 17 00:00:00 2001
-From: Stanislav Levin <slev@altlinux.org>
-Date: Thu, 22 Jun 2023 15:36:48 +0300
-Subject: [PATCH] tests: Specify version for test PEP621 metadata
-
-According to today's specification
-https://packaging.python.org/en/latest/specifications/declaring-project-metadata/#specification
-
-> The only keys required to be statically defined are:
-  -  name
-  The keys which are required but may be specified either
-  statically or listed as dynamic are:
-  - version
-
-Fixes: https://github.com/pypa/setuptools_scm/issues/866
-Signed-off-by: Stanislav Levin <slev@altlinux.org>
----
- testing/test_integration.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/testing/test_integration.py b/testing/test_integration.py
-index 98442724..c8bfc150 100644
---- a/testing/test_integration.py
-+++ b/testing/test_integration.py
-@@ -56,7 +56,8 @@ def test_pyproject_support(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> N
-         "[tool.setuptools_scm]\ndist_name='setuptools_scm_example'"
-     ),
-     "pyproject.project": (
--        "[project]\nname='setuptools_scm_example'\n[tool.setuptools_scm]"
-+        "[project]\nname='setuptools_scm_example'\n"
-+        "dynamic=['version']\n[tool.setuptools_scm]"
-     ),
- }
-