From c889eaf712d1ce85a1dd20f3e2f02df608fc81d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Sun, 18 Dec 2022 15:10:54 +0100
Subject: [PATCH] Update to 7.1.0

---
 fix-test-assumptions.patch | 27 ---------------------------
 python-setuptools_scm.spec | 10 +++++-----
 sources                    |  2 +-
 3 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 fix-test-assumptions.patch

diff --git a/fix-test-assumptions.patch b/fix-test-assumptions.patch
deleted file mode 100644
index 070147b..0000000
--- a/fix-test-assumptions.patch
+++ /dev/null
@@ -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
diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec
index 3f0b720..1e01614 100644
--- a/python-setuptools_scm.spec
+++ b/python-setuptools_scm.spec
@@ -1,7 +1,7 @@
 %bcond_without tests
 
 Name:           python-setuptools_scm
-Version:        7.0.5
+Version:        7.1.0
 Release:        1%{?dist}
 Summary:        Blessed package to manage your versions by SCM tags
 
@@ -9,10 +9,6 @@ License:        MIT
 URL:            https://pypi.python.org/pypi/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
 
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -72,6 +68,10 @@ It also handles file finders for the supported SCMs.
 
 
 %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
 - Update to 7.0.5
 Resolves: rhbz#2106018
diff --git a/sources b/sources
index 9f0f8ad..26da367 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setuptools_scm-7.0.5.tar.gz) = 5b3420f0aaa0dd1655afb0fdcedc3738b75dbb9d8205e0ad67555c251d330a0d3620a7297cfdcfabbc7386a8acf43fe73fa7f3b17e2d156495fd8b2ab7d1c985
+SHA512 (setuptools_scm-7.1.0.tar.gz) = bd7260672c213db6b8c5842dbb6ac69e69ce040777865c935033971f65d905bd8e6b54e174190a924e452c302e69d4c1de231cbc8f603176ba013a739840dad3