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

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

[Ben Sturmfels]

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

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-fabric-Update-to-1.13.2.patch --]
[-- Type: text/x-patch, Size: 3005 bytes --]

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

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

[Ricardo Wurmus]

Hi Ben,

> 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!

I have tried your patch but the tests seem to time out at this point:

    Alias expansion ... ok
    test_tasks.TestExecute.test_calls_task_function_objects
    should execute the passed-in function object ... ok
    test_tasks.TestExecute.test_nested_execution_with_explicit_ports
    nested executions should work with defined ports
    *crickets*

After about an hour I aborted the build.  Is this test supposed to take
a very long time?

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

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

[Ben Sturmfels]

On Tue, 25 Apr 2017, Ricardo Wurmus wrote:

> Hi Ben,
>
>> 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!
>
> I have tried your patch but the tests seem to time out at this point:
>
>     Alias expansion ... ok
>     test_tasks.TestExecute.test_calls_task_function_objects
>     should execute the passed-in function object ... ok
>     test_tasks.TestExecute.test_nested_execution_with_explicit_ports
>     nested executions should work with defined ports
>     *crickets*
>
> After about an hour I aborted the build.  Is this test supposed to take
> a very long time?

Ow, that's a shame. The tests run fine for me, but I see that Debian
have this test disabled as it runs indefinitely on a single-core VM.
I'll look at disabling this test too.

Regards,
Ben

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

[Ludovic Courtès]

Hi Ben,

Ben Sturmfels <ben@sturm.com.au> skribis:

> On Tue, 25 Apr 2017, Ricardo Wurmus wrote:
>
>> Hi Ben,
>>
>>> 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!
>>
>> I have tried your patch but the tests seem to time out at this point:
>>
>>     Alias expansion ... ok
>>     test_tasks.TestExecute.test_calls_task_function_objects
>>     should execute the passed-in function object ... ok
>>     test_tasks.TestExecute.test_nested_execution_with_explicit_ports
>>     nested executions should work with defined ports
>>     *crickets*
>>
>> After about an hour I aborted the build.  Is this test supposed to take
>> a very long time?
>
> Ow, that's a shame. The tests run fine for me, but I see that Debian
> have this test disabled as it runs indefinitely on a single-core VM.
> I'll look at disabling this test too.

Did you have a chance to look into this?
(See <https://bugs.gnu.org/26647> for context.)

Thanks,
Ludo’.

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

[Ben Sturmfels]

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.)

Thanks for the reminder! I've been away for a bit, but this is still on
my to-do list.

Regards,
Ben

-- 
Ben Sturmfels

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

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

[Ben Sturmfels]

[-- 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

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

[Ben Sturmfels]

By the way, can anyone tell me why the message I sent to Debbugs a
couple of minutes ago is hidden by default on the web interface, only
shown as an "Information forwarded" line when I click:

  "Toggle the display of automated, internal messages from the tracker."

Am I doing something wrong?

Regards,
Ben

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

[Ben Sturmfels]

Oh, I was just being too impatient. Now that I refresh 10 mins later,
the message shows up properly.

Regards,
Ben

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

[Ricardo Wurmus]

Ben Sturmfels <ben@sturm.com.au> 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 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.

Yes, that’s a good idea.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

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

[Ben Sturmfels]

[-- Attachment #1.1: Type: text/plain, Size: 559 bytes --]

On Tue, 07 Nov 2017, Ricardo Wurmus wrote:

> Ben Sturmfels <ben@sturm.com.au> 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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-fabric-Update-to-1.14.0-and-disable-problematic-.patch --]
[-- Type: text/x-patch, Size: 2312 bytes --]

From a5f28bdc67c4427cfcf213fb288c811ba3e0788c 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: 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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[宋文武]

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

> From a5f28bdc67c4427cfcf213fb288c811ba3e0788c 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: 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!

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

[Ben Sturmfels]

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

Hi 宋文武,



Ben Sturmfels

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

On Sun, 10 Jun 2018, 宋文武 wrote:

> Ben Sturmfels <ben@sturm.com.au> writes:
>
>> From a5f28bdc67c4427cfcf213fb288c811ba3e0788c 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: 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.

Regards,
Ben

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

From ace313161f2a3c8fda198b7bf5f7be91c9de4945 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.

Reported by Ricardo Wurmus <rekado@elephly.net> at
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26647#8>.

* 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 6b8df3fb9..c1acfce8e 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2359,11 +2359,24 @@ Intel DRM Driver.")
          "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
        ("python2-pynacl" ,python2-pynacl)
        ("python2-bcrypt" ,python2-bcrypt)))
     (propagated-inputs
-- 
2.17.0

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

[宋文武]

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

> On Sun, 10 Jun 2018, 宋文武 wrote:
>
>> Ben Sturmfels <ben@sturm.com.au> writes:
>>
>>> From a5f28bdc67c4427cfcf213fb288c811ba3e0788c 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: 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!