From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2qQZ-0007Na-92 for guix-patches@gnu.org; Mon, 24 Apr 2017 22:42:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2qQU-0004ge-F2 for guix-patches@gnu.org; Mon, 24 Apr 2017 22:42:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40490) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d2qQU-0004gV-Ad for guix-patches@gnu.org; Mon, 24 Apr 2017 22:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d2qQU-0003z0-4T for guix-patches@gnu.org; Mon, 24 Apr 2017 22:42:02 -0400 Subject: bug#26647: Upgrade fabric to 1.13.2, remove upstreamed patch. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2qPJ-0007Hw-43 for guix-patches@gnu.org; Mon, 24 Apr 2017 22:40:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2qPE-0003rC-CM for guix-patches@gnu.org; Mon, 24 Apr 2017 22:40:49 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55617) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2qPD-0003pg-Vb for guix-patches@gnu.org; Mon, 24 Apr 2017 22:40:44 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 219A520BF1 for ; Mon, 24 Apr 2017 22:40:42 -0400 (EDT) Received: from Tink (pa49-199-193-85.pa.vic.optusnet.com.au [49.199.193.85]) by mail.messagingengine.com (Postfix) with ESMTPA id B5BDA7E43A for ; Mon, 24 Apr 2017 22:40:39 -0400 (EDT) From: Ben Sturmfels Date: Tue, 25 Apr 2017 12:40:36 +1000 Message-ID: <87fugxky57.fsf@sturm.com.au> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26647@debbugs.gnu.org --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-fabric-Update-to-1.13.2.patch >From c7fb9e66f90acba2ea644600a039ffe31310b2d4 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels 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 --=-=-=--