[PATCH 11/11] gnu: Add oslosphinx.

[Cyril Roelandt]

* gnu/packages/python.scm (python-requests): Bump to 2.7.0.
* gnu/packages/openstack.scm (python-oslosphinx, python2-olsosphinx): New
  variables.
---
 gnu/packages/openstack.scm | 37 +++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    |  4 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index b324d3e..f0c6774 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -487,6 +487,43 @@ limiting size/connection etc.")
 (define-public python2-oslo.serialization
   (package-with-python2 python-oslo.serialization))
 
+(define-public python-oslosphinx
+  (package
+  (name "python-oslosphinx")
+  (version "3.0.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslosphinx/oslosphinx-";
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1xn15ihnpmzkim98297w7wivnz7n2wdqq44smf3y0xk0dfz2k4fk"))
+      (modules '((guix build utils)))
+      (snippet
+       ;; The "hacking" and "sphinx" packages are specified in
+       ;; test-requirements.txt, but they are not used for the unit tests, so
+       ;; we do not need to add them as inputs.
+       '(substitute* "test-requirements.txt"
+          (("^sphinx.*") "")
+          (("^hacking.*") "")))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-pbr" ,python-pbr)
+      ("python-requests" ,python-requests)
+      ("python-setuptools" ,python-setuptools)))
+  (home-page "http://www.openstack.org/";)
+  (synopsis "OpenStack Sphinx Extensions and Theme")
+  (description
+    "Theme and extension support for Sphinx documentation from the OpenStack
+project.")
+  (license asl2.0)))
+
+(define-public python2-oslosphinx
+  (package-with-python2 python-oslosphinx))
+
 (define-public python-oslotest
   (package
     (name "python-oslotest")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6b69dd5..ef5fbba 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1671,7 +1671,7 @@ with sensible defaults out of the box.")
 (define-public python-requests
   (package
     (name "python-requests")
-    (version "2.4.0")
+    (version "2.7.0")
     (source (origin
              (method url-fetch)
              (uri
@@ -1680,7 +1680,7 @@ with sensible defaults out of the box.")
                version ".tar.gz"))
              (sha256
               (base32
-               "0gknlfx1wakrrm1zi8gi03x2lzj4dsns0vjw0nsmgqvkphyf01vh"))))
+               "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir"))))
     (build-system python-build-system)
     (inputs
      `(("python-setuptools" ,python-setuptools)
-- 
2.1.4