[PATCH 00/11] Add a few modules from the Oslo library.

[PATCH 00/11] Add a few modules from the Oslo library.

[Cyril Roelandt]

This is a first step towards packaging OpenStack.

---
Cyril Roelandt (11):
  gnu: Bump python-six to 1.9.0.
  gnu: Add oslotest.
  gnu: Add oslo.i18n.
  gnu: Add oslo.config
  gnu: Add oslo.utils.
  gnu: Add oslo.context.
  gnu: Add oslo.serialization.
  gnu: Add oslo.log.
  gnu: Add oslo.cache.
  gnu: Add oslo.middleware.
  gnu: Add oslosphinx.

 gnu-system.am              |   1 +
 gnu/packages/openstack.scm | 611 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    | 352 +++++++++++++++++++++++++-
 3 files changed, 958 insertions(+), 6 deletions(-)
 create mode 100644 gnu/packages/openstack.scm

-- 
2.1.4

[PATCH 01/11] gnu: Bump python-six to 1.9.0.

[Cyril Roelandt]

* gnu/packages/python.scm (python-six): Bump to 1.9.0.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5dcaba0..2ba7178 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -532,7 +532,7 @@ password storage.")
 (define-public python-six
   (package
     (name "python-six")
-    (version "1.7.2")
+    (version "1.9.0")
     (source
      (origin
       (method url-fetch)
@@ -540,7 +540,7 @@ password storage.")
                           "six/six-" version ".tar.gz"))
       (sha256
        (base32
-        "164rns26aqfqx2hwi0qq3scl50s69japn0fvgvrjsbyg7r1mxf67"))))
+        "1mci5i8mjqmljmv33h0q3d4djc13zk1kfmb3fbvd3yy43x0m4h72"))))
     (build-system python-build-system)
     (inputs
      `(("python-setuptools" ,python-setuptools)))
-- 
2.1.4

Re: [PATCH 01/11] gnu: Bump python-six to 1.9.0.

[Thompson, David]

On Wed, Jul 15, 2015 at 7:32 PM, Cyril Roelandt <tipecaml@gmail.com> wrote:
> * gnu/packages/python.scm (python-six): Bump to 1.9.0.
> ---
>  gnu/packages/python.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 5dcaba0..2ba7178 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -532,7 +532,7 @@ password storage.")
>  (define-public python-six
>    (package
>      (name "python-six")
> -    (version "1.7.2")
> +    (version "1.9.0")
>      (source
>       (origin
>        (method url-fetch)
> @@ -540,7 +540,7 @@ password storage.")
>                            "six/six-" version ".tar.gz"))
>        (sha256
>         (base32
> -        "164rns26aqfqx2hwi0qq3scl50s69japn0fvgvrjsbyg7r1mxf67"))))
> +        "1mci5i8mjqmljmv33h0q3d4djc13zk1kfmb3fbvd3yy43x0m4h72"))))
>      (build-system python-build-system)
>      (inputs
>       `(("python-setuptools" ,python-setuptools)))
> --
> 2.1.4
>
>

LGTM

- Dave

Re: [PATCH 01/11] gnu: Bump python-six to 1.9.0.

[Cyril Roelandt]

On 07/20/2015 07:41 PM, Thompson, David wrote:
> On Wed, Jul 15, 2015 at 7:32 PM, Cyril Roelandt <tipecaml@gmail.com> wrote:
>> * gnu/packages/python.scm (python-six): Bump to 1.9.0.
>> ---
...
>>
>>
> 
> LGTM
> 

Pushed in 98bdee6725a83c7f6d3011cca2e87e31165adb57 .

Cyril.

[PATCH 02/11] gnu: Add oslotest.

[Cyril Roelandt]

* gnu/packages/openstack.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it here.
* gnu/packages/python.scm (python-appdirs, python2-appdirs): New variables.
---
 gnu-system.am              |   1 +
 gnu/packages/openstack.scm | 179 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    |  27 +++++++
 3 files changed, 207 insertions(+)
 create mode 100644 gnu/packages/openstack.scm

diff --git a/gnu-system.am b/gnu-system.am
index 27f8923..340967d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -231,6 +231,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/onc-rpc.scm			\
   gnu/packages/openbox.scm			\
   gnu/packages/openldap.scm			\
