From 35966f24aeb513da8693ff1c9dadaeca8cc07e71 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Fri, 10 Nov 2017 16:30:58 -0500 Subject: python-keystoneclient: uprev to latest stable/pike This package no longer contains bash-completions, so drop this part of the packaging. Remove old, no longer applicable patches. Update the list of runtime dependencies, based on required.txt. Requires the version update to python-django-openstack-auth. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../fix_keystoneclient_memory_leak.patch | 37 ---------------------- ...ent-fix-test-path-to-example-certificates.patch | 31 ------------------ 2 files changed, 68 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch delete mode 100644 meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch (limited to 'meta-openstack/recipes-devtools/python/python-keystoneclient') diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch deleted file mode 100644 index 05a1d23..0000000 --- a/meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- - keystoneclient/openstack/common/apiclient/client.py | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/keystoneclient/openstack/common/apiclient/client.py -+++ b/keystoneclient/openstack/common/apiclient/client.py -@@ -90,6 +90,7 @@ - self.user_agent = user_agent or self.user_agent - - self.times = [] # [("item", starttime, endtime), ...] -+ self.times_max_len = 200 - self.timings = timings - - # requests within the same session can reuse TCP connections from pool -@@ -142,6 +143,12 @@ - def reset_timings(self): - self.times = [] - -+ def get_timings_max_len(self): -+ return self.times_max_len -+ -+ def set_timings_max_len(self, new_len): -+ self.times_max_len = new_len -+ - def request(self, method, url, **kwargs): - """Send an http request with the specified characteristics. - -@@ -173,6 +180,9 @@ - if self.timings: - self.times.append(("%s %s" % (method, url), - start_time, time.time())) -+ # remove oldest items until we maintain max length -+ while len(self.times) > self.times_max_len: -+ del self.times[0] - self._http_log_resp(resp) - - if resp.status_code >= 400: diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch deleted file mode 100644 index a75e1da..0000000 --- a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fae14f85d43da3842b2a065baf0442d61a573598 Mon Sep 17 00:00:00 2001 -From: Keith Holman -Date: Fri, 13 Jun 2014 17:08:03 -0400 -Subject: [PATCH] keystoneclient: fix test path to example certificates - -The tests included with keystoneclient expect them to be ran from the -source tree. This fix changes base path of the system to where they -are actually deployed on the system. This fix is required for some -tests to work properly. - -Signed-off-by: Keith Holman ---- - keystoneclient/tests/client_fixtures.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keystoneclient/tests/client_fixtures.py b/keystoneclient/tests/client_fixtures.py -index 1743162..6bfcb93 100644 ---- a/keystoneclient/tests/client_fixtures.py -+++ b/keystoneclient/tests/client_fixtures.py -@@ -25,7 +25,7 @@ from keystoneclient import utils - - - TESTDIR = os.path.dirname(os.path.abspath(__file__)) --ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..', '..')) -+ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..')) - CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs') - CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms') - KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private') --- -1.9.3 - -- cgit v1.2.3-54-g00ecf