Fix test compatibility with setuptools_scm 7

This commit is contained in:
Benjamin A. Beasley 2022-06-30 09:12:23 -04:00
parent bc5d81080e
commit f7b1f19515
2 changed files with 61 additions and 1 deletions

50
9.patch Normal file
View File

@ -0,0 +1,50 @@
From 22af1c13f637587c0182b3363e98d15f7e150eb7 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Thu, 30 Jun 2022 14:05:02 +0200
Subject: [PATCH] Fix test compatibility with setuptools_scm 7
---
hatch.toml | 1 +
tests/test_build.py | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/hatch.toml b/hatch.toml
index 269801a..22c9f86 100644
--- a/hatch.toml
+++ b/hatch.toml
@@ -1,5 +1,6 @@
[envs.default]
dependencies = [
+ "importlib-metadata",
"pytest",
"pytest-cov",
]
diff --git a/tests/test_build.py b/tests/test_build.py
index 2d719a9..a4f88fd 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -6,9 +6,12 @@
import zipfile
import pytest
+from importlib_metadata import version
from .utils import build_project, read_file
+setuptools_scm_major = int(version("setuptools_scm").split(".")[0])
+
def test_basic(new_project_basic):
build_project('-t', 'wheel')
@@ -75,7 +78,10 @@ def test_write(new_project_write):
assert os.path.isfile(version_file)
lines = read_file(version_file).splitlines()
- assert lines[3] == "version = '1.2.3'"
+ if setuptools_scm_major < 7:
+ assert lines[3] == "version = '1.2.3'"
+ else:
+ assert lines[3] == "__version__ = version = '1.2.3'"
@pytest.mark.skipif(sys.version_info[0] == 2, reason='Depends on fix in 6.4.0 which is Python 3-only')

View File

@ -18,12 +18,22 @@ Source0: %{pypi_source hatch_vcs}
BuildArch: noarch
# Fix test compatibility with setuptools_scm 7
# https://github.com/ofek/hatch-vcs/pull/9
#
# Fixes:
#
# Compatibility with setuptools_scm 7
# https://github.com/ofek/hatch-vcs/issues/8
Patch: %{url}/pull/9.patch
BuildRequires: python3-devel
# RHBZ#1985340, RHBZ#2076994
BuildRequires: pyproject-rpm-macros >= 1.2.0
%if %{with tests}
BuildRequires: python3dist(pytest)
BuildRequires: python3dist(importlib-metadata)
BuildRequires: git-core
%endif
@ -43,7 +53,7 @@ Summary: %{summary}
%prep
%autosetup -n hatch_vcs-%{version}
%autosetup -n hatch_vcs-%{version} -p1
%generate_buildrequires