--- Begin Message ---
|
Subject: |
Upgrade fabric to 1.13.2, remove upstreamed patch. |
|
Date: |
Tue, 25 Apr 2017 12:40:36 +1000 |
|
User-agent: |
mu4e 0.9.18; emacs 25.2.1 |
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
>From c7fb9e66f90acba2ea644600a039ffe31310b2d4 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <address@hidden>
Date: Tue, 25 Apr 2017 12:15:43 +1000
Subject: [PATCH] gnu: fabric: Update to 1.13.2.
To: address@hidden
* 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
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#26647] Upgrade fabric to 1.13.2, remove upstreamed patch. |
|
Date: |
Sun, 10 Jun 2018 13:18:34 +0800 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Ben Sturmfels <address@hidden> writes:
> From a5f28bdc67c4427cfcf213fb288c811ba3e0788c Mon Sep 17 00:00:00 2001
> From: Ben Sturmfels <address@hidden>
> 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!
--- End Message ---