Fix setuptools_scm 7.1.0 test incomampatibility

This commit is contained in:
wu-leilei 2023-09-01 14:45:01 +08:00
parent 7ccd3a4088
commit 7d7cbf01bf
2 changed files with 39 additions and 2 deletions

View File

@ -0,0 +1,34 @@
From dc54e798d83d513c8a3aefee4970c9389497ebf9 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 19 Dec 2022 20:20:11 -0500
Subject: [PATCH] Work with setuptools_scm 7.1 (fix #25)
Reference: https://github.com/ofek/hatch-vcs/pull/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')
--
2.27.0

View File

@ -1,12 +1,12 @@
Name: python-hatch-vcs
Version: 0.3.0
Release: 1
Release: 2
Summary: Hatch plugin for versioning with your preferred VCS
License: MIT
URL: https://pypi.org/project/hatch-vcs
Source0: https://files.pythonhosted.org/packages/04/33/b68d68e532392d938472d16a03e4ce0ccd749ea31b42d18f8baa6547cbfd/hatch_vcs-0.3.0.tar.gz
Patch0: Fix-setuptools_scm-7.1.0-test-incompatible.patch
BuildArch: noarch
BuildRequires: python3-devel python3-pip python3-hatchling
@ -45,5 +45,8 @@ Summary: %{summary}
%{python3_sitelib}/hatch_vcs-%{version}*-info
%changelog
* Fri Sep 01 2023 wulei <wu_lei@hoperun.com> - 0.3.0-2
- Fix setuptools_scm 7.1.0 test incompatible
* Thu Apr 13 2023 caodongxia <caodongxia@h-partners.com> - 0.3.0-1
- Package init