[arch-commits] Commit in borg/trunk (2 files)

[Eli Schwartz]

    Date: Wednesday, October 3, 2018 @ 03:26:47
  Author: eschwartz
Revision: 389104

upgpkg: borg 1.1.7-2

FS#60269 Fix msgpack version constraints yet again
FS#56279 Use the upstream recommended fish completions dir

Added:
  borg/trunk/0001-Fix-msgpack-version-constraints-using-proper-setupto.patch
Modified:
  borg/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Fix-msgpack-version-constraints-using-proper-setupto.patch |   31 ++++++++++
 PKGBUILD                                                        |   25 ++++++--
 2 files changed, 51 insertions(+), 5 deletions(-)

Added: 0001-Fix-msgpack-version-constraints-using-proper-setupto.patch
===================================================================
--- 0001-Fix-msgpack-version-constraints-using-proper-setupto.patch	                        (rev 0)
+++ 0001-Fix-msgpack-version-constraints-using-proper-setupto.patch	2018-10-03 03:26:47 UTC (rev 389104)
@@ -0,0 +1,31 @@
+From 53671fd85a33d73699b80564da345ffc9b73c3e5 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Mon, 11 Jun 2018 18:56:50 -0400
+Subject: [PATCH] Fix msgpack version constraints using proper setuptools
+ metadata.
+
+Embrace environment markers (a.k.a. PEP 508 compliance)! They let you do
+sane handling of different requirements for different versions of
+python. There's no need to bend over backwards to try to ensure usage of
+python34-compatible dependencies on python36.
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 253a050a..22aabbbe 100644
+--- a/setup.py
++++ b/setup.py
+@@ -39,7 +39,8 @@
+     # we are rather picky about msgpack versions, because a good working msgpack is
+     # very important for borg, see https://github.com/borgbackup/borg/issues/3753
+     # best versions seem to be 0.4.6, 0.4.7, 0.4.8 and 0.5.6:
+-    'msgpack-python >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5',
++    'msgpack-python >=0.4.6, <0.5;python_version=="3.4"',
++    'msgpack >=0.5.6;python_version >="3.5"',
+     # if you can't satisfy the above requirement, these are versions that might
+     # also work ok, IF you make sure to use the COMPILED version of msgpack-python,
+     # NOT the PURE PYTHON fallback implementation: ==0.5.1, ==0.5.4
+-- 
+2.19.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-03 00:04:01 UTC (rev 389103)
+++ PKGBUILD	2018-10-03 03:26:47 UTC (rev 389104)
@@ -4,7 +4,7 @@
 pkgname=borg
 _pkgname=borgbackup
 pkgver=1.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Deduplicating backup program with compression and authenticated encryption'
 url='https://borgbackup.github.io/'
 license=('BSD')
@@ -16,9 +16,24 @@
 checkdepends=('python-pytest' 'python-pytest-cov' 'python-pytest-benchmark' 'python-mock')
 provides=('borgbackup')
 replaces=('borgbackup')
-source=("https://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz")
-sha256sums=('f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc')
+source=("https://github.com/$_pkgname/$pkgname/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
+        "0001-Fix-msgpack-version-constraints-using-proper-setupto.patch")
+sha256sums=('f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc'
+            '0392d573928aa8282ddb3082289a42ade7503aa285d575ce06d6296327518744')
 
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # msgpack versions are constantly broken: https://bugs.archlinux.org/task/58974
+  # patch submitted upstream as https://github.com/borgbackup/borg/pull/3891
+  # but upstream refuses to merge it, claiming that it *breaks* compatibility
+  # rather than adds it??? We're specifically using a patch since otherwise,
+  # this keeps on breaking with every single release, and we need to check
+  # every single time that it isn't broken again. New versions *cannot* simply
+  # be trusted to be sane.
+  patch -p1 -i ../0001-Fix-msgpack-version-constraints-using-proper-setupto.patch
+}
+
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
   python setup.py build
@@ -25,7 +40,7 @@
 }
 
 check() {
-  cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-"*
+  cd "$srcdir/$_pkgname-$pkgver/build/lib.linux-$CARCH-3".*/
   LANG=en_US.UTF-8 PYTHONPATH="$PWD:$PYTHONPATH" py.test --cov=borg \
     --benchmark-skip --pyargs borg.testsuite -v \
     -k 'not test_non_ascii_acl'
@@ -42,7 +57,7 @@
   install -Dm644 scripts/shell_completions/bash/borg \
     "$pkgdir/usr/share/bash-completion/completions/borg"
   install -Dm644 scripts/shell_completions/fish/borg.fish \
-    "$pkgdir/usr/share/fish/completions/borg.fish"
+    "$pkgdir/usr/share/fish/vendor_completions.d/borg.fish"
   install -Dm644 scripts/shell_completions/zsh/_borg "$pkgdir/usr/share/zsh/site-functions/_borg"
 
   install -Dm644 -t "$pkgdir/usr/share/man/man1/" "docs/man/"*.1