From: Cyril Roelandt <tipecaml@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 10/10] gnu: Add python-barbicanclient.
Date: Fri, 29 Apr 2016 16:21:03 +0200 [thread overview]
Message-ID: <1461939663-5936-11-git-send-email-tipecaml@gmail.com> (raw)
In-Reply-To: <1461939663-5936-1-git-send-email-tipecaml@gmail.com>
* 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
next prev parent reply other threads:[~2016-04-29 14:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 14:20 [PATCH 00/10] Add python-barbicanclient Cyril Roelandt
2016-04-29 14:20 ` [PATCH 01/10] gnu: python2-jsonschema: make python-functools32 a propagated input Cyril Roelandt
2016-04-29 14:20 ` [PATCH 02/10] gnu: Update python-unittest2 to 0.6.0 Cyril Roelandt
2016-04-30 21:33 ` Leo Famulari
2016-05-06 1:28 ` Cyril Roelandt
2016-05-06 18:49 ` Leo Famulari
2016-05-03 18:19 ` Efraim Flashner
2016-05-06 0:08 ` Cyril Roelandt
2016-04-29 14:20 ` [PATCH 03/10] gnu: Add python-cmd2 Cyril Roelandt
2016-04-30 21:33 ` Leo Famulari
2016-04-29 14:20 ` [PATCH 04/10] gnu: remove test-only depencies of python-pbr Cyril Roelandt
2016-04-30 21:33 ` Leo Famulari
2016-05-03 18:23 ` Efraim Flashner
2016-05-03 18:27 ` Efraim Flashner
2016-04-29 14:20 ` [PATCH 05/10] gnu: Add python-pyinotify Cyril Roelandt
2016-04-29 14:20 ` [PATCH 06/10] gnu: Update python-oslo.log to 3.5.0 Cyril Roelandt
2016-04-29 14:21 ` [PATCH 07/10] gnu: Add python-funcsigs Cyril Roelandt
2016-04-30 21:33 ` Leo Famulari
2016-05-03 18:25 ` Efraim Flashner
2016-05-06 1:33 ` Cyril Roelandt
2016-04-29 14:21 ` [PATCH 08/10] gnu: Update python-mock to 2.0.0 Cyril Roelandt
2016-04-30 21:33 ` Leo Famulari
2016-04-29 14:21 ` [PATCH 09/10] gnu: Add python-cliff Cyril Roelandt
2016-04-30 21:33 ` Leo Famulari
2016-04-29 14:21 ` Cyril Roelandt [this message]
2016-04-30 21:33 ` [PATCH 10/10] gnu: Add python-barbicanclient Leo Famulari
2016-04-30 21:33 ` [PATCH 00/10] " Leo Famulari
2016-05-01 16:41 ` Leo Famulari
2016-05-06 1:34 ` Cyril Roelandt
2016-05-06 18:51 ` Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461939663-5936-11-git-send-email-tipecaml@gmail.com \
--to=tipecaml@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).