From f9c6cb9a18f2a8c9fec4fa22895c46ed0edfb4c1 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 24 Nov 2014 14:25:53 +0100 Subject: [PATCH] Use tarballs in requirements.txt Because using repositories breaks tests in tuskar-ui-extras and is generally discouraged. Also, remove empty lines from between imports, becase now tuskarclient is and external project according to pep8. Change-Id: I54c7ea994bc0e4167dab00af9be503c9f3e3dc06 --- requirements.txt | 3 +-- tuskar_ui/api/tuskar.py | 1 - tuskar_ui/exceptions.py | 1 - tuskar_ui/test/test_data/exceptions.py | 1 - tuskar_ui/test/test_data/tuskar_data.py | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index f79f09287..18ddca9b7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,5 +25,4 @@ pytz lockfile>=0.8 python-ironicclient>=0.2.1 -#http://tarballs.openstack.org/python-tuskarclient/python-tuskarclient-master.tar.gz#egg=python-tuskarclient --e git+http://git.openstack.org/cgit/openstack/python-tuskarclient/#egg=python-tuskarclient +http://tarballs.openstack.org/python-tuskarclient/python-tuskarclient-master.tar.gz#egg=python-tuskarclient diff --git a/tuskar_ui/api/tuskar.py b/tuskar_ui/api/tuskar.py index e0162c255..7789b6cb4 100644 --- a/tuskar_ui/api/tuskar.py +++ b/tuskar_ui/api/tuskar.py @@ -21,7 +21,6 @@ from openstack_dashboard.api import base from openstack_dashboard.api import glance from openstack_dashboard.api import neutron from os_cloud_config import keystone_pki - from tuskarclient import client as tuskar_client from tuskar_ui.api import flavor diff --git a/tuskar_ui/exceptions.py b/tuskar_ui/exceptions.py index 1d0856489..c733264c0 100644 --- a/tuskar_ui/exceptions.py +++ b/tuskar_ui/exceptions.py @@ -12,7 +12,6 @@ # under the License. from openstack_dashboard import exceptions - from tuskarclient.openstack.common.apiclient import exceptions as tuskarclient NOT_FOUND = exceptions.NOT_FOUND diff --git a/tuskar_ui/test/test_data/exceptions.py b/tuskar_ui/test/test_data/exceptions.py index 480189cf3..2b56032ad 100644 --- a/tuskar_ui/test/test_data/exceptions.py +++ b/tuskar_ui/test/test_data/exceptions.py @@ -12,7 +12,6 @@ # under the License. from openstack_dashboard.test.test_data import exceptions - from tuskarclient.openstack.common.apiclient import exceptions as tuskarclient diff --git a/tuskar_ui/test/test_data/tuskar_data.py b/tuskar_ui/test/test_data/tuskar_data.py index 0abf45ad0..bf932b681 100644 --- a/tuskar_ui/test/test_data/tuskar_data.py +++ b/tuskar_ui/test/test_data/tuskar_data.py @@ -11,7 +11,6 @@ # under the License. from openstack_dashboard.test.test_data import utils as test_data_utils - from tuskarclient.v2 import plans from tuskarclient.v2 import roles