summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Wild2020-01-22 20:08:57 -0500
committerAllen Wild2020-01-22 20:10:24 -0500
commitb7a13430b31e4d6f613f234859601b661ade2d14 (patch)
tree6b614849fbb873ded66cd2822051c863f59264c8
parentdf0b985aae7532399327f3b05b3f4b46558d02b4 (diff)
downloadaur-b7a13430b31e4d6f613f234859601b661ade2d14.tar.gz
update to 2.25.0-1
Drop the run_coverage patch because it's fixed upstream [1]. Update pkgdesc to match the Github repo summary. [1] https://github.com/newren/git-filter-repo/commit/64aa9359ed001a4c2ef557dd85c6addb1f0ef665
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--coverage-command.patch16
3 files changed, 10 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 74df1d6a13fa..1bd93d82627b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = git-filter-repo
- pkgdesc = Rapidly rewrite entire repository history using user-specified filters.
- pkgver = 2.24.0
+ pkgdesc = Quickly rewrite git repository history (filter-branch replacement)
+ pkgver = 2.25.0
pkgrel = 1
url = https://github.com/newren/git-filter-repo
arch = any
@@ -8,10 +8,8 @@ pkgbase = git-filter-repo
checkdepends = python-coverage
depends = git
depends = python
- source = https://github.com/newren/git-filter-repo/releases/download/v2.24.0/git-filter-repo-2.24.0.tar.xz
- source = coverage-command.patch
- sha256sums = 92188d3c44b9ff0dd40dfeed72859e0a088f775c12fb24c4e3e27a8064cfcc84
- sha256sums = b37bb67d8cdca997f096f8231e41f01de020d78cb4df5b1d5affbe74e10f1111
+ source = https://github.com/newren/git-filter-repo/releases/download/v2.25.0/git-filter-repo-2.25.0.tar.xz
+ sha256sums = ea8cdb7dca68111e819d141fc4d302b811c1e5362c12de7403882ba9908be29c
pkgname = git-filter-repo
diff --git a/PKGBUILD b/PKGBUILD
index a8a9c8e85f6f..c34d4f3dd3de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,19 @@
# Maintainer: Allen Wild <allenwild93@gmail.com>
pkgname=git-filter-repo
-pkgver=2.24.0
+pkgver=2.25.0
pkgrel=1
-pkgdesc="Rapidly rewrite entire repository history using user-specified filters."
+pkgdesc="Quickly rewrite git repository history (filter-branch replacement)"
arch=('any')
url="https://github.com/newren/git-filter-repo"
license=('MIT')
depends=('git' 'python')
checkdepends=('python-coverage')
-source=("${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"
- "coverage-command.patch")
-sha256sums=('92188d3c44b9ff0dd40dfeed72859e0a088f775c12fb24c4e3e27a8064cfcc84'
- 'b37bb67d8cdca997f096f8231e41f01de020d78cb4df5b1d5affbe74e10f1111')
+source=("${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('ea8cdb7dca68111e819d141fc4d302b811c1e5362c12de7403882ba9908be29c')
prepare() {
- cd "$pkgname-$pkgver"
- patch -Np1 -i "${srcdir}/coverage-command.patch"
+ # hard-code the shebang to the system python(3) to avoid confusion with virtualenvs
+ sed -i 's|^#!.*|#!/usr/bin/python|' "$pkgname-$pkgver/git-filter-repo"
}
check() {
diff --git a/coverage-command.patch b/coverage-command.patch
deleted file mode 100644
index b6fd27a1cbf7..000000000000
--- a/coverage-command.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/t/run_coverage b/t/run_coverage
-index 6f4d9a2..f72cdd5 100755
---- a/t/run_coverage
-+++ b/t/run_coverage
-@@ -24,8 +24,8 @@ export PRETEND_UNICODE_ARGS=1
- ls t939*.sh | xargs -n 1 bash
-
- cd $tmpdir
--python3-coverage combine
--python3-coverage html -d $orig_dir/report
--python3-coverage report -m
-+coverage3 combine
-+coverage3 html -d $orig_dir/report
-+coverage3 report -m
- cd $orig_dir
- rm -rf $tmpdir