Update to 7.1.0

This commit is contained in:
Miro Hrončok 2022-12-18 15:10:54 +01:00
parent 6329bea968
commit c889eaf712
3 changed files with 6 additions and 33 deletions

View File

@ -1,27 +0,0 @@
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,7 +1,7 @@
%bcond_without tests %bcond_without tests
Name: python-setuptools_scm Name: python-setuptools_scm
Version: 7.0.5 Version: 7.1.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Blessed package to manage your versions by SCM tags Summary: Blessed package to manage your versions by SCM tags
@ -9,10 +9,6 @@ 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
@ -72,6 +68,10 @@ It also handles file finders for the supported SCMs.
%changelog %changelog
* Sat Dec 17 2022 Miro Hrončok <mhroncok@redhat.com> - 7.1.0-1
- Update to 7.1.0
Resolves: rhbz#2154548
* Sat Aug 06 2022 Charalampos Stratakis <cstratak@redhat.com> - 7.0.5-1 * Sat Aug 06 2022 Charalampos Stratakis <cstratak@redhat.com> - 7.0.5-1
- Update to 7.0.5 - Update to 7.0.5
Resolves: rhbz#2106018 Resolves: rhbz#2106018

View File

@ -1 +1 @@
SHA512 (setuptools_scm-7.0.5.tar.gz) = 5b3420f0aaa0dd1655afb0fdcedc3738b75dbb9d8205e0ad67555c251d330a0d3620a7297cfdcfabbc7386a8acf43fe73fa7f3b17e2d156495fd8b2ab7d1c985 SHA512 (setuptools_scm-7.1.0.tar.gz) = bd7260672c213db6b8c5842dbb6ac69e69ce040777865c935033971f65d905bd8e6b54e174190a924e452c302e69d4c1de231cbc8f603176ba013a739840dad3