Skip to content

Commit d38f319

Browse files
author
Elias Nygren
committed
use absolute imports within upcloud_api
1 parent a311c53 commit d38f319

22 files changed

+97
-98
lines changed

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
from setuptools import setup
44

55
setup(
6-
name='upcloud-api-python',
6+
name='upcloud-api',
77
version='0.2.0',
88
description='UpCloud API Client',
99
author='Elias Nygren',
1010
author_email='elias.nygren@upcloud.com',
1111
maintainer='Elias Nygren',
1212
maintainer_email='elias.nygren@upcloud.com',
1313
url='https://github.com/UpCloudLtd/upcloud-python-api',
14-
packages=['upcloud', 'upcloud.cloud_manager'],
14+
packages=['upcloud_api', 'upcloud_api.cloud_manager'],
1515
download='https://github.com/UpCloudLtd/upcloud-python-api/tarball/v0.2.0',
1616
license='MIT',
1717
install_requires=[

‎test/conftest.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22
from __future__ import print_function
33
from __future__ import division
44
from __future__ import absolute_import
5-
from builtins import open
5+
from builtins import object, open
66
from future import standard_library
77
standard_library.install_aliases()
8-
from builtins import object
9-
import os
10-
import pytest
11-
import responses
12-
import json
138

9+
import json, os, pytest, responses
1410

1511
@pytest.fixture(scope='module')
1612
def manager():
17-
import upcloud
18-
return upcloud.CloudManager("testuser", "mock-api-password")
13+
import upcloud_api
14+
return upcloud_api.CloudManager("testuser", "mock-api-password")
1915

2016

2117
class Mock(object):

‎test/live_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from builtins import input
66
from future import standard_library
77
standard_library.install_aliases()
8-
import sys
9-
from time import sleep
108

11-
import upcloud
12-
from upcloud import CloudManager, Server, Storage, FirewallRule, ZONE
9+
from upcloud_api import CloudManager, Server, Storage, FirewallRule, ZONE
10+
11+
from time import sleep
12+
import sys
1313

1414
# cluster to be used in live tests
1515
cluster = {

‎test/test_cloud_manager.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
from __future__ import print_function
33
from __future__ import division
44
from __future__ import absolute_import
5+
from builtins import object
56
from future import standard_library
67
standard_library.install_aliases()
7-
from builtins import object
8-
import responses
9-
import json
8+
109
from conftest import Mock
10+
import json, responses
11+
1112

1213
class TestCloudManagerBasic(object):
1314
@responses.activate
1415
def test_get_account(self, manager):
1516
data = Mock.mock_get("account")
16-
17+
1718
res = manager.authenticate()
1819
assert json.loads(data) == res
1920
res = manager.get_account()

‎test/test_firewall.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
from __future__ import print_function
33
from __future__ import division
44
from __future__ import absolute_import
5+
from builtins import object
56
from future import standard_library
67
standard_library.install_aliases()
7-
from builtins import object
8-
from upcloud import FirewallRule
9-
import responses
10-
import json
8+
9+
from upcloud_api import FirewallRule
10+
1111
from conftest import Mock
12-
import pytest
12+
import json, pytest, responses
1313

1414

1515
def firewall_rule_callback(request):

‎test/test_ip_manager.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
from __future__ import print_function
33
from __future__ import division
44
from __future__ import absolute_import
5+
from builtins import object
56
from future import standard_library
67
standard_library.install_aliases()
7-
from builtins import object
8-
import responses
9-
import json
8+
109
from conftest import Mock
10+
import json, responses
1111

1212
class TestIP(object):
1313
@responses.activate
@@ -52,10 +52,10 @@ def test_modify_ip(self, manager):
5252
data = Mock.mock_put("ip_address/10.1.0.101")
5353
ip_addr = manager.modify_IP("10.1.0.101", ptr_record="my.ptr.record")
5454
assert ip_addr.ptr == "my.ptr.record"
55-
55+
5656

5757
@responses.activate
5858
def test_ip_delete(self, manager):
5959
Mock.mock_delete("ip_address/10.1.0.101")
6060
res = manager.release_IP("10.1.0.101")
61-
assert res == {}
61+
assert res == {}

‎test/test_server.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
from __future__ import print_function
33
from __future__ import division
44
from __future__ import absolute_import
5-
from builtins import str
5+
from builtins import object, str
66
from future import standard_library
77
standard_library.install_aliases()
8-
from builtins import object
9-
import responses
10-
import json
8+
119
from conftest import Mock
12-
import pytest
10+
import json, pytest, responses
1311

1412
class TestServer(object):
1513
@responses.activate

‎test/test_server_creation.py‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,22 @@
22
from __future__ import print_function
33
from __future__ import division
44
from __future__ import absolute_import
5+
from builtins import object
56
from future import standard_library
67
standard_library.install_aliases()
7-
from builtins import object
8+
9+
from upcloud_api import ZONE, Server, Storage
10+
811
from conftest import Mock
9-
from upcloud import ZONE
10-
from upcloud import Server
11-
from upcloud import Storage
12-
import responses
13-
import json
14-
import pytest
12+
import json, pytest, responses
1513

16-
class TestCreateServer(object):
1714

15+
class TestCreateServer(object):
1816

1917
def test_storage_prepare_post_body(self, manager):
2018
s1 = Storage(os="Ubuntu 14.04", size=10)
2119
body1 = s1.prepare_post_body("my.example.com", 1)
22-
20+
2321
assert body1['title'] == "my.example.com OS disk"
2422
assert body1['tier'] == "maxiops"
2523
assert body1['size'] == 10
@@ -32,7 +30,7 @@ def test_storage_prepare_post_body(self, manager):
3230
assert body2['title'] == 'my.example.com storage disk 1'
3331
assert body2['tier'] == 'maxiops'
3432
assert body2['action'] == 'create'
35-
assert body2['size'] == 100
33+
assert body2['size'] == 100
3634

3735
def test_storage_prepare_post_body_optional_attributes(self, manager):
3836
s2 = Storage(size=100, address="virtio:0", type="disk")
@@ -84,11 +82,11 @@ def test_server_prepare_post_body(self):
8482
assert body["server"]["zone"] == "us-chi1"
8583

8684
def test_server_prepare_post_body_optional_attributes(self):
87-
server = Server(core_number=2, memory_amount=1024,
88-
hostname="my.example.com",zone=ZONE.Chicago,
85+
server = Server(core_number=2, memory_amount=1024,
86+
hostname="my.example.com",zone=ZONE.Chicago,
8987
storage_devices=[ Storage(os="Ubuntu 14.04", size=10)],
9088
vnc_password="my-passwd", password_delivery="email" )
91-
89+
9290
body = server.prepare_post_body()
9391
assert body["server"]["title"] == "my.example.com"
9492
assert body["server"]["core_number"] == 2
@@ -100,9 +98,9 @@ def test_server_prepare_post_body_optional_attributes(self):
10098

10199
@responses.activate
102100
def test_create_server(self, manager):
103-
101+
104102
responses.add(
105-
responses.POST,
103+
responses.POST,
106104
Mock.base_url + "/server",
107105
body = Mock.read_from_file("server_create.json"),
108106
status = 202,
@@ -115,7 +113,7 @@ def test_create_server(self, manager):
115113
])
116114

117115
manager.create_server(server1)
118-
116+
119117
# assert correct values in response
120118
assert type(server1).__name__ == "Server"
121119
assert server1.core_number == "2"

‎test/test_storage.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
from __future__ import print_function
33
from __future__ import division
44
from __future__ import absolute_import
5+
from builtins import object
56
from future import standard_library
67
standard_library.install_aliases()
7-
from builtins import object
8-
import responses
9-
import json
8+
109
from conftest import Mock
10+
import json, responses
11+
1112

1213
class TestStorage(object):
1314
@responses.activate
@@ -38,7 +39,7 @@ def test_storage_create(self, manager):
3839

3940
@responses.activate
4041
def test_storage_update(self, manager):
41-
42+
4243
Mock.mock_put("storage/01d4fcd4-e446-433b-8a9c-551a1284952e")
4344
storage = manager.modify_storage("01d4fcd4-e446-433b-8a9c-551a1284952e", title="my bigger data collection", size=15)
4445
assert type(storage).__name__ == "Storage"
@@ -49,7 +50,7 @@ def test_storage_update(self, manager):
4950
def test_storage_update_oop(self, manager):
5051
data = Mock.mock_get("storage/01d4fcd4-e446-433b-8a9c-551a1284952e")
5152
storage = manager.get_storage("01d4fcd4-e446-433b-8a9c-551a1284952e")
52-
53+
5354
Mock.mock_put("storage/01d4fcd4-e446-433b-8a9c-551a1284952e")
5455
storage.update(title="my bigger data collection", size=15)
5556
assert storage.title == "my bigger data collection"

‎upcloud_api/__init__.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
Python Interface to UpCloud's API
33
"""
4+
45
from __future__ import unicode_literals
56
from __future__ import print_function
67
from __future__ import division
@@ -15,10 +16,9 @@
1516
__copyright__ = "Copyright (c) 2015 Elias Nygren"
1617

1718

18-
from .server import Server
19-
from .storage import Storage
20-
from .ip_address import IP_address
21-
from .firewall import FirewallRule
22-
from .cloud_manager import CloudManager
23-
from .tools import OperatingSystems
24-
from .tools import ZONE
19+
from upcloud_api.server import Server
20+
from upcloud_api.storage import Storage
21+
from upcloud_api.ip_address import IP_address
22+
from upcloud_api.firewall import FirewallRule
23+
from upcloud_api.tools import OperatingSystems, ZONE
24+
from upcloud_api.cloud_manager.cloud_manager import CloudManager

0 commit comments

Comments
 (0)