openstack/python-solumclient
Code Issues Proposed changes

Update hacking for Python3

Browse Source 
The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found.

Change-Id: I47e9bc0fe940bb84e4b8cf05a37e236ab93f7bb7
This commit is contained in:
Andreas Jaeger
2020-03-31 12:27:20 +02:00
parent c0a1af6aee
commit 8b834e7075
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
solumclient/solum.py
View File

@@ -516,12 +516,12 @@ Available commands:
def _validate_app_file(self, app_data): def _validate_app_file(self, app_data):
if ('workflow_config' in app_data and if ('workflow_config' in app_data and
app_data.get('workflow_config') is None): app_data.get('workflow_config') is None):
msg = "Workflow config cannot be empty" msg = "Workflow config cannot be empty"
raise exc.CommandException(message=msg) raise exc.CommandException(message=msg)
if ('trigger_actions' in app_data and if ('trigger_actions' in app_data and
app_data.get('trigger_actions') is None): app_data.get('trigger_actions') is None):
msg = "Trigger actions cannot be empty" msg = "Trigger actions cannot be empty"
raise exc.CommandException(message=msg) raise exc.CommandException(message=msg)
error_message = ("Application name must be 1-100 characters long, " error_message = ("Application name must be 1-100 characters long, "
"only contain a-z,0-9,-,_ and start with an alphabet " "only contain a-z,0-9,-,_ and start with an alphabet "
@@ -616,19 +616,19 @@ Available commands:
git_url = None git_url = None
if (app_data.get('source') is not None and if (app_data.get('source') is not None and
app_data.get('source').get('repository') is not None): app_data.get('source').get('repository') is not None):
git_url = app_data['source']['repository'] git_url = app_data['source']['repository']
# Commandline flag overrides stuff in the app-file # Commandline flag overrides stuff in the app-file
if args.git_url is not None: if args.git_url is not None:
git_url = args.git_url git_url = args.git_url
# Take input from user # Take input from user
elif (app_data.get('source') is None or elif (app_data.get('source') is None or
app_data['source'].get('repository') is None or app_data['source'].get('repository') is None or
app_data['source']['repository'] is ''): app_data['source']['repository'] == ''):
git_url = six.moves.input("Please specify a git repository URL " git_url = six.moves.input("Please specify a git repository URL "
"for your application.\n> ") "for your application.\n> ")
git_rev_i = six.moves.input("Please specify revision" git_rev_i = six.moves.input("Please specify revision"
"(default is master).\n> ") "(default is master).\n> ")
if git_rev_i is '': if git_rev_i == '':
git_rev = 'master' git_rev = 'master'
else: else:
git_rev = git_rev_i git_rev = git_rev_i
@@ -666,7 +666,7 @@ Available commands:
if args.run_cmd is not None: if args.run_cmd is not None:
run_cmd = args.run_cmd run_cmd = args.run_cmd
elif (app_data.get('workflow_config') is None or elif (app_data.get('workflow_config') is None or
app_data['workflow_config'].get('run_cmd') is '' or app_data['workflow_config'].get('run_cmd') == '' or
app_data['workflow_config'].get('run_cmd') is None): app_data['workflow_config'].get('run_cmd') is None):
run_cmd = six.moves.input("Please specify start/run command for " run_cmd = six.moves.input("Please specify start/run command for "
"your application.\n> ") "your application.\n> ")
@@ -675,7 +675,7 @@ Available commands:
run_cmd_dict = dict() run_cmd_dict = dict()
run_cmd_dict['run_cmd'] = run_cmd run_cmd_dict['run_cmd'] = run_cmd
app_data['workflow_config'] = run_cmd_dict app_data['workflow_config'] = run_cmd_dict
elif (app_data['workflow_config'].get('run_cmd') is '' or elif (app_data['workflow_config'].get('run_cmd') == '' or
app_data['workflow_config'].get('run_cmd') is None): app_data['workflow_config'].get('run_cmd') is None):
app_data['workflow_config']['run_cmd'] = run_cmd app_data['workflow_config']['run_cmd'] = run_cmd
@@ -688,7 +688,7 @@ Available commands:
unittest_cmd_dict = dict() unittest_cmd_dict = dict()
unittest_cmd_dict['test_cmd'] = unittest_cmd unittest_cmd_dict['test_cmd'] = unittest_cmd
app_data['workflow_config'] = unittest_cmd_dict app_data['workflow_config'] = unittest_cmd_dict
elif (app_data['workflow_config'].get('test_cmd') is '' or elif (app_data['workflow_config'].get('test_cmd') == '' or
app_data['workflow_config'].get('test_cmd') is None): app_data['workflow_config'].get('test_cmd') is None):
app_data['workflow_config']['test_cmd'] = unittest_cmd app_data['workflow_config']['test_cmd'] = unittest_cmd
@@ -696,7 +696,7 @@ Available commands:
port_list = [] port_list = []
if (app_data.get('ports') is None or if (app_data.get('ports') is None or
app_data['ports'] is '' or app_data['ports'] == [None]): app_data['ports'] == '' or app_data['ports'] == [None]):
if args.port: if args.port:
port_list.append(int(args.port)) port_list.append(int(args.port))
else: else:
@@ -1577,7 +1577,7 @@ Available commands:
# Update name and description if specified. # Update name and description if specified.
a_name = '' a_name = ''
if (plan_definition['artifacts'][0].get('name') is not None if (plan_definition['artifacts'][0].get('name') is not None
and plan_definition['artifacts'][0]['name'] is not ''): and plan_definition['artifacts'][0]['name'] != ''):
a_name = plan_definition['artifacts'][0]['name'] a_name = plan_definition['artifacts'][0]['name']
a_name = a_name.lower() a_name = a_name.lower()
else: else:
@@ -1932,5 +1932,6 @@ Available commands:
else: else:
print(main.__doc__) print(main.__doc__)
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())

2
test-requirements.txt
View File

@@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 hacking>=3.0,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD