Skip to content

Commit be77d24

Browse files
author
caberos
committed
Merge branch 'master' of https://github.com/softlayer/softlayer-python into issue1453
2 parents fda7e0a + 7b2d070 commit be77d24

File tree

5 files changed

+39
-6
lines changed

5 files changed

+39
-6
lines changed

.github/workflows/test_pypi_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Publish 📦 to TestPyPI
44

55
on:
66
push:
7-
branches: [ master ]
7+
branches: [ test-pypi ]
88

99
jobs:
1010
build-n-publish:

CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
11
# Change Log
22

3+
## [5.9.4] - 2021-04-27
4+
https://github.com/softlayer/softlayer-python/compare/v5.9.3...v5.9.4
5+
6+
#### New Commands
7+
- `slcli hw authorize-storage` #1439
8+
- `slcli order quote-save` #1451
9+
10+
11+
#### Improvements
12+
13+
- Refactored managers.ordering_manager.verify_quote() to work better with the REST endpoing #1430
14+
- Add routers for each DC in slcli hw create-options #1432
15+
- Add preset datatype in slcli virtual detail #1435
16+
- Add upgrade option to slcli hw. #1437
17+
- Ibmcloud authentication support #1315 / #1447
18+
+ `slcli config setup --ibmid`
19+
+ `slcli config setup --sso`
20+
+ `slcli config setup --cloud_key`
21+
+ `slcli config setup --classic_key`
22+
- Refactor slcli hw detail prices. #1443
23+
- Updated contributing guide #1458
24+
- Add the Hardware components on "slcli hardware detail" #1452
25+
- Add billing and lastTransaction on hardware detail #1446
26+
- Forced reserved capacity guests to be monthly #1454
27+
- Removing the rwhois commands #1456
28+
- Added automation to publish to test-pypi #1467
29+
- Updating author_email to SLDN distro list #1469
30+
- Add the option to add and upgrade the hw disk. #1455
31+
- Added a utility to merge objectFilters, #1468
32+
- Fixes shift+ins when pasteing into a password field for windows users. #1460
33+
- Add Billing and lastTransaction on slcli virtual detail #1466
34+
- Fixing 'import mock' pylint issues #1476
35+
336

437
## [5.9.3] - 2021-03-03
538
https://github.com/softlayer/softlayer-python/compare/v5.9.2...v5.9.3

SoftLayer/CLI/sshkey/add.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ def cli(env, label, in_file, key, note):
3333
if key:
3434
key_text = key
3535
else:
36-
key_file = open(path.expanduser(in_file), 'rU')
37-
key_text = key_file.read().strip()
38-
key_file.close()
36+
with open(path.expanduser(in_file), 'rU') as key_file:
37+
key_text = key_file.read().strip()
38+
key_file.close()
3939

4040
mgr = SoftLayer.SshKeyManager(env.client)
4141
result = mgr.add_key(key_text, label, note)

SoftLayer/consts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
:license: MIT, see LICENSE for more details.
77
"""
8-
VERSION = 'v5.9.3'
8+
VERSION = 'v5.9.4'
99
API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/xmlrpc/v3.1/'
1010
API_PRIVATE_ENDPOINT = 'https://api.service.softlayer.com/xmlrpc/v3.1/'
1111
API_PUBLIC_ENDPOINT_REST = 'https://api.softlayer.com/rest/v3.1/'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
setup(
1818
name='SoftLayer',
19-
version='5.9.3',
19+
version='5.9.4',
2020
description=DESCRIPTION,
2121
long_description=LONG_DESCRIPTION,
2222
author='SoftLayer, Inc., an IBM Company',

0 commit comments

Comments
 (0)