From 84db3e5339903b6585a2c43f8b63619d477dff880d260444488c3bdd40bfa1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 11:32:46 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-hatch_vcs revision 67e321fd43861cb556af2848029aec94 --- hatch_vcs-0.3.0.tar.gz | 3 --- hatch_vcs-0.4.0.tar.gz | 3 +++ python-hatch_vcs.changes | 12 ++++++++++++ python-hatch_vcs.spec | 3 +-- setuptools7x-tests.patch | 29 ----------------------------- 5 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 hatch_vcs-0.3.0.tar.gz create mode 100644 hatch_vcs-0.4.0.tar.gz delete mode 100644 setuptools7x-tests.patch diff --git a/hatch_vcs-0.3.0.tar.gz b/hatch_vcs-0.3.0.tar.gz deleted file mode 100644 index 49feed6..0000000 --- a/hatch_vcs-0.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee -size 10172 diff --git a/hatch_vcs-0.4.0.tar.gz b/hatch_vcs-0.4.0.tar.gz new file mode 100644 index 0000000..20f6b36 --- /dev/null +++ b/hatch_vcs-0.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:093810748fe01db0d451fabcf2c1ac2688caefd232d4ede967090b1c1b07d9f7 +size 10917 diff --git a/python-hatch_vcs.changes b/python-hatch_vcs.changes index 24a2d3b..deaf543 100644 --- a/python-hatch_vcs.changes +++ b/python-hatch_vcs.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Nov 6 06:33:44 UTC 2023 - Johannes Kastl + +- 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 diff --git a/python-hatch_vcs.spec b/python-hatch_vcs.spec index 75e033c..1d4de19 100644 --- a/python-hatch_vcs.spec +++ b/python-hatch_vcs.spec @@ -26,13 +26,12 @@ %endif %{?sle15_python_module_pythons} Name: python-hatch_vcs%{psuffix} -Version: 0.3.0 +Version: 0.4.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 diff --git a/setuptools7x-tests.patch b/setuptools7x-tests.patch deleted file mode 100644 index 7fb238e..0000000 --- a/setuptools7x-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -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')