From b5af897a73aa211efd196906688191104f35ccc2 Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Tue, 19 Jul 2016 14:51:04 +0800 Subject: [PATCH] Remove python-keystoneclient dependency No need to depend on python-keystoneclient any more. And also, the example in add_client() is out-of-date. So remove it. Change-Id: Ie092414220ff9e8a97cf5883081cc0cab7986d74 --- .../openstack/common/apiclient/client.py | 19 ------------------- requirements.txt | 1 - 2 files changed, 20 deletions(-) diff --git a/congressclient/openstack/common/apiclient/client.py b/congressclient/openstack/common/apiclient/client.py index 1c1bfa6..d70fcd6 100644 --- a/congressclient/openstack/common/apiclient/client.py +++ b/congressclient/openstack/common/apiclient/client.py @@ -267,25 +267,6 @@ class HTTPClient(object): """Add a new instance of :class:`BaseClient` descendant. `self` will store a reference to `base_client_instance`. - - Example: - - >>> def test_clients(): - ... from keystoneclient.auth import keystone - ... from openstack.common.apiclient import client - ... auth = keystone.KeystoneAuthPlugin( - ... username="user", password="pass", tenant_name="tenant", - ... auth_url="http://auth:5000/v2.0") - ... openstack_client = client.HTTPClient(auth) - ... # create nova client - ... from novaclient.v1_1 import client - ... client.Client(openstack_client) - ... # create keystone client - ... from keystoneclient.v2_0 import client - ... client.Client(openstack_client) - ... # use them - ... openstack_client.identity.tenants.list() - ... openstack_client.compute.servers.list() """ service_type = base_client_instance.service_type if service_type and not hasattr(self, service_type): diff --git a/requirements.txt b/requirements.txt index c71b15b..0190955 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,5 @@ oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.15.0 # Apache-2.0 -python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0 requests>=2.10.0 # Apache-2.0 six>=1.9.0 # MIT