diff --git a/Makefile b/Makefile index 67ecf96242b3..284b7d484cc8 100644 --- a/Makefile +++ b/Makefile @@ -376,6 +376,7 @@ test: . $(VENV_BASE)/awx/bin/activate; \ fi; \ PYTHONDONTWRITEBYTECODE=1 py.test -p no:cacheprovider -n auto $(TEST_DIRS) + cd awxkit && tox -re py3 awx-manage check_migrations --dry-run --check -n 'vNNN_missing_migration_file' test_unit: diff --git a/awxkit/awxkit/api/mixins/has_create.py b/awxkit/awxkit/api/mixins/has_create.py index 9736e9514b08..672a3efd5f43 100644 --- a/awxkit/awxkit/api/mixins/has_create.py +++ b/awxkit/awxkit/api/mixins/has_create.py @@ -375,14 +375,14 @@ def teardown(self): to_teardown = all_instantiated_dependencies(self) to_teardown_types = set(map(get_class_if_instance, to_teardown)) order = [ - set( - [ - potential for potential in ( - get_class_if_instance(x) for x in group) if potential in to_teardown_types - ] - ) - for group in page_creation_order(self, *to_teardown) + set( + [ + potential for potential in ( + get_class_if_instance(x) for x in group) if potential in to_teardown_types ] + ) + for group in page_creation_order(self, *to_teardown) + ] order.reverse() for teardown_group in order: for teardown_class in teardown_group: diff --git a/awxkit/awxkit/api/pages/unified_jobs.py b/awxkit/awxkit/api/pages/unified_jobs.py index bc369a03492a..38457d192276 100644 --- a/awxkit/awxkit/api/pages/unified_jobs.py +++ b/awxkit/awxkit/api/pages/unified_jobs.py @@ -33,8 +33,8 @@ def __str__(self): def result_stdout(self): if 'result_stdout' not in self.json and 'stdout' in self.related: return self.connection.get( - self.related.stdout, query_parameters=dict(format='txt_download') - ).content.decode() + self.related.stdout, query_parameters=dict(format='txt_download') + ).content.decode() if str(self.json.get('result_stdout')) == 'stdout capture is missing' and 'stdout' in self.related: ping = self.walk(resources.ping) if self.execution_node != ping.active_node: @@ -60,7 +60,7 @@ def assert_text_in_stdout(self, expected_text, replace_spaces=None, replace_newl pretty_stdout = pformat(stdout) raise AssertionError( 'Expected "{}", but it was not found in stdout. Full stdout:\n {}'.format(expected_text, pretty_stdout) - ) + ) @property def is_successful(self): diff --git a/awxkit/awxkit/api/pages/users.py b/awxkit/awxkit/api/pages/users.py index 702a19c549c1..2c25950e4c24 100644 --- a/awxkit/awxkit/api/pages/users.py +++ b/awxkit/awxkit/api/pages/users.py @@ -29,8 +29,9 @@ def payload(self, **kwargs): random_title()), email=kwargs.get( 'email', - '{}@example.com'.format(random_title(5, non_ascii=False))) - ) + '{}@example.com'.format(random_title(5, non_ascii=False)) + ) + ) return payload def create_payload(self, username='', password='', **kwargs): diff --git a/awxkit/awxkit/cli/format.py b/awxkit/awxkit/cli/format.py index adf84bd62a75..1a99a6eaf7a7 100644 --- a/awxkit/awxkit/cli/format.py +++ b/awxkit/awxkit/cli/format.py @@ -148,13 +148,16 @@ def format_human(output, fmt): else: output = [output] - return tabulate([ + return tabulate( + [ dict( (col, record.get(col, '')) for col in column_names ) for record in output - ], headers='keys', tablefmt='rst' + ], + headers='keys', + tablefmt='rst' ) diff --git a/awxkit/setup.py b/awxkit/setup.py index 0a68546096a0..aa41ca14ebcc 100644 --- a/awxkit/setup.py +++ b/awxkit/setup.py @@ -51,20 +51,21 @@ def run(self): version = '0.1.0' -setup(name='awxkit', - version=version, - description='awx cli client', - packages=find_packages(exclude=['test']), - cmdclass={ - 'clean': CleanCommand, - }, - include_package_data=True, - install_requires=requirements, - python_requires=">= 3.5", - entry_points={ - 'console_scripts': [ - 'akit=awxkit.scripts.basic_session:load_interactive', - 'awx=awxkit.cli:run' - ] - } +setup( + name='awxkit', + version=version, + description='awx cli client', + packages=find_packages(exclude=['test']), + cmdclass={ + 'clean': CleanCommand, + }, + include_package_data=True, + install_requires=requirements, + python_requires=">= 3.5", + entry_points={ + 'console_scripts': [ + 'akit=awxkit.scripts.basic_session:load_interactive', + 'awx=awxkit.cli:run' + ] + } ) diff --git a/setup.cfg b/setup.cfg index cb208fc8b817..e99856b7b1d2 100755 --- a/setup.cfg +++ b/setup.cfg @@ -18,4 +18,4 @@ exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory/ec2.py,awx/plugins [flake8] max-line-length=160 ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E303,W291,W391,W293,E731,W504 -exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/,installer/ +exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/,installer/,awxkit/test