+  gnu/packages/openstack.scm 			\
   gnu/packages/orpheus.scm			\
   gnu/packages/ots.scm				\
   gnu/packages/package-management.scm		\
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
new file mode 100644
index 0000000..a02f4f0
--- /dev/null
+++ b/gnu/packages/openstack.scm
@@ -0,0 +1,179 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages openstack)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages version-control)
+  #:use-module (guix build-system python)
+  #:use-module (guix download)
+  #:use-module ((guix licenses)
+                #:select (asl2.0))
+  #:use-module (guix packages))
+
+(define-public python-mox3
+  (package
+  (name "python-mox3")
+  (version "0.8.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/m/mox3/mox3-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1dwj9lkifdqvrcympqa47bj55l0n0j9jhzv2gj03h0dpzg6mgfkj"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-fixtures" ,python-fixtures)
+      ("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ("python-six" ,python-six)
+      ("python-testtools" ,python-testtools)))
+  (home-page "http://www.openstack.org/")
+  (synopsis "Mock object framework for Python")
+  (description
+    "Mox3 is an unofficial port of the Google mox framework
+(http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible
+with mox as possible, but small enhancements have been made. The library was
+tested on Python version 3.2, 2.7 and 2.6.")
+  (license asl2.0)))
+
+(define-public python2-mox3
+  (package-with-python2 python-mox3))
+
+(define-public python-os-client-config
+  (package
+  (name "python-os-client-config")
+  (version "1.4.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/os-client-config/os-client-config-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "14png6ml3zbbilh8bihav24f8vig9lyijwynnjcvazdxxrzvwq9j"))))
+  (build-system python-build-system)
+  (arguments
+   `(#:tests? #f)) ;; Circular dependency with python-oslotest
+  (inputs
+    `(("python-appdirs" ,python-appdirs)
+      ("python-fixtures" ,python-fixtures)
+      ("python-mimeparse" ,python-mimeparse)
+      ("python-pbr" ,python-pbr)
+      ("python-pyyaml" ,python-pyyaml)
+      ("python-testrepository" ,python-testrepository)
+      ("python-setuptools" ,python-setuptools)
+      ("python-testscenarios" ,python-testscenarios)
+      ("python-testtools" ,python-testtools)))
+  (home-page "http://www.openstack.org/")
+  (synopsis
+    "OpenStack Client Configuration Library")
+  (description
+    "The OpenStack Client Configuration Library is a library for collecting
+client configuration for using an OpenStack cloud in a consistent and
+comprehensive manner.")
+  (license asl2.0)))
+
+(define-public python2-os-client-config
+  (package-with-python2 python-os-client-config))
+
+(define-public python-pbr
+  (package
+  (name "python-pbr")
+  (version "1.2.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/p/pbr/pbr-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1l2mls8wnwpkqj6hxsphq7xibbbsf40gg37wc30nj4r600zgqhqm"))))
+  (build-system python-build-system)
+  (arguments
+   `(#:tests? #f)) ;; Most tests seem to use the Internet.
+  (propagated-inputs
+    `(("python-testrepository" ,python-testrepository)
+      ("git" ,git))) ;; pbr actually uses the "git" binary.
+  (inputs
+    `(("python-fixtures" ,python-fixtures)
+      ("python-mimeparse" ,python-mimeparse)
+      ("python-mock" ,python-mock)
+      ("python-setuptools" ,python-setuptools)
+      ("python-six" ,python-six)
+      ("python-sphinx" ,python-sphinx)
+      ("python-testrepository" ,python-testrepository)
+      ("python-testresources" ,python-testresources)
+      ("python-testscenarios" ,python-testscenarios)
+      ("python-testtools" ,python-testtools)
+      ("python-virtualenv" ,python-virtualenv)))
+  (home-page "https://launchpad.net/pbr")
+  (synopsis "Python Build Reasonableness")
+  (description
+    "PBR is a library that injects some useful and sensible default behaviors
+into your setuptools run.")
+  (license asl2.0)))
+
+(define-public python2-pbr
+  (package-with-python2 python-pbr))
+
+;; Packages from the Oslo library
+(define-public python-oslotest
+  (package
+    (name "python-oslotest")
+    (version "1.8.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/source/o/oslotest/oslotest-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "175dln2zxjvvh4b23f2hln6zwfy2v5f1blg7mxbwl4r3130zvs2k"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-fixtures" ,python-fixtures)
+        ("python-mock" ,python-mock)
+        ("python-six" ,python-six)))
+    (inputs
+      `(("python-pbr" ,python-pbr)
+        ("python-mox3" ,python-mox3)
+        ("python-os-client-config" ,python-os-client-config)
+        ("python-setuptools" ,python-setuptools)
+        ("python-subunit" ,python-subunit)
+        ("python-testrepository" ,python-testrepository)
+        ("python-testscenarios" ,python-testscenarios)
+        ("python-testtools" ,python-testtools)))
+    (home-page "http://launchpad.net/oslo")
+    (synopsis "Oslo test framework")
+    (description
+      "The Oslo Test framework provides common fixtures, support for debugging,
+and better support for mocking results.")
+    (license asl2.0)))
+
+(define-public python2-oslotest
+  (package-with-python2 python-oslotest))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2ba7178..feb0575 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4051,3 +4051,30 @@ complexity of Python source code.")
 
 (define-public python2-flake8
   (package-with-python2 python-flake8))
+
+(define-public python-appdirs
+  (package
+  (name "python-appdirs")
+  (version "1.4.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/a/appdirs/appdirs-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1iddva7v3fq0aqzsahkazxr7vpw28mqcrsy818z4wyiqnkplbhlg"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-setuptools" ,python-setuptools)))
+  (home-page "http://github.com/ActiveState/appdirs")
+  (synopsis
+    "A small Python module for determining appropriate \" +         \"platform-specific dirs, e.g. a \"user data dir\".")
+  (description
+    "A small Python module for determining appropriate \" +         \"platform-specific dirs, e.g. a \"user data dir\".")
+  (license license:expat)))
+
+(define-public python2-appdirs
+  (package-with-python2 python-appdirs))
-- 
2.1.4

Re: [PATCH 02/11] gnu: Add oslotest.

[Mathieu Lirzin]

Hi,

I've not test it but I have some stylistic remarks :). Most of them apply
to other parts of your patch and to the other patches.

Cyril Roelandt <tipecaml@gmail.com> writes:

> +(define-public python-mox3
> +  (package
> +  (name "python-mox3")
     ^
It should be indent under the first 'a'.

> +      (uri (string-append
> +             "https://pypi.python.org/packages/source/m/mox3/mox3-"
> +             version
> +             ".tar.gz"))
                ^
In Emacs the indentation is made under the "s" of string-append, but what
about something more compact like this:

   (uri (string-append "https://pypi.python.org/packages/source/m/"
                       "mox3/mox3-" version ".tar.gz"))

> +   `(#:tests? #f)) ;; Circular dependency with python-oslotest
                      ^^
only one ';' should be used for comments on the same line.

> +;; Packages from the Oslo library
> +(define-public python-oslotest

--8<---------------cut here---------------start------------->8---
\f
;;;
;;; Packages from the Oslo library.
;;;

(define-public python-oslotest
--8<---------------cut here---------------end--------------->8---


> +        ("python-six" ,python-six)))
> +    (inputs
> +      `(("python-pbr" ,python-pbr)
                    ^^^
> +        ("python-mox3" ,python-mox3)
> +        ("python-os-client-config" ,python-os-client-config)
> +        ("python-setuptools" ,python-setuptools)
> +        ("python-subunit" ,python-subunit)
> +        ("python-testrepository" ,python-testrepository)
> +        ("python-testscenarios" ,python-testscenarios)
> +        ("python-testtools" ,python-testtools)))

Since the rest is ordered lexicographically... :)

> +  (home-page "http://github.com/ActiveState/appdirs")
> +  (synopsis
> +    "A small Python module for determining appropriate \" +         \"platform-specific dirs, e.g. a \"user data dir\".")
> +  (description
> +    "A small Python module for determining appropriate \" +         \"platform-specific dirs, e.g. a \"user data dir\".")

I guess this is something not intentional.

--
Mathieu Lirzin

Re: [PATCH 02/11] gnu: Add oslotest.

[Cyril Roelandt]

On 07/16/2015 01:10 PM, Mathieu Lirzin wrote:
> Hi,
> 
> I've not test it but I have some stylistic remarks :). Most of them apply
> to other parts of your patch and to the other patches.
> 

Oh, Indeed, I screwed up the indentation everywhere :/ I'll fix it when
resending the patches if it is needed.

> Cyril Roelandt <tipecaml@gmail.com> writes:
> 
>> +  (home-page "http://github.com/ActiveState/appdirs")
>> +  (synopsis
>> +    "A small Python module for determining appropriate \" +         \"platform-specific dirs, e.g. a \"user data dir\".")
>> +  (description
>> +    "A small Python module for determining appropriate \" +         \"platform-specific dirs, e.g. a \"user data dir\".")
> 
> I guess this is something not intentional.
> 

To be honest, I have no idea of what this package does, so I thought I'd
just use the synopsis as a description :)


Cyril.

Re: [PATCH 02/11] gnu: Add oslotest.

[Thompson, David]

On Wed, Jul 15, 2015 at 7:32 PM, Cyril Roelandt <tipecaml@gmail.com> wrote:
> * gnu/packages/openstack.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it here.
> * gnu/packages/python.scm (python-appdirs, python2-appdirs): New variables.

Could you break this patch so that there is one package per patch?
Also, all of the Python packages in openstack.scm look like they
really belong in python.scm.  Could you move them?

Thanks,

- Dave

Re: [PATCH 02/11] gnu: Add oslotest.

[Cyril Roelandt]

On 07/20/2015 06:14 PM, Thompson, David wrote:
> On Wed, Jul 15, 2015 at 7:32 PM, Cyril Roelandt <tipecaml@gmail.com> wrote:
>> * gnu/packages/openstack.scm: New file.
>> * gnu-system.am (GNU_SYSTEM_MODULES): Add it here.
>> * gnu/packages/python.scm (python-appdirs, python2-appdirs): New variables.
> 
> Could you break this patch so that there is one package per patch?

Hum, I'm not sure whether that really makes sense. The main "feature" I
want to add is the package for oslotest, so it seemed natural to add its
dependencies in the same patch, especially since there is only one.
Plus, this would make this patch series *huge*. Do we really want that?

> Also, all of the Python packages in openstack.scm look like they
> really belong in python.scm.  Could you move them?
> 

Well, in the end, we could have everything from PyPI in python.scm.
OpenStack is a huge project, so I thought it would make sense to have
its packages in their own file. WDYT?


Thanks for the review,
Cyril.

Re: [PATCH 02/11] gnu: Add oslotest.

[Ian Denhardt]

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

Quoting Cyril Roelandt (2015-07-22 18:13:22)
> Well, in the end, we could have everything from PyPI in python.scm.
> OpenStack is a huge project, so I thought it would make sense to have
> its packages in their own file. WDYT?

This matches my gut as well.

-Ian

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABCAAGBQJVsEk9AAoJEPZUuMfUyjy4MOQP/0wYTYW9yo2TjzFnw45+jUsh
ZVdHLl4crhuoO/gY1sTP7UuEaxqQspxFJvNXN0BZVEllttr7XHOv5aLFrcYm5cnf
zPPhfrKp4S3aifQueKAeqoKpgiGWpP/Hpfk/5lFbkLdnrz1Yz5UnYJk20gZSkPQx
WRfVt1EKZ88Qxe3hjoRWRi+FZplA4HDknayF8Ml7PB9lB0rRHJIgEJV4PC5VZi0w
PVMQzRSn/UVe1U5e3R2tXKt7EK+XQv2OD3i365lv63fwQFZGptN8HyddpTDDEUYq
mk7u97k3esjhEf6Xlr3JFC2ejrJJlC4NkGVAgPs1EDUIz3MsUSYC9hgXAYc2it23
oFnPrlzqKYjbkBnzOeCtSDw9CUWfVFCHt7pxe+CWdE5idW81QiVJ/3q1/VlyVYrN
eAip6+KMp4HYxP2FG1mKokOAoWZzvTGgkyRzu16GhHGIF94TXxRm2odxHnQ/5WsR
RWH0+2fieqSDHdPpmsYvb+J1jx9aP96FdtWRgKrk9Y2/+MYhyOgl4jdL1lqbx1QE
/ZREWeVslXeTxwy+S7g7xBMb59CdLdH++2u0Pyv8V2yL5rP11JUT19jU7jKUnGhC
Cx7UWVLJJEEMYL/oye5RCz0nqE6jka9K9qJqNvoKDKOaTMrTsyIc+S8Gvfl7IwJ/
AnhiDh1uJNgfMvStAApU
=E68n
-----END PGP SIGNATURE-----

Re: [PATCH 02/11] gnu: Add oslotest.

[Thompson, David]

On Wed, Jul 22, 2015 at 6:13 PM, Cyril Roelandt <tipecaml@gmail.com> wrote:
> On 07/20/2015 06:14 PM, Thompson, David wrote:
>> On Wed, Jul 15, 2015 at 7:32 PM, Cyril Roelandt <tipecaml@gmail.com> wrote:
>>> * gnu/packages/openstack.scm: New file.
>>> * gnu-system.am (GNU_SYSTEM_MODULES): Add it here.
>>> * gnu/packages/python.scm (python-appdirs, python2-appdirs): New variables.
>>
>> Could you break this patch so that there is one package per patch?
>
> Hum, I'm not sure whether that really makes sense. The main "feature" I
> want to add is the package for oslotest, so it seemed natural to add its
> dependencies in the same patch, especially since there is only one.

The commit log doesn't show this, though.  According to your log, 2
new variables were added, but it turns out there were more upon closer
inspection.

We view each additional package as a logical change that should be in
its own commit.  And just to prevent any further confusion, the
'python2' variant of a package can be included in the patch for the
python3 version.

> Plus, this would make this patch series *huge*. Do we really want that?

I'd rather not hide that fact by stuffing more packages into a patch
than there ought to be.

>> Also, all of the Python packages in openstack.scm look like they
>> really belong in python.scm.  Could you move them?
>>
>
> Well, in the end, we could have everything from PyPI in python.scm.
> OpenStack is a huge project, so I thought it would make sense to have
> its packages in their own file. WDYT?

If they are solely for OpenStack then that's fine.

Thanks,

- Dave

Re: [PATCH 02/11] gnu: Add oslotest.

[Ludovic Courtès]

Agreed on all points.

We can start a first round of review, though.

Ludo’.

Re: [PATCH 02/11] gnu: Add oslotest.

[Cyril Roelandt]

On 07/23/2015 04:06 AM, Thompson, David wrote:
> If they are solely for OpenStack then that's fine.

I was thinking of having all packages managed by OpenStack inside
openstack.scm. Now obviously, they can be used by anyone, since you can
just import any Python package from another Python program.


Cyril.

Re: [PATCH 02/11] gnu: Add oslotest.

[Thompson, David]

On Thu, Jul 23, 2015 at 12:46 PM, Cyril Roelandt <tipecaml@gmail.com> wrote:
> On 07/23/2015 04:06 AM, Thompson, David wrote:
>> If they are solely for OpenStack then that's fine.
>
> I was thinking of having all packages managed by OpenStack inside
> openstack.scm. Now obviously, they can be used by anyone, since you can
> just import any Python package from another Python program.

I should rephrase: It seems like these packages are indeed created for
OpenStack (the "os" prefix), so I think openstack.scm is a fine place
for them.

Sorry for the confusion!

- Dave

[PATCH 03/11] gnu: Add oslo.i18n.

[Cyril Roelandt]

* gnu/packages/python.scm (python-testools): turn python-fixtures and
  python-testtools into propagated inputs.
* gnu/packages/openstack.scm (python-oslo.i18n, python2-oslo.i18n): New
  variables.
---
 gnu/packages/openstack.scm | 34 ++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    |  5 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index a02f4f0..9536578 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -140,6 +140,40 @@ into your setuptools run.")
   (package-with-python2 python-pbr))
 
 ;; Packages from the Oslo library
+(define-public python-oslo.i18n
+  (package
+  (name "python-oslo.i18n")
+  (version "2.1.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.i18n/oslo.i18n-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "0762dwhaswqqkg5qff11cd4y4b8vbh4qrqh9bd24cv8h75ay2f0s"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-babel" ,python-babel)))
+  (inputs
+    `(("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ("python-six" ,python-six)
+      ;; Tests
+      ("python-mock" ,python-mock)
+      ("python-mox3" ,python-mox3)
+      ("python-oslotest" ,python-oslotest)
+      ("python-testscenarios" ,python-testscenarios)))
+  (home-page "http://launchpad.net/oslo")
+  (synopsis "Oslo i18n library")
+  (description "Oslo i18n library")
+  (license asl2.0)))
+
+(define-public python2-oslo.i18n
+  (package-with-python2 python-oslo.i18n))
+
 (define-public python-oslotest
   (package
     (name "python-oslotest")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index feb0575..dde487c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1459,11 +1459,12 @@ Python tests.")
         (base32
          "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"))))
     (build-system python-build-system)
+    (propagated-inputs
+     `(("python-fixtures" ,python-fixtures)
+       ("python-testtools" ,python-testtools)))
     (inputs
      `(("python-setuptools" ,python-setuptools)
-       ("python-testtools" ,python-testtools)
        ("python-subunit" ,python-subunit)
-       ("python-fixtures" ,python-fixtures)
        ("python-mimeparse" ,python-mimeparse)))
     (home-page "https://launchpad.net/testrepository")
     (synopsis "Database for Python test results")
-- 
2.1.4

[PATCH 04/11] gnu: Add oslo.config

[Cyril Roelandt]

* gnu/packages/python.scm (python-netaddr, python2-netaddr): New variables.
* gnu/packages/openstack.scm (python-stevedore, python2-stevedore,
  python-oslo.config, python2-oslo.config): New variables.
---
 gnu/packages/openstack.scm | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    | 28 ++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 9536578..d117a4f 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -139,7 +139,88 @@ into your setuptools run.")
 (define-public python2-pbr
   (package-with-python2 python-pbr))
 
+(define-public python-stevedore
+  (package
+    (name "python-stevedore")
+    (version "1.6.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/source/s/stevedore/stevedore-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "09gcy9gqyp2nzyh2yipwnw7vxfxfc2al5q1gd8g6abvlxhqsmcns"))))
+    (build-system python-build-system)
+    (inputs
+      `(("python-pbr" ,python-pbr)
+        ("python-setuptools" ,python-setuptools)
+        ("python-six" ,python-six)
+        ;; Tests
+        ("python-docutils" ,python-docutils)
+        ("python-mock" ,python-mock)
+        ("python-oslotest" ,python-oslotest)
+        ("python-sphinx" ,python-sphinx)))
+    (home-page
+      "https://github.com/dreamhost/stevedore")
+    (synopsis
+      "Manage dynamic plugins for Python applications")
+    (description
+      "Python makes loading code dynamically easy, allowing you to configure
+and extend your application by discovering and loading extensions (“plugins”)
+at runtime.  Many applications implement their own library for doing this,
+using __import__ or importlib.  stevedore avoids creating yet another extension
+mechanism by building on top of setuptools entry points.  The code for managing
+entry points tends to be repetitive, though, so stevedore provides manager
+classes for implementing common patterns for using dynamically loaded
+extensions.")
+    (license asl2.0)))
+
+(define-public python2-stevedore
+  (package-with-python2 python-stevedore))
+
+
 ;; Packages from the Oslo library
