[bug#26647] Upgrade fabric to 1.13.2, remove upstreamed patch.

[Ben Sturmfels]

On Tue, 07 Nov 2017, Ricardo Wurmus wrote:

> Ben Sturmfels <address@hidden> writes:
>
>> But the build hanging issue Ricardo mentioned still
>> remains. Should be fixed by the attached patch.
>
> Thanks.  The patch looks good to me.

I've attached an updated patch updating to Fabric 1.14.0. If it's
preferable to do the update separately to the test fix, feel free to
merge the previous patch in this thread and I’ll send the upgrade patch
separately.

(Ricardo: Sorry for the extra email - just learning emacs-debbugs!)

Regards,
Ben

From a5f28bdc67c4427cfcf213fb288c811ba3e0788c Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <address@hidden>
Date: Tue, 7 Nov 2017 23:37:38 +1100
Subject: [PATCH] gnu: fabric: Update to 1.14.0 and disable problematic tests.

* gnu/packages/admin.scm (fabric): Update to 1.14.0 and add custom check phase 
to disable two tests.
---
 gnu/packages/admin.scm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d4215ead1..44884a0bb 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2115,21 +2115,34 @@ Intel DRM Driver.")
 (define-public fabric
   (package
     (name "fabric")
-    (version "1.13.2")
+    (version "1.14.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Fabric" version))
        (sha256
         (base32
-         "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq"))))
+         "13r0b0hllgf8j9rh6x1knmbgvingbdmx046aazv6vck2ll120mw1"))))
     (build-system python-build-system)
     (arguments
-     `(#:python ,python-2))             ; Python 2 only
+     `(#:python ,python-2               ; Python 2 only
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (zero?
+              (system*
+               "nosetests" "-v" "tests/"
+               ;; This test hangs indefinitely when run on a single core VM
+               ;; (see GNU bug #26647 and Debian bug #850230).
+               "--exclude=test_nested_execution_with_explicit_ports"
+               ;; This test randomly fails in certain environments causing too
+               ;; much noise to be useful (see Debian bug #854686).
+               
"--exclude=test_should_use_sentinel_for_tasks_that_errored")))))))
     (native-inputs
-     `(("python2-fudge" ,python2-fudge)
-       ("python2-jinja2" ,python2-jinja2)
-       ("python2-nose" ,python2-nose)))
+     `(("python2-fudge" ,python2-fudge) ; Requires < 1.0
+       ("python2-jinja2" ,python2-jinja2) ; Requires < 3.0
+       ("python2-nose" ,python2-nose))) ; Requires < 2.0
     (propagated-inputs
      `(("python2-paramiko" ,python2-paramiko)))
     (home-page "http://fabfile.org";)
-- 
2.15.0

signature.asc
Description: PGP signature