guix-commits
[Top][All Lists]
Advanced

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

01/06: gnu: python-nose-timer: Update to 0.7.2.


From: Tobias Geerinckx-Rice
Subject: 01/06: gnu: python-nose-timer: Update to 0.7.2.
Date: Thu, 14 Jun 2018 14:28:54 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 1ba7a62362d332f1c059222ce177217860e5437d
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Thu Jun 14 16:42:05 2018 +0200

    gnu: python-nose-timer: Update to 0.7.2.
    
    * gnu/packages/check.scm (python-nose-timer): Update to 0.7.2.
    [source]: Remove patch...
    * gnu/packages/patches/python-nose-timer-drop-ordereddict.patch:
    ...delete file...
    * gnu/local.mk (dist_patch_DATA): ...and remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/check.scm                             |  9 +----
 .../python-nose-timer-drop-ordereddict.patch       | 44 ----------------------
 3 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 59e983a..bfe8a9e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1050,7 +1050,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch     
\
   %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
   %D%/packages/patches/python-networkx2-reproducible-build.patch       \
-  %D%/packages/patches/python-nose-timer-drop-ordereddict.patch \
   %D%/packages/patches/python-pillow-fix-failing-tests.patch   \
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch      
\
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 3e959bd..44e38c5 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1902,19 +1902,14 @@ create data based on random numbers and yet remain 
repeatable.")
 (define-public python-nose-timer
   (package
     (name "python-nose-timer")
-    (version "0.7.0")
+    (version "0.7.2")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "nose-timer" version))
-        (patches
-         (search-patches
-          ;; This patch will not be needed in the next version.
-          ;; It is taken from the master branch.
-          "python-nose-timer-drop-ordereddict.patch"))
         (sha256
           (base32
-            "1s32ymsnby8lz2qk55ifj9zi50dqcg6swnj5cz2rmwxg2jsslsxp"))))
+            "0ywg223p528014z5s0vzck74r4xyw3kvcp2casfnc85dkvir1zj7"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-nose" ,python-nose)
diff --git a/gnu/packages/patches/python-nose-timer-drop-ordereddict.patch 
b/gnu/packages/patches/python-nose-timer-drop-ordereddict.patch
deleted file mode 100644
index e1e71a3..0000000
--- a/gnu/packages/patches/python-nose-timer-drop-ordereddict.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 700076019b5aff72aac7651cc830aaef21ee9a47 Mon Sep 17 00:00:00 2001
-From: jakirkham <address@hidden>
-Date: Fri, 7 Jul 2017 05:57:56 -0400
-Subject: [PATCH] Drop ordereddict requirement (#84)
-
-* Drop ordereddict requirement
-
-As Python 2.7 is the minimum Python supported, every version of Python
-should have `ordereddict` preincluded in the standard library one way or
-another. So we can drop this dependency and just handle the differences
-between Python 2 and Python 3.
----
- nosetimer/plugin.py | 5 +----
- setup.py            | 1 -
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/nosetimer/plugin.py b/nosetimer/plugin.py
-index ef28e11..d093a51 100644
---- a/nosetimer/plugin.py
-+++ b/nosetimer/plugin.py
-@@ -12,10 +12,7 @@
- except ImportError:
-     import queue as Queue
- 
--try:
--    from collections import OrderedDict
--except ImportError:
--    from ordereddict import OrderedDict
-+from collections import OrderedDict
- 
- 
- # define constants
-diff --git a/setup.py b/setup.py
-index 6a55b82..d249325 100755
---- a/setup.py
-+++ b/setup.py
-@@ -27,7 +27,6 @@
-     install_requires=[
-         'nose',
-         'termcolor',
--        'ordereddict',
-     ],
-     license='MIT',
-     entry_points={



reply via email to

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