Skip to content

Commit

Permalink
Lint python files
Browse files Browse the repository at this point in the history
  • Loading branch information
txominpelu committed Mar 18, 2024
1 parent 1d9750f commit a6a979e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],'

Expand Down
12 changes: 6 additions & 6 deletions datadog_checks_dev/datadog_checks/dev/tooling/e2e/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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', {}))

Expand Down
12 changes: 10 additions & 2 deletions datadog_checks_dev/datadog_checks/dev/tooling/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.'

Expand Down

0 comments on commit a6a979e

Please sign in to comment.