[arch-commits] Commit in git-filter-repo/trunk (PKGBUILD version.patch)

[Leonidas Spyropoulos]

    Date: Saturday, December 4, 2021 @ 18:54:32
  Author: artafinde
Revision: 1065064

Upstream release 2.34.0

Modified:
  git-filter-repo/trunk/PKGBUILD
Deleted:
  git-filter-repo/trunk/version.patch

---------------+
 PKGBUILD      |   24 ++++++++----------------
 version.patch |   10 ----------
 2 files changed, 8 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-04 18:45:35 UTC (rev 1065063)
+++ PKGBUILD	2021-12-04 18:54:32 UTC (rev 1065064)
@@ -1,33 +1,25 @@
 # Maintainer: Jerome Leclanche <jerome at leclan.ch>
 
 pkgname=git-filter-repo
-pkgver=2.29.0
-pkgrel=2
+pkgver=2.34.0
+pkgrel=1
 pkgdesc="Quickly rewrite git repository history (filter-branch replacement)"
 arch=("any")
 url="https://github.com/newren/git-filter-repo"
 license=("MIT")
 depends=("git" "python")
-makedepends=("python-setuptools")
-checkdepends=("python-coverage")
+makedepends=("python-setuptools-scm")
+checkdepends=('rsync')
 source=(
 	"$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
-	"version.patch"
 )
-sha256sums=(
-	"eb269f6e9b91fcacf676f7d5b8174d962dab5facce2022cc59cb672cd33cd602"
-	"68757bead7ef4a2ff5af3b8563889564f5105cb75da9a7a7513b8aa198027d6f"
-)
+sha256sums=('b1bf46af1e6a91a54056d0254e480803db8e40f631336c559a1a94d2a08389c4')
 
-prepare() {
-	cd "$pkgname-$pkgver"
-	# use_scm_version in setup.py doesn't work from tarballs, inject $pkgver instead
-	patch -Np1 -i "$srcdir/version.patch"
-	sed -i "s|@PKGVER@|$pkgver|" release/setup.py
-}
+export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
 
 check() {
-	make -C "$pkgname-$pkgver" test
+	cd "$pkgname-$pkgver"
+	./t/run_tests
 }
 
 package() {

Deleted: version.patch
===================================================================
--- version.patch	2021-12-04 18:45:35 UTC (rev 1065063)
+++ version.patch	2021-12-04 18:54:32 UTC (rev 1065064)
@@ -1,10 +0,0 @@
-Index: git-filter-repo-2.26.0/release/setup.py
-===================================================================
---- git-filter-repo-2.26.0.orig/release/setup.py
-+++ git-filter-repo-2.26.0/release/setup.py
-@@ -5,4 +5,4 @@ for f in ['git-filter-repo', 'git_filter
-         os.symlink("../"+f, f)
-     except FileExistsError:
-         pass
--setup(use_scm_version=dict(root="..", relative_to=__file__))
-+setup(version='@PKGVER@')