GNU bug report logs - #26647
Upgrade fabric to 1.13.2, remove upstreamed patch.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ben Sturmfels <ben <at> sturm.com.au>
Subject: bug#26647: closed (Re: [bug#26647] Upgrade fabric to 1.13.2,
 remove upstreamed patch.)
Date: Tue, 12 Jun 2018 11:52:02 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#26647: Upgrade fabric to 1.13.2, remove upstreamed patch.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 26647 <at> debbugs.gnu.org.

-- 
26647: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=26647
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: iyzsong <at> member.fsf.org (宋文武)
To: Ben Sturmfels <ben <at> sturm.com.au>
Cc: 26647-done <at> debbugs.gnu.org
Subject: Re: [bug#26647] Upgrade fabric to 1.13.2, remove upstreamed patch.
Date: Tue, 12 Jun 2018 19:51:00 +0800

Ben Sturmfels <ben <at> sturm.com.au> writes:

> On Sun, 10 Jun 2018, 宋文武 wrote:
>
>> Ben Sturmfels <ben <at> sturm.com.au> writes:
>>
>>> From a5f28bdc67c4427cfcf213fb288c811ba3e0788c Mon Sep 17 00:00:00 2001
>>> From: Ben Sturmfels <ben <at> sturm.com.au>
>>> 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.
>>
>> Well, this patch no longer needed, as we already had fabric-1.14.0.
>>
>> closing now, Thank you!
>
> Thanks for following up on this. I believe that the patch to disable two
> tests is still required though to address Ricardo's earlier issues with
> tests timing out.
>
> I've attached again without the upgrade to 0.14.0.
>

Oh, I think you're right, applied, thank you!

[Message part 3 (message/rfc822, inline)]

From: Ben Sturmfels <ben <at> sturm.com.au>
To: guix-patches <at> gnu.org
Subject: Upgrade fabric to 1.13.2, remove upstreamed patch.
Date: Tue, 25 Apr 2017 12:40:36 +1000

[Message part 4 (text/plain, inline)]

Hi Folks,

The attached patch upgrades fabric from 1.13.1 to 1.13.2. The new
upstream version incorporates the patch that was previously required for
tests to pass. Yay!

Regards,
Ben

-- 
Ben Sturmfels

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

[0001-gnu-fabric-Update-to-1.13.2.patch (text/x-patch, inline)]

From c7fb9e66f90acba2ea644600a039ffe31310b2d4 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben <at> sturm.com.au>
Date: Tue, 25 Apr 2017 12:15:43 +1000
Subject: [PATCH] gnu: fabric: Update to 1.13.2.
To: guix-patches <at> gnu.org

* gnu/packages/patches/fabric-tests.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove patch.
* gnu/packages/admin.scm (fabric)[source]: Update to 1.13.2
[patches]: Remove as the patch is now included upstream.
---
 gnu/local.mk                            |  1 -
 gnu/packages/admin.scm                  |  5 ++---
 gnu/packages/patches/fabric-tests.patch | 15 ---------------
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 gnu/packages/patches/fabric-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cb94d27e9..fd29c04e3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -554,7 +554,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/eudev-conflicting-declaration.patch	\
   %D%/packages/patches/evilwm-lost-focus-bug.patch		\
   %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch	\
-  %D%/packages/patches/fabric-tests.patch			\
   %D%/packages/patches/fastcap-mulGlobal.patch			\
   %D%/packages/patches/fastcap-mulSetup.patch			\
   %D%/packages/patches/fasthenry-spAllocate.patch		\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 8f4a4cd41..f541481cb 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2053,15 +2053,14 @@ Intel DRM Driver.")
 (define-public fabric
   (package
     (name "fabric")
-    (version "1.13.1")
+    (version "1.13.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Fabric" version))
        (sha256
         (base32
-         "1z17hw0yiqp1blq217zxkg2jzkv8qd79saqhscgsw14mwlcqpwd0"))
-       (patches (search-patches "fabric-tests.patch"))))
+         "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq"))))
     (build-system python-build-system)
     (arguments
      `(#:python ,python-2))                       ;Python 2 only
diff --git a/gnu/packages/patches/fabric-tests.patch b/gnu/packages/patches/fabric-tests.patch
deleted file mode 100644
index 4a0ca9f8f..000000000
--- a/gnu/packages/patches/fabric-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The `fab` excecutable doesn't exist during the test phase as it is created
-dynamically during installation. Refer to the equivalent Python module
-directly.
-
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -93,7 +93,7 @@
-     # perform when they are allowed to bubble all the way to the top. So, we
-     # invoke a subprocess and look at its stderr instead.
-     with quiet():
--        result = local("fab -f tests/support/aborts.py kaboom", capture=True)
-+        result = local("python -m fabric -f tests/support/aborts.py kaboom", capture=True)
-     # When error in #1318 is present, this has an extra "It burns!" at end of
-     # stderr string.
-     eq_(result.stderr, "Fatal error: It burns!\n\nAborting.")
\ No newline at end of file
-- 
2.12.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.