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

[Ben Sturmfels <ben@sturm.com.au>]

[-- Attachment #1: Type: text/plain, Size: 697 bytes --]


On Wed, 06 Sep 2017, Ben Sturmfels wrote:

> On Sat, 02 Sep 2017, Ludovic Courtès wrote:
>
>> Did you have a chance to look into this?
>> (See <https://bugs.gnu.org/26647> for context.)

It looks like Tobias beat me to the fabric 1.13.2 upgrade in f58be417 -
thanks Tobias! But the build hanging issue Ricardo mentioned still
remains. Should be fixed by the attached patch.

I've re-added the "Requires < X.X" comments as I think these will help
anyone trying to debug build problems if/when these dependencies are
upgraded.

If that's all ok, I can look at the upgrade to 0.14.0 in a separate patch.

Regards,
Ben

--
Ben Sturmfels

Sturm - Software Engineering
www.sturm.com.au
(03) 9024 2467

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-fabric-Disable-problematic-tests.patch --]
[-- Type: text/x-patch, Size: 1906 bytes --]

From 1a88d0aede4aee911617dc4ad5359d43a1193f22 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 7 Nov 2017 23:37:38 +1100
Subject: [PATCH] gnu: fabric: Disable problematic tests.

* gnu/packages/admin.scm (fabric): Add custom check phase to disable two tests.
---
 gnu/packages/admin.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 7b8e41fce..dcc5ecbff 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2122,11 +2122,24 @@ Intel DRM Driver.")
          "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq"))))
     (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.14.2