+(define-public python-oslo.config
+  (package
+  (name "python-oslo.config")
+  (version "1.15.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.config/oslo.config-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "0nn522k6ba3zbi5d20j28fvcpn0d1rxh6zq1nfdlii7325rxv4y4"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-netaddr" ,python-netaddr)
+      ("python-six" ,python-six)))
+  (inputs
+    `(("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ("python-stevedore" ,python-stevedore)
+      ;; Tests
+      ("python-oslo.i18n" ,python-oslo.i18n)
+      ("python-mock" ,python-mock)
+      ("python-oslotest" ,python-oslotest)
+      ("python-testscenarios" ,python-testscenarios)
+    ))
+  (home-page "https://launchpad.net/oslo")
+  (synopsis "Oslo Configuration API")
+  (description
+    "The Oslo configuration API supports parsing command line arguments and
+.ini style configuration files.")
+  (license asl2.0)))
+
+(define-public python2-oslo.config
+  (package-with-python2 python-oslo.config))
+
 (define-public python-oslo.i18n
   (package
   (name "python-oslo.i18n")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index dde487c..1e697ec 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4079,3 +4079,31 @@ complexity of Python source code.")
 
 (define-public python2-appdirs
   (package-with-python2 python-appdirs))
+
+(define-public python-netaddr
+  (package
+  (name "python-netaddr")
+  (version "0.7.15")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/n/netaddr/netaddr-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "04cxabslvd43jhrvbssvkssqyzaiczjpdf1b4cyzk54s9qzvpdfm"))))
+  (build-system python-build-system)
+  (arguments `(#:tests? #f)) ;; No tests.
+  (inputs
+    `(("python-setuptools" ,python-setuptools)))
+  (home-page "https://github.com/drkjam/netaddr/")
+  (synopsis
+    "Pythonic manipulation of IPv4, IPv6, CIDR, EUI and MAC network addresses")
+  (description
+    "A Python library for representing and manipulating network addresses.")
+  (license bsd-3)))
+
+(define-public python2-netaddr
+  (package-with-python2 python-netaddr))
-- 
2.1.4

[PATCH 05/11] gnu: Add oslo.utils.

[Cyril Roelandt]

* gnu/packages/python.scm (python-wrapt, python2-wrapt, python-iso8601,
  python2-iso8601, python-monotonic python2-monotonic): New variables.
* gnu/packages/openstack.scm (python-debtcollector, python2-debtcollector,
  python-oslo.util python2-oslo.util): New variables.
---
 gnu/packages/openstack.scm | 84 +++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    | 90 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index d117a4f..3a3b129 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -25,6 +25,42 @@
                 #:select (asl2.0))
   #:use-module (guix packages))
 
+(define-public python-debtcollector
+  (package
+  (name "python-debtcollector")
+  (version "0.5.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/d/debtcollector/"
+             "debtcollector-" version ".tar.gz"))
+      (sha256
+        (base32
+          "0amlcg5f98lk2mfzdg44slh1nsi2y4ds123g5d57376fjk2b3njd"))))
+  (build-system python-build-system)
+  (propagated-inputs
+   `(("python-wrapt" ,python-wrapt)))
+  (inputs
+    `(("python-babel" ,python-babel)
+      ("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ("python-six" ,python-six)
+      ("python-wrapt" ,python-wrapt)
+      ;; Tests.
+      ("python-oslotest" ,python-oslotest)))
+  (home-page "http://www.openstack.org/")
+  (synopsis
+    "A collection of Python deprecation patterns and strategies that help you
+collect your technical debt in a non-destructive manner.")
+  (description
+    "A collection of Python deprecation patterns and strategies that help you
+collect your technical debt in a non-destructive manner.")
+  (license asl2.0)))
+
+(define-public python2-debtcollector
+  (package-with-python2 python-debtcollector))
+
 (define-public python-mox3
   (package
   (name "python-mox3")
@@ -292,3 +328,51 @@ and better support for mocking results.")
 
 (define-public python2-oslotest
   (package-with-python2 python-oslotest))
+
+(define-public python-oslo.utils
+  (package
+  (name "python-oslo.utils")
+  (version "1.9.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.utils/oslo.utils-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1amhpachr5b5r03rz51ydwxa5d61hlv71ipmfhhi8hkg98njrcaw"))
+      (snippet
+       '(begin
+          ;; setuptools fails to import these files during the test phase.
+          (delete-file "tests/test_netutils.py")
+          (delete-file "oslo_utils/tests/test_netutils.py")))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-debtcollector" ,python-debtcollector)
+      ("python-oslo.i18n" ,python-oslo.i18n)
+      ("python-iso8601" ,python-iso8601)
+      ("python-monotonic" ,python-monotonic)
+      ("python-netaddr" ,python-netaddr)
+      ("python-netifaces" ,python-netifaces)
+      ("python-pytz" ,python-pytz)
+      ("python-six" ,python-six)))
+  (inputs
+    `(("python-babel" ,python-babel)
+      ("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ;; Tests.
+      ("python-oslotest" ,python-oslotest)
+      ("python-mock" ,python-mock)
+      ("python-mox3" ,python-mox3)
+      ("python-testscenarios" ,python-testscenarios)))
+  (home-page "http://launchpad.net/oslo")
+  (synopsis "Oslo Utility library")
+  (description
+    "The oslo.utils library provides support for common utility type functions,
+such as encoding, exception handling, string manipulation, and time handling.")
+  (license asl2.0)))
+
+(define-public python2-oslo.utils
+  (package-with-python2 python-oslo.utils))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1e697ec..62521c9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4107,3 +4107,93 @@ complexity of Python source code.")
 
 (define-public python2-netaddr
   (package-with-python2 python-netaddr))
+
+(define-public python-wrapt
+  (package
+  (name "python-wrapt")
+  (version "1.10.5")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/w/wrapt/wrapt-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "0cq8rlpzkxzk48b50yrfhzn1d1hrq4gjcdqlrgq4v5palgiv9jwr"))))
+  (build-system python-build-system)
+  (arguments
+   ;; Lots of different test configurations. TODO: run them all.
+   `(#:tests? #f))
+  (inputs
+    `(("python-setuptools" ,python-setuptools)))
+  (home-page
+    "https://github.com/GrahamDumpleton/wrapt")
+  (synopsis
+    "A Python module for decorators, wrappers and monkey patching.")
+  (description
+    "The aim of the wrapt module is to provide a transparent object proxy for
+Python, which can be used as the basis for the construction of function
+wrappers and decorator functions.")
+  (license bsd-2)))
+
+(define-public python2-wrapt
+  (package-with-python2 python-wrapt))
+
+(define-public python-iso8601
+  (package
+  (name "python-iso8601")
+  (version "0.1.10")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/i/iso8601/iso8601-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1qf01afxh7j4gja71vxv345if8avg6nnm0ry0zsk6j3030xgy4p7"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-setuptools" ,python-setuptools)))
+  (home-page
+    "https://bitbucket.org/micktwomey/pyiso8601")
+  (synopsis
+    "Simple module to parse ISO 8601 dates")
+  (description
+    "This module parses the most common forms of ISO 8601 date strings (e.g.
+2007-01-14T20:34:22+00:00) into datetime objects.")
+  (license license:expat)))
+
+(define-public python2-iso8601
+  (package-with-python2 python-iso8601))
+
+(define-public python-monotonic
+  (package
+  (name "python-monotonic")
+  (version "0.2")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/m/monotonic/monotonic-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1a24fr92qafmpspxscvn5ld4x293flv4ram2bq9iiqj3ba3ixs65"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-setuptools" ,python-setuptools)))
+  (home-page "https://github.com/atdt/monotonic")
+  (synopsis
+    "An implementation of time.monotonic() for Python 2 & < 3.3")
+  (description
+    "This module provides a monotonic() function which returns the value (in
+fractional seconds) of a clock which never goes backwards.")
+  (license asl2.0)))
+
+(define-public python2-monotonic
+  (package-with-python2 python-monotonic))
-- 
2.1.4

