Update to 7.0.5

Resolves: rhbz#2106018
This commit is contained in:
Charalampos Stratakis 2022-08-06 04:46:59 +02:00
parent 912090dfa0
commit 6329bea968
3 changed files with 38 additions and 3 deletions

View File

@ -0,0 +1,27 @@
diff --git a/testing/test_git.py b/testing/test_git.py
index 52384424..321d6585 100644
--- a/testing/test_git.py
+++ b/testing/test_git.py
@@ -24,7 +24,6 @@
from setuptools_scm import NonNormalizedVersion
from setuptools_scm.file_finder_git import git_find_files
from setuptools_scm.git import archival_to_version
-from setuptools_scm.utils import data_from_mime
from setuptools_scm.utils import do
from setuptools_scm.utils import has_command
@@ -546,12 +545,9 @@ def test_git_archival_node_missing_no_version() -> None:
assert version is None
-def test_git_archhival_from_unfiltered() -> None:
+def test_git_archival_from_unfiltered() -> None:
config = Configuration()
- import setuptools_scm
-
- data = data_from_mime(Path(setuptools_scm.__file__).parent / ".git_archival.txt")
with pytest.warns(UserWarning, match="unexported git archival found"):
- version = archival_to_version(data, config=config)
+ version = archival_to_version({"node": "$Format:%H$"}, config=config)
assert version is None

View File

@ -1,14 +1,18 @@
%bcond_without tests %bcond_without tests
Name: python-setuptools_scm Name: python-setuptools_scm
Version: 7.0.4 Version: 7.0.5
Release: 2%{?dist} Release: 1%{?dist}
Summary: Blessed package to manage your versions by SCM tags Summary: Blessed package to manage your versions by SCM tags
License: MIT License: MIT
URL: https://pypi.python.org/pypi/setuptools_scm URL: https://pypi.python.org/pypi/setuptools_scm
Source0: %{pypi_source setuptools_scm} Source0: %{pypi_source setuptools_scm}
# Fix test_git_archhival_from_unfiltered assumptions
# Resolved upstream: https://github.com/pypa/setuptools_scm/pull/757
Patch0: fix-test-assumptions.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
@ -68,6 +72,10 @@ It also handles file finders for the supported SCMs.
%changelog %changelog
* Sat Aug 06 2022 Charalampos Stratakis <cstratak@redhat.com> - 7.0.5-1
- Update to 7.0.5
Resolves: rhbz#2106018
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.4-2 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (setuptools_scm-7.0.4.tar.gz) = cdd1f36fab5b0fa9c1f3dc42c57ee732fbc7b39e761b2db3047c9e953ddc28dd6bbc29b44451e77f602c4ea39469af86a7b08d2d6ab1513b938193e000c3c04e SHA512 (setuptools_scm-7.0.5.tar.gz) = 5b3420f0aaa0dd1655afb0fdcedc3738b75dbb9d8205e0ad67555c251d330a0d3620a7297cfdcfabbc7386a8acf43fe73fa7f3b17e2d156495fd8b2ab7d1c985