[PATCH 00/10] Add python-barbicanclient.

[PATCH 00/10] Add python-barbicanclient.

[Cyril Roelandt]

This patch series adds python-barbicanclient, one of the CLI clients for
OpenStack.

Cyril.
---
Cyril Roelandt (10):
  gnu: python2-jsonschema: make python-functools32 a propagated input.
  gnu: Update python-unittest2 to 0.6.0
  gnu: Add python-cmd2.
  gnu: remove test-only depencies of python-pbr
  gnu: Add python-pyinotify.
  gnu: Update python-oslo.log to 3.5.0.
  gnu: Add python-funcsigs.
  gnu: Update python-mock to 2.0.0.
  gnu: Add python-cliff.
  gnu: Add python-barbicanclient.

 gnu/local.mk                                       |   3 +
 gnu/packages/openstack.scm                         | 112 ++++++++++++++-
 .../python-barbicanclient-assertItemsEqual.patch   |  48 +++++++
 .../patches/python-cliff-remove-unicodecsv.patch   |  11 ++
 .../patches/python-unittest2-skip-some-tests.patch |  18 +++
 gnu/packages/python.scm                            | 152 ++++++++++++++++-----
 6 files changed, 301 insertions(+), 43 deletions(-)
 create mode 100644 gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch
 create mode 100644 gnu/packages/patches/python-cliff-remove-unicodecsv.patch
 create mode 100644 gnu/packages/patches/python-unittest2-skip-some-tests.patch

-- 
2.6.2

[PATCH 01/10] gnu: python2-jsonschema: make python-functools32 a propagated input.

[Cyril Roelandt]