[PATCH 06/11] gnu: Add oslo.context.

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-oslo.context, python2-oslo.context): New
  variables.
---
 gnu/packages/openstack.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 3a3b129..584a530 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -257,6 +257,38 @@ extensions.")
 (define-public python2-oslo.config
   (package-with-python2 python-oslo.config))
 
+(define-public python-oslo.context
+  (package
+  (name "python-oslo.context")
+  (version "0.4.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.context/oslo.context-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "131cn2vh4z2iggzcsqnfyi93g08x6pnsk77qilzbikp5g8x4d069"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-babel" ,python-babel)
+      ("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ;; Tests.
+      ("python-oslotest" ,python-oslotest)))
+  (home-page "http://launchpad.net/oslo")
+  (synopsis "Oslo Context library")
+  (description
+    "The Oslo context library has helpers to maintain useful information about
+a request context. The request context is usually populated in the WSGI
+pipeline and used by various modules such as logging.")
+  (license asl2.0)))
+
+(define-public python2-oslo.context
+  (package-with-python2 python-oslo.context))
+
 (define-public python-oslo.i18n
   (package
   (name "python-oslo.i18n")
-- 
2.1.4

[PATCH 07/11] gnu: Add oslo.serialization.

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-oslo.serialization,
  python2-oslo.serialization): New variables.
---
 gnu/packages/openstack.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 584a530..c67108f 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -323,6 +323,44 @@ pipeline and used by various modules such as logging.")
 (define-public python2-oslo.i18n
   (package-with-python2 python-oslo.i18n))
 
+(define-public python-oslo.serialization
+  (package
+  (name "python-oslo.serialization")
+  (version "1.7.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.serialization/oslo.serialization-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "04k47xqdv7wpdd4j60856h489h3vsp86fqzszhq5ba9ypblk4kqn"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-babel" ,python-babel)
+      ("python-iso8601" ,python-iso8601)
+      ;("python-msgpack-python" ,python-msgpack-python)
+      ("python-oslo.utils" ,python-oslo.utils)
+      ("python-pbr" ,python-pbr)
+      ("python-pytz" ,python-pytz)
+      ("python-setuptools" ,python-setuptools)
+      ("python-simplejson" ,python-simplejson)
+      ("python-six" ,python-six)
+      ;; Tests.
+      ("python-mock" ,python-mock)
+      ("python-netaddr" ,python-netaddr)
+      ("python-oslo.i18n" ,python-oslo.i18n)
+      ("python-oslotest" ,python-oslotest)))
+  (home-page "http://launchpad.net/oslo")
+  (synopsis "Oslo Serialization library")
+  (description "Oslo Serialization library")
+  (license asl2.0)))
+
+(define-public python2-oslo.serialization
+  (package-with-python2 python-oslo.serialization))
+
 (define-public python-oslotest
   (package
     (name "python-oslotest")
-- 
2.1.4

[PATCH 08/11] gnu: Add oslo.log.

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-oslo.log, python2-oslo.log): New
  variables.
---
 gnu/packages/openstack.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index c67108f..092ee5d 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -323,6 +323,47 @@ pipeline and used by various modules such as logging.")
 (define-public python2-oslo.i18n
   (package-with-python2 python-oslo.i18n))
 
+(define-public python-oslo.log
+  (package
+  (name "python-oslo.log")
+  (version "1.6.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.log/oslo.log-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1fhy6yvbd565nv4x4i3ppyrlbmz3yy9d0xsvw5nkqsa7g43nmf8z"))))
+  (build-system python-build-system)
+  (propagated-inputs
+   `(("python-debtcollector" ,python-debtcollector)
+     ("python-oslo.config" ,python-oslo.config)
+     ("python-oslo.context" ,python-oslo.context)
+     ("python-oslo.i18n" ,python-oslo.i18n)
+     ("python-oslo.utils" ,python-oslo.utils)
+     ("python-oslo.serialization" ,python-oslo.serialization)
+      ("python-six" ,python-six)))
+  (inputs
+    `(("python-babel" ,python-babel)
+      ("python-iso8601" ,python-iso8601)
+      ("python-mock" ,python-mock)
+      ("python-oslotest" ,python-oslotest)
+      ("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)))
+  (home-page "http://launchpad.net/oslo")
+  (synopsis "oslo.log library")
+  (description
+    "The oslo.log (logging) configuration library provides standardized
+configuration for all openstack projects. It also provides custom formatters,
+handlers and support for context specific logging (like resource id’s etc).")
+  (license asl2.0)))
+
+(define-public python2-oslo.log
+  (package-with-python2 python-oslo.log))
+
 (define-public python-oslo.serialization
   (package
   (name "python-oslo.serialization")
-- 
2.1.4

[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

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

[Cyril Roelandt]

On 07/16/2015 01:32 AM, Cyril Roelandt wrote:
> * 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(+)

OK, let's drop this patch. To package oslo.cache properly, I'd also need
to package pymongo, and probably mongodb. I'll do this later if I really
need oslo.cache.

Cyril.

[PATCH 10/11] gnu: Add oslo.middleware.

[Cyril Roelandt]

* gnu/packages/python.scm (python-webob, python2-webob): New variables.
* gnu/packages/openstack.scm (python-oslo.middleware, python2-oslo.middleware):
  New variables.
---
 gnu/packages/openstack.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    | 28 ++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index b35b8ca..b324d3e 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -407,6 +407,48 @@ handlers and support for context specific logging (like resource id’s etc).")
 (define-public python2-oslo.log
   (package-with-python2 python-oslo.log))
 
+(define-public python-middleware
+  (package
+  (name "python-oslo.middleware")
+  (version "2.4.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/o/oslo.middleware/oslo.middleware-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "19x6lv52zlansp0j62sb1kxxh4ba787gl9wjzwbhl6ygjf2cfaz9"))))
+  (build-system python-build-system)
+  (propagated-inputs
+    `(("python-oslo.config" ,python-oslo.config)
+      ("python-oslo.context" ,python-oslo.context)
+      ("python-oslo.i18n" ,python-oslo.i18n)
+      ("python-six" ,python-six)
+      ("python-webob" ,python-webob)))
+  (inputs
+    `(("python-babel" ,python-babel)
+      ("python-pbr" ,python-pbr)
+      ("python-setuptools" ,python-setuptools)
+      ("python-stevedore" ,python-stevedore)
+      ;; Tests.
+      ("python-mock" ,python-mock)
+      ("python-mox3" ,python-mox3)
+      ("python-oslotest" ,python-oslotest)))
+  (home-page "http://launchpad.net/oslo")
+  (synopsis "Oslo Middleware library")
+  (description
+    "Oslo middleware library includes components that can be injected into wsgi
+pipelines to intercept request/response flows.  The base class can be enhanced
+with functionality like add/delete/modification of http headers and support for
+limiting size/connection etc.")
+  (license asl2.0)))
+
+(define-public python2-middleware
+  (package-with-python2 python-middleware))
+
 (define-public python-oslo.serialization
   (package
   (name "python-oslo.serialization")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 31d752d..6b69dd5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4363,3 +4363,31 @@ information.")
 
 (define-public python2-memcached
   (package-with-python2 python-memcached))
+
+(define-public python-webob
+  (package
+  (name "python-WebOb")
+  (version "1.4.1")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (string-append
+             "https://pypi.python.org/packages/source/W/WebOb/WebOb-"
+             version
+             ".tar.gz"))
+      (sha256
+        (base32
+          "1nz9m6ijf46wfn33zfza13c0k1n4kjnmn3icdlrlgz5yj21vky0j"))))
+  (build-system python-build-system)
+  (inputs
+    `(("python-nose" ,python-nose)
+      ("python-setuptools" ,python-setuptools)))
+  (home-page "http://webob.org/")
+  (synopsis "WSGI request and response object")
+  (description
+    "WebOb provides wrappers around the WSGI request environment, and an object
+to help create WSGI responses.")
+  (license license:expat)))
+
+(define-public python2-webob
+  (package-with-python2 python-webob))
-- 
2.1.4

[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