Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-hatch_vcs for
openSUSE:Factory checked in at 2023-05-19 11:55:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-hatch_vcs (Old)
and /work/SRC/openSUSE:Factory/.python-hatch_vcs.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-hatch_vcs"
Fri May 19 11:55:28 2023 rev:8 rq:1087535 version:0.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-hatch_vcs/python-hatch_vcs.changes
2023-04-22 21:58:16.508432545 +0200
+++
/work/SRC/openSUSE:Factory/.python-hatch_vcs.new.1533/python-hatch_vcs.changes
2023-05-19 11:56:00.971433000 +0200
@@ -1,0 +2,5 @@
+Wed May 17 09:12:25 UTC 2023 - Dirk Müller <[email protected]>
+
+- add setuptools7x-tests.patch to fix tests with newer setuptools
+
+-------------------------------------------------------------------
New:
----
setuptools7x-tests.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-hatch_vcs.spec ++++++
--- /var/tmp/diff_new_pack.d82S8i/_old 2023-05-19 11:56:01.467435836 +0200
+++ /var/tmp/diff_new_pack.d82S8i/_new 2023-05-19 11:56:01.471435859 +0200
@@ -32,6 +32,7 @@
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
@@ -57,7 +58,7 @@
This provides a plugin for Hatch that uses your preferred version control
system (like Git) to determine project versions.
%prep
-%autosetup -n hatch_vcs-%{version}
+%autosetup -p1 -n hatch_vcs-%{version}
%build
%pyproject_wheel
++++++ setuptools7x-tests.patch ++++++
>From 47364faf5563df0eaa631ed10383817762c6b547 Mon Sep 17 00:00:00 2001
From: Ben Beasley <[email protected]>
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')