* gnu/packages/python.scm (python2-jsonschema): move python2-functools32 to
propagated-inputs.
---
 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 f367e1e..0d5753f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2297,9 +2297,9 @@ version numbers.")
   (let ((jsonschema (package-with-python2
                      (strip-python2-variant python-jsonschema))))
     (package (inherit jsonschema)
-      (inputs
+      (propagated-inputs
        `(("python2-functools32" ,python2-functools32)
-         ,@(package-inputs jsonschema))))))
+         ,@(package-propagated-inputs jsonschema))))))
 
 (define-public python-unidecode
   (package
-- 
2.6.2

[PATCH 02/10] gnu: Update python-unittest2 to 0.6.0

[Cyril Roelandt]

* gnu/packages/python.scm (python-unittest2, python2-unittest2): Update to
0.6.0.
* gnu/packages/patches/python-unittest2-skip-some-tests.patch: New file.
* gnu/local.mk: Add it here.
---
 gnu/local.mk                                       |  1 +
 .../patches/python-unittest2-skip-some-tests.patch | 18 +++++++++++++
 gnu/packages/python.scm                            | 31 +++++++---------------
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 gnu/packages/patches/python-unittest2-skip-some-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9e31ef9..cf3df7d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -705,6 +705,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/python-paste-remove-timing-test.patch	\
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch \
+  gnu/packages/patches/python-unittest2-skip-some-tests.patch	\
   gnu/packages/patches/qemu-CVE-2015-8558.patch			\
   gnu/packages/patches/qemu-CVE-2015-8567.patch			\
   gnu/packages/patches/qemu-CVE-2015-8613.patch			\
diff --git a/gnu/packages/patches/python-unittest2-skip-some-tests.patch b/gnu/packages/patches/python-unittest2-skip-some-tests.patch
new file mode 100644
index 0000000..1902b01
--- /dev/null
+++ b/gnu/packages/patches/python-unittest2-skip-some-tests.patch
@@ -0,0 +1,18 @@
+--- a/unittest2/test/test_break.py	17:48:01.095139905 +0200
++++ b/unittest2/test/test_break.py	2016-04-28 17:48:14.027043632 +0200
+@@ -72,6 +72,7 @@
+         self.assertTrue(result.breakCaught)
+ 
+ 
++    @unittest2.skip('Guix failure')
+     def testSecondInterrupt(self):
+         result = unittest2.TestResult()
+         unittest2.installHandler()
+@@ -121,6 +122,7 @@
+         self.assertFalse(result3.shouldStop)
+ 
+ 
++    @unittest2.skip('Guix failure')
+     def testHandlerReplacedButCalled(self):
+         # If our handler has been replaced (is no longer installed) but is
+         # called by the *new* handler, then it isn't safe to delay the
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0d5753f..99d1d3e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1462,17 +1462,22 @@ matching them against a list of media-ranges.")
 (define-public python-unittest2
   (package
     (name "python-unittest2")
-    (version "0.5.1")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
-             "https://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-"
-             version ".tar.gz"))
+              "https://pypi.python.org/packages/0c/39/"
+              "90bbe47ad985d5f6b1e7658ece6f6b0d1045e6a61ee851eef3c6c6bf6c0d/"
+              "unittest2-" version ".tar.gz"))
        (sha256
         (base32
-         "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q"))))
+         "0ph1bd7h24gsqzjx51pdh05cpsidrdk0mnydjah6p011s3rk6ic6"))
+       ;; 2 unexplained failures that should be investigated
+       (patches (search-patches "python-unittest2-skip-some-tests.patch"))))
     (build-system python-build-system)
+    (propagated-inputs
+     `(("python-six" ,python-six)))
     (inputs
      `(("python-setuptools" ,python-setuptools)))
     (home-page "http://pypi.python.org/pypi/unittest2")
@@ -1483,23 +1488,7 @@ standard library.")
     (license psfl)))
 
 (define-public python2-unittest2
-  (package (inherit python-unittest2)
-    (name "python2-unittest2")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://pypi.python.org/packages/source/u/unittest2/unittest2-"
-             version ".tar.gz"))
-       (sha256
-        (base32
-         "0wbs4i4x3x7klr3v35ss6p9mcqz883i1xgcpkhvl7n2lyv6yhpda"))))
-    (inputs
-     `(("python2-setuptools" ,python2-setuptools)))
-    (arguments
-     `(#:python ,python-2
-       #:tests? #f)))) ; no setup.py test command
+  (package-with-python2 python-unittest2))
 
 (define-public python-py
   (package
-- 
2.6.2

Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:20:55PM +0200, Cyril Roelandt wrote:
> * gnu/packages/python.scm (python-unittest2, python2-unittest2): Update to
> 0.6.0.
> * gnu/packages/patches/python-unittest2-skip-some-tests.patch: New file.
> * gnu/local.mk: Add it here.

Can you mention that it's added to (dist_patch_DATA)?

>      (inputs
>       `(("python-setuptools" ,python-setuptools)))

As with python-cmd2, could you if setuptools is required for the
python-3 variant?

> -       #:tests? #f)))) ; no setup.py test command

Disabling two tests is an improvment over this! Did you find anyone else
on the net having trouble with these two tests?

Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0

[Cyril Roelandt]

On 04/30/2016 11:33 PM, Leo Famulari wrote:
> As with python-cmd2, could you if setuptools is required for the
> python-3 variant?
> 

So, I applied the following patch:


--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1520,8 +1520,7 @@ matching them against a list of media-ranges.")
     (build-system python-build-system)
     (propagated-inputs
      `(("python-six" ,python-six)))
-    (inputs
-     `(("python-setuptools" ,python-setuptools)))
+    ;(inputs `(("python-setuptools" ,python-setuptools)))
     (home-page "http://pypi.python.org/pypi/unittest2")
     (synopsis "Python unit testing library")
     (description
@@ -1530,7 +1529,12 @@ standard library.")
     (license psfl)))

 (define-public python2-unittest2
-  (package-with-python2 python-unittest2))
+  ;(package-with-python2 python-unittest2))
+  (let ((base (package-with-python2 (strip-python2-variant
python-unittest2))))
+    (package
+      (inherit base)
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs base))))))

 (define-public python-py
   (package


I can still build python-unittest2 and python-barbicanclient:

$ ./pre-inst-env guix build python-unittest2
/gnu/store/kh4nbzvqv9ic535xls92q8j6p6iz30kk-python-unittest2-0.6.0
$ ./pre-inst-env guix build python-barbicanclient
/gnu/store/n3kas9l1ffcf84gdbx1sswzrm4cl93n6-python-barbicanclient-4.0.1

I can still build python2-unittest2:

$ ./pre-inst-env guix build python2-unittest2
/gnu/store/ld9l5y5hxs19d15babphp7mv1kxsak55-python2-unittest2-0.6.0

But I can no longer build python2-barbicanclient:

http://paste.debian.net/682000/

>> > -       #:tests? #f)))) ; no setup.py test command
> Disabling two tests is an improvment over this! Did you find anyone else
> on the net having trouble with these two tests?

Not really, I was quite happy with enabling most of them for Python2 and
did not look any further, since my main goal was packaging
python-barbicanclient.

Cyril.

Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0

[Leo Famulari]

On Fri, May 06, 2016 at 03:28:39AM +0200, Cyril Roelandt wrote:
> On 04/30/2016 11:33 PM, Leo Famulari wrote:
> > As with python-cmd2, could you if setuptools is required for the
> > python-3 variant?
> > 
> 
> So, I applied the following patch:
> 
> 
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1520,8 +1520,7 @@ matching them against a list of media-ranges.")
>      (build-system python-build-system)
>      (propagated-inputs
>       `(("python-six" ,python-six)))
> -    (inputs
> -     `(("python-setuptools" ,python-setuptools)))
> +    ;(inputs `(("python-setuptools" ,python-setuptools)))
>      (home-page "http://pypi.python.org/pypi/unittest2")
>      (synopsis "Python unit testing library")
>      (description
> @@ -1530,7 +1529,12 @@ standard library.")
>      (license psfl)))

I think you forgot to add a line like this one to the python-3 variant's
definition:

   (properties `((python2-variant . ,(delay python2-unittest2))))

Can you check if everything works when you do that?

Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0

[Efraim Flashner]

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

On Fri, Apr 29, 2016 at 04:20:55PM +0200, Cyril Roelandt wrote:
> * gnu/packages/python.scm (python-unittest2, python2-unittest2): Update to
> 0.6.0.
> * gnu/packages/patches/python-unittest2-skip-some-tests.patch: New file.
> * gnu/local.mk: Add it here.
> ---
>  gnu/local.mk                                       |  1 +
>  .../patches/python-unittest2-skip-some-tests.patch | 18 +++++++++++++
>  gnu/packages/python.scm                            | 31 +++++++---------------
>  3 files changed, 29 insertions(+), 21 deletions(-)
>  create mode 100644 gnu/packages/patches/python-unittest2-skip-some-tests.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 9e31ef9..cf3df7d 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -705,6 +705,7 @@ dist_patch_DATA =						\
>    gnu/packages/patches/python-paste-remove-timing-test.patch	\
>    gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
>    gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch \
> +  gnu/packages/patches/python-unittest2-skip-some-tests.patch	\
>    gnu/packages/patches/qemu-CVE-2015-8558.patch			\
>    gnu/packages/patches/qemu-CVE-2015-8567.patch			\
>    gnu/packages/patches/qemu-CVE-2015-8613.patch			\
> diff --git a/gnu/packages/patches/python-unittest2-skip-some-tests.patch b/gnu/packages/patches/python-unittest2-skip-some-tests.patch
> new file mode 100644
> index 0000000..1902b01
> --- /dev/null
> +++ b/gnu/packages/patches/python-unittest2-skip-some-tests.patch
> @@ -0,0 +1,18 @@
> +--- a/unittest2/test/test_break.py	17:48:01.095139905 +0200
> ++++ b/unittest2/test/test_break.py	2016-04-28 17:48:14.027043632 +0200
> +@@ -72,6 +72,7 @@
> +         self.assertTrue(result.breakCaught)
> + 
> + 
> ++    @unittest2.skip('Guix failure')
> +     def testSecondInterrupt(self):
> +         result = unittest2.TestResult()
> +         unittest2.installHandler()
> +@@ -121,6 +122,7 @@
> +         self.assertFalse(result3.shouldStop)
> + 
> + 
> ++    @unittest2.skip('Guix failure')
> +     def testHandlerReplacedButCalled(self):
> +         # If our handler has been replaced (is no longer installed) but is
> +         # called by the *new* handler, then it isn't safe to delay the
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 0d5753f..99d1d3e 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1462,17 +1462,22 @@ matching them against a list of media-ranges.")
>  (define-public python-unittest2
>    (package
>      (name "python-unittest2")
> -    (version "0.5.1")
> +    (version "0.6.0")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (string-append
> -             "https://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-"
> -             version ".tar.gz"))
> +              "https://pypi.python.org/packages/0c/39/"
> +              "90bbe47ad985d5f6b1e7658ece6f6b0d1045e6a61ee851eef3c6c6bf6c0d/"
> +              "unittest2-" version ".tar.gz"))
>         (sha256
>          (base32
> -         "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q"))))
> +         "0ph1bd7h24gsqzjx51pdh05cpsidrdk0mnydjah6p011s3rk6ic6"))
> +       ;; 2 unexplained failures that should be investigated
> +       (patches (search-patches "python-unittest2-skip-some-tests.patch"))))
>      (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-six" ,python-six)))
>      (inputs
>       `(("python-setuptools" ,python-setuptools)))
>      (home-page "http://pypi.python.org/pypi/unittest2")
> @@ -1483,23 +1488,7 @@ standard library.")
>      (license psfl)))
>  
>  (define-public python2-unittest2
> -  (package (inherit python-unittest2)
> -    (name "python2-unittest2")
> -    (version "0.5.1")
> -    (source
> -     (origin
> -       (method url-fetch)
> -       (uri (string-append
> -             "https://pypi.python.org/packages/source/u/unittest2/unittest2-"
> -             version ".tar.gz"))
> -       (sha256
> -        (base32
> -         "0wbs4i4x3x7klr3v35ss6p9mcqz883i1xgcpkhvl7n2lyv6yhpda"))))
> -    (inputs
> -     `(("python2-setuptools" ,python2-setuptools)))
> -    (arguments
> -     `(#:python ,python-2
> -       #:tests? #f)))) ; no setup.py test command
> +  (package-with-python2 python-unittest2))
>  
>  (define-public python-py
>    (package
> -- 
> 2.6.2
> 

python2-unittest2 had a different url before than the python- version.
Is it all using the same source now?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

Re: [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0

[Cyril Roelandt]

[-- Attachment #1.1: Type: text/plain, Size: 232 bytes --]

On 05/03/2016 08:19 PM, Efraim Flashner wrote:
> python2-unittest2 had a different url before than the python- version.
> Is it all using the same source now?

It seems to be working using the same source, so... :)

Cyril.


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

[PATCH 03/10] gnu: Add python-cmd2.

[Cyril Roelandt]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 99d1d3e..11ad08d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8693,3 +8693,34 @@ respectively.")
 (define-public python2-cysignals
   (package-with-python2 python-cysignals))
 
+(define-public python-cmd2
+  (package
+    (name "python-cmd2")
+    (version "0.6.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/20/65/"
+               "6e5518c6bbfe9fe33be1364a6e83d372f837019dfdb31b207b2db3d84865/"
+               "cmd2-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1a346zcd46c8gwbbp2cxsmvgfkyy26kwxjzdnkv7n47w6660sy5c"))))
+    (build-system python-build-system)
+    (native-inputs
+      `(("python-setuptools" ,python-setuptools)))
+    (inputs
+      `(("python-pyparsing" ,python-pyparsing)))
+    (home-page "https://github.com/python-cmd2/cmd2")
+    (synopsis
+      "Extra features for standard library's cmd module")
+    (description
+      "Drop-in replacement for the standard library's cmd module that adds
+features such as multiline commands, case-insensitive commands or a
+searchable history.")
+    (license expat)))
+
+(define-public python2-cmd2
+  (package-with-python2 python-cmd2))
+
-- 
2.6.2

Re: [PATCH 03/10] gnu: Add python-cmd2.

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:20:56PM +0200, Cyril Roelandt wrote:
> * gnu/packages/python.scm (python-cmd2, python2-cmd2): New variables.

> +(define-public python-cmd2

> +    (native-inputs
> +      `(("python-setuptools" ,python-setuptools)))

It seems that setuptools is only required for python2-cmd2, so can you
move it there instead?

> +    (description
> +      "Drop-in replacement for the standard library's cmd module that adds
> +features such as multiline commands, case-insensitive commands or a
> +searchable history.")

I think that the string 'cmd' be in texinfo like this: @code{cmd}

[PATCH 04/10] gnu: remove test-only depencies of python-pbr

[Cyril Roelandt]

* gnu/packages/python.scm (python-pbr): remove test-only dependencies since we
are not running the tests anyway.
---
 gnu/packages/python.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 11ad08d..1a7809e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1896,17 +1896,10 @@ and sensible default behaviors into your setuptools run.")
       `(("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-mimeparse" ,python-mimeparse)
         ("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)))
+        ("python-sphinx" ,python-sphinx)))
     (home-page "https://launchpad.net/pbr")
     (synopsis "Change the default behavior of Python’s setuptools")
     (description
-- 
2.6.2

Re: [PATCH 04/10] gnu: remove test-only depencies of python-pbr

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:20:57PM +0200, Cyril Roelandt wrote:

Subject: [PATCH 04/10] gnu: remove test-only depencies of python-pbr

> * gnu/packages/python.scm (python-pbr): remove test-only dependencies since we
> are not running the tests anyway.

Remember to capitalize and punctuate the sentences :)

Re: [PATCH 04/10] gnu: remove test-only depencies of python-pbr

[Efraim Flashner]

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

On Sat, Apr 30, 2016 at 05:33:20PM -0400, Leo Famulari wrote:
> On Fri, Apr 29, 2016 at 04:20:57PM +0200, Cyril Roelandt wrote:
> 
> Subject: [PATCH 04/10] gnu: remove test-only depencies of python-pbr
                            ^^^
                    missing `python-pbr:`

> 
> > * gnu/packages/python.scm (python-pbr): remove test-only dependencies since we
> > are not running the tests anyway.
> 
> Remember to capitalize and punctuate the sentences :)
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

Re: [PATCH 04/10] gnu: remove test-only depencies of python-pbr

[Efraim Flashner]

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

On Fri, Apr 29, 2016 at 04:20:57PM +0200, Cyril Roelandt wrote:
> * gnu/packages/python.scm (python-pbr): remove test-only dependencies since we
> are not running the tests anyway.
> ---
>  gnu/packages/python.scm | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 11ad08d..1a7809e 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1896,17 +1896,10 @@ and sensible default behaviors into your setuptools run.")
>        `(("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-mimeparse" ,python-mimeparse)
>          ("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)))
> +        ("python-sphinx" ,python-sphinx)))
>      (home-page "https://launchpad.net/pbr")
>      (synopsis "Change the default behavior of Python’s setuptools")
>      (description
> -- 
> 2.6.2
> 
> 

Can you add a comment next to the `#:tests? #f` that the tests depend on
python-mock, which depends on python-pbr

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[PATCH 05/10] gnu: Add python-pyinotify.

[Cyril Roelandt]

* gnu/packages/python.scm (python-pyinotify, python2-pyinotify): New variables.
---
 gnu/packages/python.scm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1a7809e..698b683 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -36,7 +36,7 @@
 
 (define-module (gnu packages python)
   #:use-module ((guix licenses)
-                #:select (asl2.0 bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
+                #:select (asl2.0 bsd-style bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
                           gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ agpl3+
                           isc mpl2.0 psfl public-domain repoze unlicense x11-style
                           zpl2.1))
@@ -8717,3 +8717,28 @@ searchable history.")
 (define-public python2-cmd2
   (package-with-python2 python-cmd2))
 
+(define-public python-pyinotify
+  (package
+    (name "python-pyinotify")
+    (version "0.9.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/e3/c0/"
+               "fd5b18dde17c1249658521f69598f3252f11d9d7a980c5be8619970646e1/"
+               "pyinotify-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw"))))
+    (build-system python-build-system)
+    (native-inputs
+      `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://github.com/seb-m/pyinotify")
+    (synopsis "Linux filesystem events monitoring")
+    (description
+      "Python bindings for inotify.")
+    (license bsd-style)))
+
+(define-public python2-pyinotify
+  (package-with-python2 python-pyinotify))
-- 
2.6.2

[PATCH 06/10] gnu: Update python-oslo.log to 3.5.0.

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-olso.log, python2-oslo.log):
Update to 3.5.0
---
 gnu/packages/openstack.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 780fb7f..43f3e12 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -451,25 +451,27 @@ in an application or library.")
 (define-public python-oslo.log
   (package
   (name "python-oslo.log")
-  (version "1.6.0")
+  (version "3.5.0")
   (source
     (origin
       (method url-fetch)
       (uri (string-append
-             "https://pypi.python.org/packages/source/o/oslo.log/oslo.log-"
-             version
-             ".tar.gz"))
+             "https://pypi.python.org/packages/93/e6/"
+             "84baa69e5c6b6cd2bb9c8e475d2f643f2f28026834929622279c65736b89/"
+             "oslo.log-" version ".tar.gz"))
       (sha256
         (base32
-          "1fhy6yvbd565nv4x4i3ppyrlbmz3yy9d0xsvw5nkqsa7g43nmf8z"))))
+          "0pkaf7j12pyd09q2qv33jy5lgwk19vw5qqjwa6cd2nci64pakwyq"))))
   (build-system python-build-system)
   (propagated-inputs
    `(("python-debtcollector" ,python-debtcollector)
+     ("python-dateutil" ,python-dateutil-2)
      ("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-pyinotify" ,python-pyinotify)
      ("python-six" ,python-six)))
   (inputs
     `(("python-babel" ,python-babel)
@@ -477,7 +479,8 @@ in an application or library.")
       ("python-mock" ,python-mock)
       ("python-oslotest" ,python-oslotest)
       ("python-pbr" ,python-pbr)
-      ("python-setuptools" ,python-setuptools)))
+      ("python-setuptools" ,python-setuptools)
+      ("python-unittest2" ,python-unittest2)))
   (home-page "http://launchpad.net/oslo")
   (synopsis "Python logging library of the Oslo project")
   (description
-- 
2.6.2

[PATCH 07/10] gnu: Add python-funcsigs.

[Cyril Roelandt]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 698b683..ad69368 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -728,6 +728,38 @@ API for locking files.")
       (native-inputs `(("python2-setuptools" ,python2-setuptools)
                        ,@(package-native-inputs base))))))
 
