Stop depending on setuptools_scm_git_archive

Signed-off-by: Nikola Forró <[email protected]>
packit · Sep 26, 2023 · 050e5b1 · 050e5b1
1 parent cdd5313
commit 050e5b1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.git_archival.txt b/.git_archival.txt
@@ -1 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true)$
 ref-names: $Format:%D$
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
-# Needed for setuptools-scm-git-archive
+# Needed for setuptools-scm
 .git_archival.txt  export-subst
diff --git a/epel8/python-specfile.spec b/epel8/python-specfile.spec
@@ -17,7 +17,7 @@ Source0:        %{pypi_source specfile}
 BuildArch:      noarch
 
 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  %{py3_dist setuptools setuptools-scm setuptools-scm-git-archive}
+BuildRequires:  %{py3_dist setuptools setuptools-scm}
 BuildRequires:  %{py3_dist importlib-metadata dataclasses rpm typing-extensions}
 BuildRequires:  %{py3_dist flexmock pytest}
 BuildRequires:  git-core

diff --git a/fedora/python-specfile.spec b/fedora/python-specfile.spec
@@ -41,6 +41,10 @@ Summary:        %{summary}
 %prep
 %autosetup -p1 -n specfile-%{version}
 
+# since we are building from PyPI source, we don't need git-archive
+# support in setuptools_scm
+sed -i 's/setuptools_scm[toml]>=7/setuptools_scm[toml]/' pyproject.toml
+
 
 %generate_buildrequires
 %pyproject_buildrequires %{?with_tests: -x testing}

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,7 @@
 [build-system]
 requires = [
     "setuptools>=45",
-    "setuptools_scm[toml]",
-    "setuptools_scm_git_archive",
+    "setuptools_scm[toml]>=7",
 ]
 build-backend = "setuptools.build_meta"