guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/05: gnu: fabric: Update to 1.13.2.


From: Tobias Geerinckx-Rice
Subject: 01/05: gnu: fabric: Update to 1.13.2.
Date: Thu, 3 Aug 2017 23:00:37 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit f58be417610e65f27b90452b78255f8d88ab1b4f
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Fri Aug 4 03:46:49 2017 +0200

    gnu: fabric: Update to 1.13.2.
    
    * gnu/packages/admin.scm (fabric): Update to 1.13.2.  Remove outdated 
comments.
    [source]: Remove ‘patches’.
    * gnu/packages/patches/fabric-tests.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                            |  1 -
 gnu/packages/admin.scm                  | 18 ++++++------------
 gnu/packages/patches/fabric-tests.patch | 15 ---------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index f4fef78..0491de6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -586,7 +586,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
   %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch        \
   %D%/packages/patches/exim-CVE-2017-1000369.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 45f7431..c4aa108 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2105,28 +2105,22 @@ 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
+     `(#:python ,python-2))             ; Python 2 only
     (native-inputs
-     `(("python2-fudge" ,python2-fudge) ; Requires < 1.0
-       ("python2-jinja2" ,python2-jinja2) ; Requires < 3.0
-       ("python2-nose" ,python2-nose))) ; Requires < 2.0
+     `(("python2-fudge" ,python2-fudge)
+       ("python2-jinja2" ,python2-jinja2)
+       ("python2-nose" ,python2-nose)))
     (propagated-inputs
-     ;; Required upgrading python-paramiko 1.17.4 to fix an incompatibility
-     ;; between python-paramiko and newer python-pycrypto. Without this, the
-     ;; `fab` command fails with "ValueError: CTR mode needs counter
-     ;; parameter, not IV". See:
-     ;; https://github.com/paramiko/paramiko/pull/714#issuecomment-281191548.
      `(("python2-paramiko" ,python2-paramiko)))
     (home-page "http://fabfile.org";)
     (synopsis "Simple Pythonic remote execution and deployment tool")
diff --git a/gnu/packages/patches/fabric-tests.patch 
b/gnu/packages/patches/fabric-tests.patch
deleted file mode 100644
index 4a0ca9f..0000000
--- 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]