+(define-public python-funcsigs
+  (package
+    (name "python-funcsigs")
+    (version "1.0.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/94/4a/"
+               "db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/"
+               "funcsigs-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"))))
+    (build-system python-build-system)
+    (native-inputs
+      `(("python-setuptools" ,python-setuptools)
+        ("python-unittest2" ,python-unittest2)))
+    (home-page "http://funcsigs.readthedocs.org")
+    (synopsis
+      "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+")
+    (description
+      "Funcsigs is a backport of the PEP 362 function signature features from
+Python 3.3's inspect module.  The backport is compatible with Python 2.6, 2.7
+as well as 3.3 and up. 3.2 was supported by version 0.4, but with setuptools
+and pip no longer supporting 3.2, we cannot make any statement about 3.2
+compatibility.")
+    (license asl2.0)))
+
+(define-public python2-funcsigs
+  (package-with-python2 python-funcsigs))
+
 (define-public python-mock
   (package
     (name "python-mock")
-- 
2.6.2

Re: [PATCH 07/10] gnu: Add python-funcsigs.

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:21:00PM +0200, Cyril Roelandt wrote:
> * gnu/packages/python.scm (python-funcsigs, python2-funcsigs): New variables.

> +    (native-inputs
> +      `(("python-setuptools" ,python-setuptools)

Can it go in the python-2 variant?

Re: [PATCH 07/10] gnu: Add python-funcsigs.

[Efraim Flashner]

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

On Fri, Apr 29, 2016 at 04:21:00PM +0200, Cyril Roelandt wrote:
> * gnu/packages/python.scm (python-funcsigs, python2-funcsigs): New variables.
> ---
>  gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 698b683..ad69368 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -728,6 +728,38 @@ API for locking files.")
>        (native-inputs `(("python2-setuptools" ,python2-setuptools)
>                         ,@(package-native-inputs base))))))
>  
> +(define-public python-funcsigs
> +  (package
> +    (name "python-funcsigs")
> +    (version "1.0.2")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (string-append
> +               "https://pypi.python.org/packages/94/4a/"
> +               "db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/"
> +               "funcsigs-" version ".tar.gz"))
> +        (sha256
> +          (base32
> +            "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"))))
> +    (build-system python-build-system)
> +    (native-inputs
> +      `(("python-setuptools" ,python-setuptools)
> +        ("python-unittest2" ,python-unittest2)))
> +    (home-page "http://funcsigs.readthedocs.org")
> +    (synopsis
> +      "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+")
> +    (description
> +      "Funcsigs is a backport of the PEP 362 function signature features from
> +Python 3.3's inspect module.  The backport is compatible with Python 2.6, 2.7
> +as well as 3.3 and up. 3.2 was supported by version 0.4, but with setuptools
> +and pip no longer supporting 3.2, we cannot make any statement about 3.2
> +compatibility.")
> +    (license asl2.0)))
> +
> +(define-public python2-funcsigs
> +  (package-with-python2 python-funcsigs))
> +
>  (define-public python-mock
>    (package
>      (name "python-mock")
> -- 
> 2.6.2
> 

Based on the description, does it make sense to have a python- version
and not just a python2- version?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

Re: [PATCH 07/10] gnu: Add python-funcsigs.

[Cyril Roelandt]

[-- Attachment #1.1: Type: text/plain, Size: 402 bytes --]

On 05/03/2016 08:25 PM, Efraim Flashner wrote:
> Based on the description, does it make sense to have a python- version
> and not just a python2- version?

It would make sense not to use funcsigs with Python 3.4+, but I think
some people might use it in Python 3 code, so it might end up being
required. I don't think it hurts too much to keep the python-funcsigs
package anyway.


Cyril.


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

[PATCH 08/10] gnu: Update python-mock to 2.0.0.

[Cyril Roelandt]

* gnu/packages/python.scm (python-mock, python2-mock): Update to 2.0.0.
---
 gnu/packages/python.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ad69368..d8f43a8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -763,16 +763,24 @@ compatibility.")
 (define-public python-mock
   (package
     (name "python-mock")
-    (version "1.0.1")
+    (version "2.0.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://pypi.python.org/packages/source/m/mock/"
-                           "mock-" version ".tar.gz"))
+       (uri (string-append
+              "https://pypi.python.org/packages/0c/53/"
+              "014354fc93c591ccc4abff12c473ad565a2eb24dcd82490fae33dbf2539f/"
+              "mock-" version ".tar.gz"))
        (sha256
         (base32
-         "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"))))
+         "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"))))
     (build-system python-build-system)
