Get rid of setuptools_scm_git_archive (#290)

Get rid of setuptools_scm_git_archive Also install flexmock from RPM on EL9. Fixes #289. Reviewed-by: František Lachman <[email protected]>
packit · Sep 26, 2023 · 3410b4d · 3410b4d
2 parents d186594 + 4f2bec5
commit 3410b4d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 30 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
@@ -37,8 +37,6 @@ Summary:        %{summary}
 
 %prep
 %autosetup -p1 -n specfile-%{version}
-# Use packaged RPM python bindings downstream
-sed -i 's/rpm-py-installer/rpm/' setup.cfg
 # Remove bundled egg-info
 rm -rf specfile.egg-info
 

diff --git a/fedora/python-specfile.spec b/fedora/python-specfile.spec
@@ -1,9 +1,4 @@
-%if 0%{?rhel} == 9
-# RHEL 9 is missing python-flexmock
-%bcond_with tests
-%else
 %bcond_without tests
-%endif
 
 
 %global desc %{expand:
@@ -46,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/files/tasks/rpm-test-deps.yaml b/files/tasks/rpm-test-deps.yaml
@@ -4,8 +4,5 @@
     name:
       - python3-pytest
       - python3-pytest-cov
+      - python3-flexmock
   become: true
-- name: Pip install test dependencies
-  ansible.builtin.pip:
-    name:
-      - flexmock # RHBZ#2120251
diff --git a/plans/full.fmf b/plans/full.fmf
@@ -2,11 +2,3 @@ summary:
   Unit & integration tests
 discover+:
   filter: tier:1
-adjust:
-  - when: "distro == rhel-9 or distro == centos-9 or distro == centos-stream-9"
-    because: "flexmock is not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251"
-    prepare:
-      - how: install
-        package: python3-pip
-      - how: shell
-        script: pip3 install flexmock
diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf
@@ -19,12 +19,12 @@ adjust:
         directory: noarch/
 
   - when: "distro == rhel-9 or distro == centos-9 or distro == centos-stream-9"
-    because: "flexmock and deepdiff are not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251"
+    because: "deepdiff is not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251"
     prepare+:
       - how: install
         package: python3-pip
       - how: shell
-        script: pip3 install flexmock deepdiff
+        script: pip3 install deepdiff
 
   - when: "distro == rhel-8 or distro == centos-8 or distro == centos-stream-8"
     because: "packit doesn't support EL 8"

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

diff --git a/tests/full.fmf b/tests/full.fmf
@@ -6,11 +6,6 @@ require:
   - python3-pytest
   - python3-pytest-cov
   - python3-specfile
-adjust:
-  - when: "distro == rhel-9 or distro == centos-9 or distro == centos-stream-9"
-    because: "flexmock is not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251"
-    require-:
-      - python3-flexmock
 tag:
   - basic
 tier: 1