From 7943399147ee3adf4c49cb889012921914df5b778a8751d5e13418ac1d25f5b2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 17 May 2023 09:12:41 +0000 Subject: [PATCH] - add setuptools7x-tests.patch to fix tests with newer setuptools OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-hatch_vcs?expand=0&rev=19 --- python-hatch_vcs.changes | 5 +++++ python-hatch_vcs.spec | 3 ++- setuptools7x-tests.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 setuptools7x-tests.patch diff --git a/python-hatch_vcs.changes b/python-hatch_vcs.changes index 73bba9d..24a2d3b 100644 --- a/python-hatch_vcs.changes +++ b/python-hatch_vcs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 17 09:12:25 UTC 2023 - Dirk Müller + +- add setuptools7x-tests.patch to fix tests with newer setuptools + ------------------------------------------------------------------- Fri Apr 21 12:26:09 UTC 2023 - Dirk Müller diff --git a/python-hatch_vcs.spec b/python-hatch_vcs.spec index 56fd6d5..75e033c 100644 --- a/python-hatch_vcs.spec +++ b/python-hatch_vcs.spec @@ -32,6 +32,7 @@ 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 @@ -57,7 +58,7 @@ BuildRequires: git 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 diff --git a/setuptools7x-tests.patch b/setuptools7x-tests.patch new file mode 100644 index 0000000..7fb238e --- /dev/null +++ b/setuptools7x-tests.patch @@ -0,0 +1,29 @@ +From 47364faf5563df0eaa631ed10383817762c6b547 Mon Sep 17 00:00:00 2001 +From: Ben Beasley +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')