+    (native-inputs
+      `(("python-setuptools" ,python-setuptools)))
+    (propagated-inputs
+      `(("python-pbr" ,python-pbr)
+        ("python-funcsigs" ,python-funcsigs)
+        ("python-six" ,python-six)))
     (arguments '(#:test-target "check"))
     (home-page "http://code.google.com/p/mock/")
     (synopsis "Python mocking and patching library for testing")
-- 
2.6.2

Re: [PATCH 08/10] gnu: Update python-mock to 2.0.0.

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:21:01PM +0200, Cyril Roelandt wrote:
> * gnu/packages/python.scm (python-mock, python2-mock): Update to 2.0.0.

~300 packages depend on mock. I'm building a handful of packages as a
limited test.

[PATCH 09/10] gnu: Add python-cliff.

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-cliff, python2-cliff): New variables.
* gnu/packages/patches/python-cliff-remove-unicodecsv.patch: New file.
* gnu/local.mk: Add it here.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/openstack.scm                         | 50 ++++++++++++++++++++++
 .../patches/python-cliff-remove-unicodecsv.patch   | 11 +++++
 3 files changed, 62 insertions(+)
 create mode 100644 gnu/packages/patches/python-cliff-remove-unicodecsv.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cf3df7d..7e65c86 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -700,6 +700,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/python-ipython-inputhook-ctype.patch	\
   gnu/packages/patches/python-rarfile-fix-tests.patch		\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
