[arch-commits] Commit in borg/trunk (PKGBUILD borg.coveragerc)

[Eli Schwartz]

    Date: Tuesday, June 12, 2018 @ 17:22:53
  Author: eschwartz
Revision: 342598

upgpkg: borg 1.1.6-2

Fix FS#58974 -- msgpack woes *again*. This time use a patch to make sure it
always applies successfully (since sed does not return failure when the
output is unchanged).

Also remove coveragerc which is now shipped in the PyPI tarball.

Modified:
  borg/trunk/PKGBUILD
Deleted:
  borg/trunk/borg.coveragerc

-----------------+
 PKGBUILD        |   16 ++++++++++------
 borg.coveragerc |   23 -----------------------
 2 files changed, 10 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-12 17:20:22 UTC (rev 342597)
+++ PKGBUILD	2018-06-12 17:22:53 UTC (rev 342598)
@@ -4,7 +4,7 @@
 pkgname=borg
 _pkgname=borgbackup
 pkgver=1.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Deduplicating backup program with compression and authenticated encryption'
 url='https://borgbackup.github.io/'
 license=('BSD')
@@ -17,13 +17,14 @@
 provides=('borgbackup')
 replaces=('borgbackup')
 source=("https://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
-        borg.coveragerc)
+        "https://github.com/borgbackup/borg/pull/3891/commits/d6ce4d9e7e28b89fbedcd883cac2912415164449.patch")
 sha256sums=('a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930'
-            '183814ae70fce7bbcf04dbbf3866eaf76867896a4327f8a3b553e095d1ff360f')
+            '9974ffa97694a06c9b30b943176775ccc02927c1baea165955ab5c6e3cab85d4')
 
 prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
-  sed -i "s/msgpack-python>=.*/msgpack',/g" setup.py
+  # msgpack versions are constantly broken: https://bugs.archlinux.org/task/58974
+  patch -p1 -i ../d6ce4d9e7e28b89fbedcd883cac2912415164449.patch
 }
 
 build() {
@@ -34,7 +35,7 @@
 check() {
   cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3.6/"
   LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
-    --cov-config="$srcdir/borg.coveragerc" --benchmark-skip --pyargs borg.testsuite -v \
+    --benchmark-skip --pyargs borg.testsuite -v \
     -k 'not test_non_ascii_acl'
 }
 
@@ -41,8 +42,11 @@
 package() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  python setup.py -q install --root="$pkgdir" --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=1
 
+  # remove junk files
+  rm -r "$pkgdir"/usr/lib/python*/site-packages/{.benchmarks,.coverage}
+
   install -Dm644 scripts/shell_completions/bash/borg \
     "$pkgdir/usr/share/bash-completion/completions/borg"
   install -Dm644 scripts/shell_completions/fish/borg.fish \

Deleted: borg.coveragerc
===================================================================
--- borg.coveragerc	2018-06-12 17:20:22 UTC (rev 342597)
+++ borg.coveragerc	2018-06-12 17:22:53 UTC (rev 342598)
@@ -1,23 +0,0 @@
-[run]
-branch = True
-source = src/borg
-omit =
-    */borg/__init__.py
-    */borg/__main__.py
-    */borg/_version.py
-    */borg/fuse.py
-    */borg/support/*
-    */borg/testsuite/*
-    */borg/hash_sizes.py
-
-[report]
-exclude_lines =
-    pragma: no cover
-    pragma: freebsd only
-    pragma: unknown platform only
-    def __repr__
-    raise AssertionError
-    raise NotImplementedError
-    if 0:
-    if __name__ == .__main__.:
-ignore_errors = True