[PATCH 09/11] gnu: Add oslo.cache.

[Cyril Roelandt]

* gnu/packages/python.scm (python-markupsafe python-mako python-dogpile.cache
  python-dogpile.core python-memcached python2-markupsafe python2-mako
  python2-dogpile.cache python2-dogpile.core python2-memcached): New variables.
* gnu/packages/openstack.scm (python-oslo.cache, python2-olso.cache): New
  variables.
---
 gnu/packages/openstack.scm |  43 ++++++++++++
 gnu/packages/python.scm    | 166 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 092ee5d..b35b8ca 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -219,6 +219,49 @@ extensions.")
 
 
 ;; Packages from the Oslo library
+(define-public python-oslo.cache
+  (package
+  (name "python-oslo.cache")
+  (version "0.3.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.cache/oslo.cache-";
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "16l6lsg834wxj746q9rmlmxmv8m931vs378pa5sq0i0rxql4rhmc"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-oslo.config" ,python-oslo.config)
+      ("python-oslo.i18n" ,python-oslo.i18n)
+      ("python-oslo.log" ,python-oslo.log)
+      ("python-oslo.utils" ,python-oslo.utils)
+      ("python-six" ,python-six)))
+  (inputs
+    `(("python-babel" ,python-babel)
+      ("python-dogpile.cache" ,python-dogpile.cache)
+      ("python-memcached" ,python-memcached)
+      ("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ;; Tests.
+      ("python-mock" ,python-mock)
+      ("python-oslotest" ,python-oslotest)))
+  (home-page "http://launchpad.net/oslo";)
+  (synopsis
+    "Cache storage for Openstack projects.")
+  (description
+    "oslo.cache aims to provide a generic caching mechanism for OpenStack
+projects by wrapping the dogpile.cache library.  The dogpile.cache library
+provides support memoization, key value storage and interfaces to common
+caching backends such as Memcached.")
+  (license asl2.0)))
+
+(define-public python2-oslo.cache
+  (package-with-python2 python-oslo.cache))
+
 (define-public python-oslo.config
   (package
   (name "python-oslo.config")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 62521c9..31d752d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4197,3 +4197,169 @@ fractional seconds) of a clock which never goes 
backwards.")
 
 (define-public python2-monotonic
   (package-with-python2 python-monotonic))
+
+(define-public python-markupsafe
+  (package
+  (name "python-markupsafe")
+  (version "0.23")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-";
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1hvip33wva3fnmvfp9x5klqri7hpl1hkgqmjbss18nmrb7zimv54"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-setuptools" ,python-setuptools)))
+  (home-page
+    "http://github.com/mitsuhiko/markupsafe";)
+  (synopsis
+    "Implements a XML/HTML/XHTML Markup safe string for Python")
+  (description
+    "Implements a XML/HTML/XHTML Markup safe string for Python")
+  (license bsd-3)))
+
+(define-public python2-markupsafe
+  (package-with-python2 python-markupsafe))
+
+(define-public python-mako
+  (package
+  (name "python-mako")
+  (version "1.0.1")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/M/Mako/Mako-";
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "074d3b1jfiml1gzqdwxy8xwvnz1p3i2znmnjxyvxlngaxfgqdw25"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-markupsafe" ,python-markupsafe)))
+  (inputs
+    `(("python-setuptools" ,python-setuptools)
+      ("python-mock" ,python-mock)
+      ("python-nose" ,python-nose)))
+  (home-page "http://www.makotemplates.org/";)
+  (synopsis
+    "A templating language that borrows ideas from the existing templating 
languages.")
+  (description
+    "Mako is a template library written in Python.  It provides a familiar,
+non-XML syntax which compiles into Python modules for maximum performance.
+Mako’s syntax and API borrows from the best ideas of many others, including
+Django templates, Cheetah, Myghty, and Genshi.  Conceptually, Mako is an
+embedded Python (i.e. Python Server Page) language, which refines the familiar
+ideas of componentized layout and inheritance to produce one of the most
+straightforward and flexible models available, while also maintaining close
+ties to Python calling and scoping semantics.")
+  (license license:expat)))
+
+(define-public python2-mako
+  (package-with-python2 python-mako))
+
+(define-public python-dogpile.cache
+  (package
+  (name "python-dogpile.cache")
+  (version "0.5.6")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             
"https://pypi.python.org/packages/source/d/dogpile.cache/dogpile.cache-";
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "0yy5pcv44wp1iysh6sxw160gfd9v3x1ib7y9bxxwyrjzap2l81gq"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-dogpile.core" ,python-dogpile.core)
+      ("python-mako" ,python-mako)))
+  (inputs
+    `(("python-mock" ,python-mock)
+      ("python-nose" ,python-nose)
+      ("python-setuptools" ,python-setuptools)))
+  (home-page
+    "http://bitbucket.org/zzzeek/dogpile.cache";)
+  (synopsis
+    "A caching front-end based on the Dogpile lock.")
+  (description
+    "A caching API built around the concept of a “dogpile lock”, which allows
+continued access to an expiring data value while a single thread generates a
+new value.")
+  (license bsd-3)))
+
+(define-public python2-dogpile.cache
+  (package-with-python2 python-dogpile.cache))
+
+(define-public python-dogpile.core
+  (package
+  (name "python-dogpile.core")
+  (version "0.4.1")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             
"https://pypi.python.org/packages/source/d/dogpile.core/dogpile.core-";
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy"))))
+  (build-system python-build-system)
+  (arguments
+   `(#:tests? #f)) ; Randomly fails on Python 2.
+  (inputs
+    `(("python-nose" ,python-nose)
+      ("python-setuptools" ,python-setuptools)))
+  (home-page
+    "http://bitbucket.org/zzzeek/dogpile.core";)
+  (synopsis
+    "A 'dogpile' lock, typically used as a component of a larger caching 
solution")
+  (description
+    "A “dogpile” lock, one which allows a single thread to generate an
+expensive resource while other threads use the “old” value, until the “new”
+value is ready.")
+  (license bsd-3)))
+
+(define-public python2-dogpile.core
+  (package-with-python2 python-dogpile.core))
+
+(define-public python-memcached
+  (package
+  (name "python-memcached")
+  (version "1.54")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             
"https://pypi.python.org/packages/source/p/python-memcached/python-memcached-";
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1080wanbsjix82plbly79fyawcwq0d2d4g6c3s815i942i1x28fz"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-six" ,python-six)))
+  (inputs
+    `(("python-setuptools" ,python-setuptools)))
+  (home-page
+    "http://www.tummy.com/Community/software/python-memcached/";)
+  (synopsis "Pure python memcached client")
+  (description
+    "This software is a 100% Python interface to the memcached memory cache
+daemon.  It is the client side software which allows storing values in one or
+more, possibly remote, memcached servers. Search google for memcached for more
+information.")
+  (license psfl)))
+
+(define-public python2-memcached
+  (package-with-python2 python-memcached))
-- 
2.1.4