+  gnu/packages/patches/python-cliff-remove-unicodecsv.patch	\
   gnu/packages/patches/python-configobj-setuptools.patch	\
   gnu/packages/patches/python-paste-remove-website-test.patch	\
   gnu/packages/patches/python-paste-remove-timing-test.patch	\
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 43f3e12..d1e1fa0 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -18,6 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages openstack)
+  #:use-module (gnu packages)
   #:use-module (gnu packages python)
   #:use-module (gnu packages tls)
   #:use-module (guix build-system python)
@@ -773,3 +774,52 @@ permanence.")
          ("python2-oslosphinx" ,python2-oslosphinx)
          ,@(fold alist-delete (package-native-inputs swiftclient)
             '("python-keystoneclient" "python-oslosphinx")))))))
+
+(define-public python-cliff
+  (package
+    (name "python-cliff")
+    (version "2.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/23/80/"
+               "bd8e87608c4536a729e0b791982711b61918818d8658ae3cb7c898f77c00/"
+               "cliff-" version ".tar.gz"))
+        (sha256
+          (base32
+            "10npasjxzchlvqmmgln1h42lbf4p74gp92y8qlykx8l0xp1rs8bf"))
+        (patches (search-patches
+                  "python-cliff-remove-unicodecsv.patch"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-cmd2" ,python-cmd2)
+        ("python-prettytable" ,python-prettytable)
+        ("python-pyparsing" ,python-pyparsing)
+        ("python-pyyaml" ,python-pyyaml)
+        ("python-six" ,python-six)
+        ("python-stevedore" ,python-stevedore)))
+    (native-inputs
+      `(("python-coverage" ,python-coverage)
+        ("python-httplib2" ,python-httplib2)
+        ("python-mock" ,python-mock)
+        ("python-oslosphinx" ,python-oslosphinx)
+        ("python-pbr" ,python-pbr)
+        ("python-setuptools" ,python-setuptools)
+        ("python-sphinx" ,python-sphinx)
+        ("python-docutils" ,python-docutils)
+        ("python-nose" ,python-nose)))
+    (home-page "https://launchpad.net/python-cliff")
+    (synopsis
+      "Command Line Interface Formulation Framework")
+    (description
+      "A framework for building command line programs.  It provides
+subcommands, output formatters, and other extensions.")
+    (license asl2.0)))
+
+(define-public python2-cliff
+  (let ((base (package-with-python2 (strip-python2-variant python-cliff))))
+    (package
+      (inherit base)
+      (propagated-inputs `(("python2-unicodecsv" ,python2-unicodecsv)
+                           ,@(package-propagated-inputs base))))))
diff --git a/gnu/packages/patches/python-cliff-remove-unicodecsv.patch b/gnu/packages/patches/python-cliff-remove-unicodecsv.patch
new file mode 100644
index 0000000..99b4aa2
--- /dev/null
+++ b/gnu/packages/patches/python-cliff-remove-unicodecsv.patch
@@ -0,0 +1,11 @@
+diff --git a/requirements.txt b/requirements.txt
+index f334651..c16761e 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -7,5 +7,5 @@ PrettyTable<0.8,>=0.7 # BSD
+ pyparsing>=2.0.1 # MIT
+ six>=1.9.0 # MIT
+ stevedore>=1.5.0 # Apache-2.0
+-unicodecsv>=0.8.0 # BSD
++unicodecsv>=0.8.0;python_version<='2.7'# BSD
+ PyYAML>=3.1.0 # MIT
-- 
2.6.2

