Stop depending on setuptools_scm_git_archive

Signed-off-by: Nikola Forró <[email protected]>

.git_archival.txt

@@ -1 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true)$
 ref-names: $Format:%D$

.gitattributes

@@ -1,2 +1,2 @@
-# Needed for setuptools-scm-git-archive
+# Needed for setuptools-scm
 .git_archival.txt  export-subst

fedora/python-ogr.spec

@@ -13,7 +13,6 @@ BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(setuptools)
 BuildRequires:  python3dist(setuptools-scm)
-BuildRequires:  python3dist(setuptools-scm-git-archive)
 
 %description
 One Git library to Rule!
@@ -34,6 +33,9 @@ One Git library to Rule!
 %autosetup -n %{srcname}-%{version}
 # Remove bundled egg-info
 rm -rf %{srcname}.egg-info
+# Since we are building from PyPI source, we don't need git-archive
+# support in setuptools_scm
+sed -i 's/setuptools_scm >= 7/setuptools_scm/' setup.cfg
 
 
 %build

files/tasks/install-ogr.yaml

@@ -1,6 +1,12 @@
 ---
 - name: Print the current working directory
   command: pwd
+- name: Require any version of setuptools_scm
+  lineinfile:
+    path: "{{ project_dir }}/setup.cfg"
+    regexp: '^(\s*)setuptools_scm.*'
+    line: '\1setuptools_scm'
+    backrefs: true
 - name: Install ogr from {{ project_dir }}
   pip:
     name: "{{ project_dir }}"

files/tasks/rpm-test-deps.yaml

@@ -6,7 +6,6 @@
       - python3-setuptools
       - git-core
       - python3-setuptools_scm
-      - python3-setuptools_scm_git_archive
       - python3-wheel # for bdist_wheel
       - python3-pytest
       - python3-tox

recipe.yaml

@@ -18,7 +18,6 @@
           - python3-setuptools
           - git-core
           - python3-setuptools_scm
-          - python3-setuptools_scm_git_archive
           - python3-wheel # for bdist_wheel
           - python3-pytest
           - python3-tox

setup.cfg

@@ -45,8 +45,7 @@ install_requires =
 python_requires = >=3.9
 include_package_data = True
 setup_requires =
-    setuptools_scm
-    setuptools_scm_git_archive
+    setuptools_scm >= 7
 
 [options.extras_require]
 testing =

setup.py

@@ -2,4 +2,11 @@
 
 from setuptools import setup
 
-setup(use_scm_version=True)
+# we can't use pre-release-based version scheme because it generates versions
+# that are sorted higher than the last stable release by RPM
+# for example:
+#   - pre-release (guess-next-dev):
+#       0.20.1.dev1+g0abcdef.d20230921 > 0.20.1
+#   - post-release (no-guess-dev):
+#       0.20.0.post1.dev1+g0abcdef < 0.20.1
+setup(use_scm_version={"version_scheme": "no-guess-dev"})