From: Ben Sturmfels <ben@sturm.com.au>
To: 26647@debbugs.gnu.org
Subject: bug#26647: Upgrade fabric to 1.13.2, remove upstreamed patch.
Date: Tue, 25 Apr 2017 12:40:36 +1000 [thread overview]
Message-ID: <87fugxky57.fsf@sturm.com.au> (raw)
[-- 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
next reply other threads:[~2017-04-25 2:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 2:40 Ben Sturmfels [this message]
2017-04-25 13:18 ` bug#26647: Upgrade fabric to 1.13.2, remove upstreamed patch Ricardo Wurmus
2017-04-26 0:26 ` Ben Sturmfels
2017-09-01 22:48 ` [bug#26647] " Ludovic Courtès
2017-09-06 0:54 ` Ben Sturmfels
2017-11-07 12:54 ` Ben Sturmfels
2017-11-07 13:21 ` Ben Sturmfels
2017-11-07 13:24 ` Ben Sturmfels
2017-11-07 13:46 ` Ricardo Wurmus
2017-12-02 0:06 ` Ben Sturmfels
2018-06-10 5:18 ` bug#26647: " 宋文武
2018-06-12 2:14 ` [bug#26647] " Ben Sturmfels
2018-06-12 11:51 ` bug#26647: " 宋文武
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fugxky57.fsf@sturm.com.au \
--to=ben@sturm.com.au \
--cc=26647@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).