Re: [PATCH 09/10] gnu: Add python-cliff.

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:21:02PM +0200, Cyril Roelandt wrote:
> * gnu/packages/openstack.scm (python-cliff, python2-cliff): New variables.
> * gnu/packages/patches/python-cliff-remove-unicodecsv.patch: New file.
> * gnu/local.mk: Add it here.

Can you mention (dist_patch_DATA)?

> +    (native-inputs
> +      `(("python-coverage" ,python-coverage)
> +        ("python-httplib2" ,python-httplib2)
> +        ("python-mock" ,python-mock)
> +        ("python-oslosphinx" ,python-oslosphinx)
> +        ("python-pbr" ,python-pbr)
> +        ("python-setuptools" ,python-setuptools)

Did you try putting setuptools in the python-2 variant?

> diff --git a/gnu/packages/patches/python-cliff-remove-unicodecsv.patch b/gnu/packages/patches/python-cliff-remove-unicodecsv.patch

Can you add a couple lines explaining the patch for future readers?

> new file mode 100644
> index 0000000..99b4aa2
> --- /dev/null
> +++ b/gnu/packages/patches/python-cliff-remove-unicodecsv.patch
> @@ -0,0 +1,11 @@
> +diff --git a/requirements.txt b/requirements.txt
> +index f334651..c16761e 100644
> +--- a/requirements.txt
> ++++ b/requirements.txt
> +@@ -7,5 +7,5 @@ PrettyTable<0.8,>=0.7 # BSD
> + pyparsing>=2.0.1 # MIT
> + six>=1.9.0 # MIT
> + stevedore>=1.5.0 # Apache-2.0
> +-unicodecsv>=0.8.0 # BSD
> ++unicodecsv>=0.8.0;python_version<='2.7'# BSD
> + PyYAML>=3.1.0 # MIT
> -- 
> 2.6.2
> 
> 

[PATCH 10/10] gnu: Add python-barbicanclient.

[Cyril Roelandt]

* gnu/packages/openstack.scm (python-barbicanclient, python2-barbicanclient):
New variables.
* gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch: New file.
* gnu/local.ml: Add it here.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/openstack.scm                         | 47 +++++++++++++++++++++
 .../python-barbicanclient-assertItemsEqual.patch   | 48 ++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 7e65c86..e47aba8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -690,6 +690,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/pybugz-stty.patch			\
   gnu/packages/patches/pygpgme-disable-problematic-tests.patch  \
   gnu/packages/patches/pyqt-configure.patch			\
+  gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch \
   gnu/packages/patches/python-2-deterministic-build-info.patch	\
   gnu/packages/patches/python-2.7-search-paths.patch		\
   gnu/packages/patches/python-2.7-source-date-epoch.patch	\
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index d1e1fa0..50fc939 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -644,6 +644,53 @@ handling.")
 (define-public python2-oslo.utils
   (package-with-python2 python-oslo.utils))
 
+(define-public python-barbicanclient
+  (package
+    (name "python-barbicanclient")
+    (version "4.0.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/93/3f/"
+               "9ffbb6f7241d300d9a9d3f4aa794efbb1c45f6c5a729c702bec933a399cf/"
+               "python-barbicanclient-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0paxkhsfj9wal4z14caip9kggbaa99ni03cgivi3z138vc6jdbbd"))
+        (patches (search-patches
+                  ;; testtools.TestCase.assertItemsEqual does not exist in our
+                  ;; version of testtools. Remove this patch once we update
+                  ;;testtools.
+                  "python-barbicanclient-assertItemsEqual.patch"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-cliff" ,python-cliff)
+        ("python-keystoneclient" ,python-keystoneclient)
+        ("python-oslo.i18n" ,python-oslo.i18n)
+        ("python-oslo.serialization" ,python-oslo.serialization)
+        ("python-oslo.utils" ,python-oslo.utils)
+        ("python-pbr" ,python-pbr)
+        ("python-requests" ,python-requests)
+        ("python-six" ,python-six)))
+    (native-inputs
+      ;; Tests
+      `(("python-setuptools" ,python-setuptools)
+        ("python-mock" ,python-mock)
+        ("python-requests-mock" ,python-requests-mock)
+        ("python-testtools" ,python-testtools)
+        ("python-testrepository" ,python-testrepository)))
+    (home-page "http://www.openstack.org/")
+    (synopsis
+      "Client Library for OpenStack Barbican Key Management API")
+    (description
+      "A client and a library for the OpenStack Barbican Key Management
+API")
+    (license asl2.0)))
+
+(define-public python2-barbicanclient
+  (package-with-python2 python-barbicanclient))
+
 (define-public python-keystoneclient
   (package
     (name "python-keystoneclient")
diff --git a/gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch b/gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch
new file mode 100644
index 0000000..43652c4
--- /dev/null
+++ b/gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch
@@ -0,0 +1,48 @@
+diff --git a/barbicanclient/tests/test_containers.py b/barbicanclient/tests/test_containers.py
+index 1327216..0b785a9 100644
+--- a/barbicanclient/tests/test_containers.py
++++ b/barbicanclient/tests/test_containers.py
+@@ -17,6 +17,7 @@ import json
+ 
+ import mock
+ from oslo_utils import timeutils
++import six
+ 
+ from barbicanclient import acls
+ from barbicanclient.tests import test_client
+@@ -197,7 +198,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
+         container_req = json.loads(self.responses.last_request.text)
+         self.assertEqual(self.container.name, container_req['name'])
+         self.assertEqual('certificate', container_req['type'])
+-        self.assertItemsEqual(self.container.certificate_secret_refs_json,
++        six.assertCountEqual(self, self.container.certificate_secret_refs_json,
+                               container_req['secret_refs'])
+ 
+     def test_should_store_certificate_via_constructor(self):
+@@ -222,7 +223,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
+         container_req = json.loads(self.responses.last_request.text)
+         self.assertEqual(self.container.name, container_req['name'])
+         self.assertEqual('certificate', container_req['type'])
+-        self.assertItemsEqual(self.container.certificate_secret_refs_json,
++        six.assertCountEqual(self, self.container.certificate_secret_refs_json,
+                               container_req['secret_refs'])
+ 
+     def test_should_store_rsa_via_attributes(self):
+@@ -246,7 +247,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
+         container_req = json.loads(self.responses.last_request.text)
+         self.assertEqual(self.container.name, container_req['name'])
+         self.assertEqual('rsa', container_req['type'])
+-        self.assertItemsEqual(self.container.rsa_secret_refs_json,
++        six.assertCountEqual(self, self.container.rsa_secret_refs_json,
+                               container_req['secret_refs'])
+ 
+     def test_should_store_rsa_via_constructor(self):
+@@ -271,7 +272,7 @@ class WhenTestingContainers(test_client.BaseEntityResource):
+         container_req = json.loads(self.responses.last_request.text)
+         self.assertEqual(self.container.name, container_req['name'])
+         self.assertEqual('rsa', container_req['type'])
+-        self.assertItemsEqual(self.container.rsa_secret_refs_json,
++        six.assertCountEqual(self, self.container.rsa_secret_refs_json,
+                               container_req['secret_refs'])
+ 
+     def test_should_get_secret_refs_when_created_using_secret_objects(self):
-- 
2.6.2

Re: [PATCH 10/10] gnu: Add python-barbicanclient.

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:21:03PM +0200, Cyril Roelandt wrote:
> * gnu/packages/openstack.scm (python-barbicanclient, python2-barbicanclient):
> New variables.
> * gnu/packages/patches/python-barbicanclient-assertItemsEqual.patch: New file.
> * gnu/local.ml: Add it here.

Can you use "* gnu/local.mk (dist_patch_DATA)"?

> +        (patches (search-patches
> +                  ;; testtools.TestCase.assertItemsEqual does not exist in our
> +                  ;; version of testtools. Remove this patch once we update
> +                  ;;testtools.

Can you copy this comment into the patch itself?

> +    (native-inputs
> +      ;; Tests
> +      `(("python-setuptools" ,python-setuptools)

I think you could move the comment to this space. Also, is setuptools
needed for the python-3 version?

Re: [PATCH 00/10] Add python-barbicanclient.

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:20:53PM +0200, Cyril Roelandt wrote:
> This patch series adds python-barbicanclient, one of the CLI clients for
> OpenStack.

I'm rebuilding a handful of packages against these patches (especially
the update to mock) to make sure they don't break.

In the meantime, I'll send some comments.

Re: [PATCH 00/10] Add python-barbicanclient.

[Leo Famulari]

On Fri, Apr 29, 2016 at 04:20:53PM +0200, Cyril Roelandt wrote:
> This patch series adds python-barbicanclient, one of the CLI clients for
> OpenStack.

I was able to build the following packages, picked haphazardly, after
applying this patch series:

rseqc python2-urllib3 python-pytest-xprocess python-numexpr letsencrypt
khal diffoscope python-acme beets

I wanted to make sure the updates to mock and unittest2 wouldn't break
anything. No problems!

Re: [PATCH 00/10] Add python-barbicanclient.

[Cyril Roelandt]

On 05/01/2016 06:41 PM, Leo Famulari wrote:
> I wanted to make sure the updates to mock and unittest2 wouldn't break
> anything. No problems!
I also managed to rebuild a bunch of packages on my machine. I only
failed to rebuild those that required LaTeX because I ran out of disk
space :)

Cyril.

Re: [PATCH 00/10] Add python-barbicanclient.

[Leo Famulari]

On Fri, May 06, 2016 at 03:34:31AM +0200, Cyril Roelandt wrote:
> On 05/01/2016 06:41 PM, Leo Famulari wrote:
> > I wanted to make sure the updates to mock and unittest2 wouldn't break
> > anything. No problems!
> I also managed to rebuild a bunch of packages on my machine. I only
> failed to rebuild those that required LaTeX because I ran out of disk
> space :)

That always happens to me, too ;) I decided to make gcroots of
texlive-texmf's source code and built output. I will have to remember to
update them when necessary.