Sync from SUSE:SLFO:1.1 python-hatch_vcs revision 45236c46fbdef77f533c767afe8a1ebc

python-hatch_vcs.changes

@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-Mon Nov  6 06:33:44 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
-
-- update to 0.4.0:
-  * Changed:
-    - Drop support for Python 3.7
-  * Added:
-    - Officially support Python 3.12
-  * Fixed:
-    - Prevent UserWarning when a template is not defined explicitly
-- drop patch setuptools7x-tests.patch that is included upstream
-
 -------------------------------------------------------------------
 Wed May 17 09:12:25 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-hatch_vcs.spec

@@ -26,12 +26,13 @@
 %endif
 %{?sle15_python_module_pythons}
 Name:           python-hatch_vcs%{psuffix}
-Version:        0.4.0
+Version:        0.3.0
 Release:        0
 Summary:        Hatch plugin for versioning with your preferred VCS
 License:        MIT
 URL:            https://github.com/ofek/hatch-vcs
 Source:         https://files.pythonhosted.org/packages/source/h/hatch_vcs/hatch_vcs-%{version}.tar.gz
+Patch1:         https://github.com/ofek/hatch-vcs/commit/47364faf5563df0eaa631ed10383817762c6b547.patch#/setuptools7x-tests.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros >= 20210929
 # https://github.com/ofek/hatch-vcs/issues/8

setuptools7x-tests.patch

@@ -0,0 +1,29 @@
+From 47364faf5563df0eaa631ed10383817762c6b547 Mon Sep 17 00:00:00 2001
+From: Ben Beasley <code@musicinmybrain.net>
+Date: Thu, 5 Jan 2023 18:49:54 -0500
+Subject: [PATCH] Work with setuptools_scm 7.1 (fix #25) (#26)
+
+Make test_write less brittle (see also #8, #9) so that it works with
+_version.py files generated by at least setuptools_scm 7.1, 7.0, and
+6.x.
+---
+ tests/test_build.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_build.py b/tests/test_build.py
+index 2fde601..7c76343 100644
+--- a/tests/test_build.py
++++ b/tests/test_build.py
+@@ -75,8 +75,10 @@ def test_write(new_project_write):
+     assert os.path.isfile(version_file)
+ 
+     lines = read_file(version_file).splitlines()
+-    assert lines[3].startswith(('version =', '__version__ ='))
+-    assert lines[3].endswith("version = '1.2.3'")
++    version_starts = ('version = ', '__version__ = ')
++    assert any(line.startswith(version_starts) for line in lines)
++    version_line = next(line for line in lines if line.startswith(version_starts))
++    assert version_line.endswith(" = '1.2.3'")
+ 
+ 
+ @pytest.mark.skipif(sys.version_info[0] == 2, reason='Depends on fix in 6.4.0 which is Python 3-only')