summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-02-28 04:48:41 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-02-28 13:59:02 +0100
commitcaf3713ad580126d18094ead081a7ed65399b699 (patch)
tree4a874f27d1a0ae4e0d70be8eef07a5d234213672
parent32bb0c617b12a3a937097922e4dfc819490d3f13 (diff)
downloadguix-caf3713ad580126d18094ead081a7ed65399b699.tar.gz
gnu: python-oslo.serialization: Update to 2.24.0.
* gnu/packages/openstack.scm (python-oslo.serialization): Update to 2.24.0.
[arguments]: Remove field.
[propagated-inputs]: Remove PYTHON-ISO8601 and PYTHON-SIMPLEJSON.  Add
PYTHON-MSGPACK.
[native-inputs]: Remove PYTHON-BABEL.
[properties]: New field.
(python2-oslo.serialization)[native-inputs]: Add PYTHON2-IPADDRESS.
-rw-r--r--gnu/packages/openstack.scm21
1 files changed, 12 insertions, 9 deletions
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index c990fb929b..dfcd1e3a81 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -527,27 +527,23 @@ handlers and support for context specific logging (like resource id’s etc).")
 (define-public python-oslo.serialization
   (package
     (name "python-oslo.serialization")
-    (version "2.2.0")
+    (version "2.24.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslo.serialization" version))
        (sha256
         (base32
-         "00s03krhf833gs76aw5ns32w9m1i4hx6x6d9g82m0j5wyqk0sci4"))))
+         "08bxkp98c617y58x630xq44iiffm7f0f3cwh6zbnlkgq0zgh7jk1"))))
     (build-system python-build-system)
-    (arguments
-     '(#:tests? #f)) ; FIXME: Requires python-oslo.utils >= 3.2.0.
     (propagated-inputs
-      `(("python-iso8601" ,python-iso8601)
+      `(("python-msgpack" ,python-msgpack)
         ("python-netaddr" ,python-netaddr)
         ("python-oslo.utils" ,python-oslo.utils)
-        ("python-simplejson" ,python-simplejson)
         ("python-six" ,python-six)
         ("python-pytz" ,python-pytz)))
     (native-inputs
-      `(("python-babel" ,python-babel)
-        ("python-pbr" ,python-pbr)
+      `(("python-pbr" ,python-pbr)
         ;; Tests.
         ("python-mock" ,python-mock)
         ("python-oslo.i18n" ,python-oslo.i18n)
@@ -557,10 +553,17 @@ handlers and support for context specific logging (like resource id’s etc).")
     (description
       "The oslo.serialization library provides support for representing objects
 in transmittable and storable formats, such as JSON and MessagePack.")
+    (properties `((python2-variant . ,(delay python2-oslo.serialization))))
     (license asl2.0)))
 
 (define-public python2-oslo.serialization
-  (package-with-python2 python-oslo.serialization))
+  (let ((base (package-with-python2 (strip-python2-variant
+                                     python-oslo.serialization))))
+    (package
+      (inherit base)
+      (native-inputs
+       `(("python2-ipaddress" ,python2-ipaddress)
+         ,@(package-native-inputs base))))))
 
 (define-public python-reno
   (package