[PATCH 0/5] Add oslotest.

[PATCH 0/5] Add oslotest.

[Cyril Roelandt]

This is a resubmission of a previous patch, broken down into 5 smaller patches.

Cyril Roelandt (5):
  gnu: add python-appdirs.
  gnu: Add python-pbr.
  gnu: Add python-mox3.
  gnu: Add python-os-client-config
  gnu: Add python-oslotest

 gnu-system.am              |   1 +
 gnu/packages/openstack.scm | 179 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    |  29 ++++++++
 3 files changed, 209 insertions(+)
 create mode 100644 gnu/packages/openstack.scm

-- 
2.1.4

[PATCH 1/5] gnu: add python-appdirs.

[Cyril Roelandt]

* gnu/packages/python.scm (python-appdirs, python2-appdirs): New variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 940efec..7f48b5b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4629,3 +4629,32 @@ term.js Javascript terminal emulator library.")
                  ,python2-backport-ssl-match-hostname)
                 ,@(alist-delete "python-tornado"
                                 (package-propagated-inputs terminado)))))))
+
+(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
+      "This module provides an portable way of finding out where user data
+should be stored on various operating systems.")
+    (license license:expat)))
+
+(define-public python2-appdirs
+  (package-with-python2 python-appdirs))
-- 
2.1.4

[PATCH 2/5] gnu: Add python-pbr.

[Cyril Roelandt]

* gnu/packages/openstack.scm: New file.
* gnu-system.am: Add it.
---
 gnu-system.am              |  1 +
 gnu/packages/openstack.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 gnu/packages/openstack.scm

diff --git a/gnu-system.am b/gnu-system.am
index 9f46f7b..aa335e1 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -235,6 +235,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..1598020
--- /dev/null
+++ b/gnu/packages/openstack.scm
@@ -0,0 +1,68 @@
+;;; 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-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))
-- 
2.1.4

[PATCH 3/5] gnu: Add python-mox3.

[Cyril Roelandt]

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

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 1598020..eb3c606 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -25,6 +25,39 @@
                 #: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-pbr
   (package
     (name "python-pbr")
-- 
2.1.4

[PATCH 4/5] gnu: Add python-os-client-config

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-os-client-config,
                              python2-os-client-config): New variables.
---
 gnu/packages/openstack.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index eb3c606..1a7820a 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -55,6 +55,45 @@ 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 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 python2-mox3
   (package-with-python2 python-mox3))
 
-- 
2.1.4

[PATCH 5/5] gnu: Add python-oslotest

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-oslotest, python2-olsotest): New variables.
---
 gnu/packages/openstack.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 1a7820a..f79dba0 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -138,3 +138,42 @@ tested on Python version 3.2, 2.7 and 2.6.")
 
 (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))
-- 
2.1.4

Re: [PATCH 1/5] gnu: add python-appdirs.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/python.scm (python-appdirs, python2-appdirs): New variables.

[...]

> +    (synopsis
> +      "A small Python module for determining appropriate platform-specific
> +dirs, e.g. a \"user data dir\".")

“Determine platform-specific directories”

