diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 76b4e19..6369154 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 4 22:23:27 UTC 2023 - Dirk Müller + +- add setuptools-68.patch to fix tests with newer setuptools + ------------------------------------------------------------------- Wed May 10 23:05:26 UTC 2023 - Ben Greiner diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 1dd3b8f..f0db5d9 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -33,6 +33,8 @@ 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-FIX-UPSTREAM: https://github.com/pypa/setuptools_scm/pull/867 +Patch1: setuptools-68.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module packaging >= 20.0} BuildRequires: %{python_module pip} diff --git a/setuptools-68.patch b/setuptools-68.patch new file mode 100644 index 0000000..5eb8754 --- /dev/null +++ b/setuptools-68.patch @@ -0,0 +1,34 @@ +From acb8a720bd6a74152bcd34401552221cc63e3817 Mon Sep 17 00:00:00 2001 +From: Stanislav Levin +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 +--- + 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]" + ), + } +