diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/create.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/create.py index 29c52579b79fd..4259db4c46867 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/create.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/create.py @@ -153,9 +153,9 @@ def create(ctx, name, integration_type, location, non_interactive, quiet, dry_ru eula = 'assets/eula.pdf' template_fields['terms'] = f'\n "terms": {{\n "eula": "{eula}"\n }},' - template_fields['author_info'] = ( - f'\n "author": {{\n "name": "{author_name}",\n "homepage": "{homepage}",\n "vendor_id": "{TODO_FILL_IN}",\n "sales_email": "{sales_email}",\n "support_email": "{support_email}"\n }},' # noqa - ) + template_fields[ + 'author_info' + ] = f'\n "author": {{\n "name": "{author_name}",\n "homepage": "{homepage}",\n "vendor_id": "{TODO_FILL_IN}",\n "sales_email": "{sales_email}",\n "support_email": "{support_email}"\n }},' # noqa template_fields['pricing_plan'] = '\n "pricing": [],' diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/e2e/run.py b/datadog_checks_dev/datadog_checks/dev/tooling/e2e/run.py index 9a9c4ef3bb154..95f85442803a4 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/e2e/run.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/e2e/run.py @@ -39,9 +39,9 @@ def start_environment(check, env): else: command = _tox + [env] env_vars['PYTEST_ADDOPTS'] += ' --benchmark-skip' - env_vars['TOX_TESTENV_PASSENV'] = ( - f'{E2E_TEAR_DOWN} PROGRAM* USERNAME PYTEST_ADDOPTS {" ".join(get_ci_env_vars())}' - ) + env_vars[ + 'TOX_TESTENV_PASSENV' + ] = f'{E2E_TEAR_DOWN} PROGRAM* USERNAME PYTEST_ADDOPTS {" ".join(get_ci_env_vars())}' result = _execute(check, command, env_vars) return parse_config_from_result(env, result) @@ -55,9 +55,9 @@ def stop_environment(check, env, metadata=None): else: command = _tox + [env] env_vars['PYTEST_ADDOPTS'] += ' --benchmark-skip' - env_vars['TOX_TESTENV_PASSENV'] = ( - f'{E2E_ENV_VAR_PREFIX}* {E2E_SET_UP} PROGRAM* USERNAME PYTEST_ADDOPTS {" ".join(get_ci_env_vars())}' - ) + env_vars[ + 'TOX_TESTENV_PASSENV' + ] = f'{E2E_ENV_VAR_PREFIX}* {E2E_SET_UP} PROGRAM* USERNAME PYTEST_ADDOPTS {" ".join(get_ci_env_vars())}' env_vars.update((metadata or {}).get('env_vars', {})) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/utils.py b/datadog_checks_dev/datadog_checks/dev/tooling/utils.py index bb2e8ed624d3f..3b855d4dd8264 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/utils.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/utils.py @@ -170,7 +170,13 @@ def initialize_root(config, agent=False, core=False, extras=False, marketplace=F repo_choice = ( 'core' if core - else 'extras' if extras else 'agent' if agent else 'marketplace' if marketplace else config.get('repo', 'core') + else 'extras' + if extras + else 'agent' + if agent + else 'marketplace' + if marketplace + else config.get('repo', 'core') ) config['repo_choice'] = repo_choice message = None @@ -182,7 +188,9 @@ def initialize_root(config, agent=False, core=False, extras=False, marketplace=F repo = ( 'datadog-agent' if repo_choice == 'agent' - else 'marketplace' if repo_choice == 'marketplace' else f'integrations-{repo_choice}' + else 'marketplace' + if repo_choice == 'marketplace' + else f'integrations-{repo_choice}' ) message = f'`{repo}` directory `{root}` does not exist, defaulting to the current location.'