> +    (description
> +      "This module provides an portable way of finding out where user data

s/an/a/

OK with these changes.

(Please make sure to use ‘guix lint’ before submitting patches.)

Thanks,
Ludo’.

Re: [PATCH 2/5] gnu: Add python-pbr.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/openstack.scm: New file.
> * gnu-system.am: Add it.

[...]

> +    (home-page "https://launchpad.net/pbr")
> +    (synopsis "Python Build Reasonableness")

“Change the default behavior of Python’s setuptools” or something like
that.

> +    (description
> +      "PBR is a library that injects some useful and sensible default behaviors

“Python Build Reasonableness (PBR) is a library...”

OK with these changes.

Ludo’.

Re: [PATCH 3/5] gnu: Add python-mox3.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/openstack.scm (python-mox3, python2-mox3): New variables.

OK!

Re: [PATCH 4/5] gnu: Add python-os-client-config

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/openstack.scm (python-os-client-config,
>                               python2-os-client-config): New variables.

Please remove leading white space on second line.

OK with this change.

Ludo’.

Re: [PATCH 5/5] gnu: Add python-oslotest

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/openstack.scm (python-oslotest, python2-olsotest): New variables.

OK.

Thanks, and sorry for the looong delay!

Ludo’.

Re: [PATCH 4/5] gnu: Add python-os-client-config

[Mathieu Lirzin]

ludo@gnu.org (Ludovic Courtès) writes:

> Cyril Roelandt <tipecaml@gmail.com> skribis:
>
>> * gnu/packages/openstack.scm (python-os-client-config,
>>                               python2-os-client-config): New variables.
>
> Please remove leading white space on second line.

And with extra parentheses! ;)

--8<---------------cut here---------------start------------->8---
* gnu/packages/openstack.scm (python-os-client-config)
  (python2-os-client-config): New variables.
--8<---------------cut here---------------end--------------->8---

--
Mathieu Lirzin

Re: [PATCH 4/5] gnu: Add python-os-client-config

[Cyril Roelandt]

On 08/26/2015 12:24 AM, Mathieu Lirzin wrote:
> * gnu/packages/openstack.scm (python-os-client-config)
>   (python2-os-client-config): New variables.

Really? You're not supposed to write "FILE (VAR1, VAR2): New variables"?


Cyril.

Re: [PATCH 4/5] gnu: Add python-os-client-config

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

> On 08/26/2015 12:24 AM, Mathieu Lirzin wrote:
>> * gnu/packages/openstack.scm (python-os-client-config)
>>   (python2-os-client-config): New variables.
>
> Really? You're not supposed to write "FILE (VAR1, VAR2): New variables"?

In (info "(standards) Style of Change Logs") you can find this.

--8<---------------cut here---------------start------------->8---
   Break long lists of function names by closing continued lines with
`)', rather than `,', and opening the continuation with `(' as in this
example:

     * keyboard.c (menu_bar_items, tool_bar_items)
     (Fexecute_extended_command): Deal with `keymap' property.
--8<---------------cut here---------------end--------------->8---

--
Mathieu Lirzin

Re: [PATCH 4/5] gnu: Add python-os-client-config

[Alex Kost]

Mathieu Lirzin (2015-08-26 01:24 +0300) wrote:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Cyril Roelandt <tipecaml@gmail.com> skribis:
>>
>>> * gnu/packages/openstack.scm (python-os-client-config,
>>>                               python2-os-client-config): New variables.
>>
>> Please remove leading white space on second line.
>
> And with extra parentheses! ;)
>
>
> * gnu/packages/openstack.scm (python-os-client-config)
>   (python2-os-client-config): New variables.

There are many commits that use the following form:

* gnu/packages/openstack.scm (python-os-client-config,
  python2-os-client-config): New variables.

I think this ↑ is the preferable form used in Guix.

-- 
Alex

Re: [PATCH 4/5] gnu: Add python-os-client-config

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Mathieu Lirzin (2015-08-26 01:24 +0300) wrote:
>
>> ludo@gnu.org (Ludovic Courtès) writes:
>>
>>> Cyril Roelandt <tipecaml@gmail.com> skribis:
>>>
>>>> * gnu/packages/openstack.scm (python-os-client-config,
>>>>                               python2-os-client-config): New variables.
>>>
>>> Please remove leading white space on second line.
>>
>> And with extra parentheses! ;)
>>
>>
>> * gnu/packages/openstack.scm (python-os-client-config)
>>   (python2-os-client-config): New variables.
>
> There are many commits that use the following form:
>
> * gnu/packages/openstack.scm (python-os-client-config,
>   python2-os-client-config): New variables.
>
> I think this ↑ is the preferable form used in Guix.

Yes.  I’m fine either way though.  :-)

Ludo’.