From 275c0c27fed13182411a3f3b1843ddf42fff4c45 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Mon, 28 Mar 2022 22:38:59 -0400 Subject: [PATCH] Support newer versions of `click` (#11746) * Support newer versions of `click` * . * style --- aerospike/datadog_checks/aerospike/aerospike.py | 2 +- aerospike/tests/test_unit.py | 2 +- datadog_checks_base/datadog_checks/base/utils/network.py | 1 - datadog_checks_base/datadog_checks/base/utils/platform.py | 2 +- datadog_checks_base/tests/base/checks/openmetrics/utils.py | 1 - datadog_checks_dev/datadog_checks/dev/fs.py | 1 - datadog_checks_dev/datadog_checks/dev/plugin/tox.py | 2 +- .../dev/tooling/commands/agent/integrations_changelog.py | 2 +- .../datadog_checks/dev/tooling/commands/clean.py | 2 +- .../datadog_checks/dev/tooling/commands/env/edit.py | 4 ++-- .../datadog_checks/dev/tooling/commands/env/ls.py | 2 +- .../datadog_checks/dev/tooling/commands/env/reload.py | 4 ++-- .../datadog_checks/dev/tooling/commands/env/shell.py | 4 ++-- .../datadog_checks/dev/tooling/commands/env/start.py | 4 ++-- .../datadog_checks/dev/tooling/commands/env/stop.py | 4 ++-- .../datadog_checks/dev/tooling/commands/env/test.py | 2 +- .../datadog_checks/dev/tooling/commands/meta/catalog.py | 2 +- .../datadog_checks/dev/tooling/commands/release/build.py | 2 +- .../datadog_checks/dev/tooling/commands/release/changelog.py | 2 +- .../datadog_checks/dev/tooling/commands/release/make.py | 2 +- .../dev/tooling/commands/release/show/changes.py | 2 +- .../datadog_checks/dev/tooling/commands/release/tag.py | 2 +- .../datadog_checks/dev/tooling/commands/release/upload.py | 2 +- .../datadog_checks/dev/tooling/commands/test.py | 2 +- .../dev/tooling/commands/validate/agent_reqs.py | 2 +- .../dev/tooling/commands/validate/agent_signature.py | 2 +- .../dev/tooling/commands/validate/all_validations.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/config.py | 2 +- .../dev/tooling/commands/validate/dashboards.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/dep.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/eula.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/http.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/imports.py | 2 +- .../dev/tooling/commands/validate/integration_style.py | 2 +- .../dev/tooling/commands/validate/jmx_metrics.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/manifest.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/metadata.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/models.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/package.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/readmes.py | 2 +- .../dev/tooling/commands/validate/recommended_monitors.py | 2 +- .../dev/tooling/commands/validate/saved_views.py | 2 +- .../dev/tooling/commands/validate/service_checks.py | 2 +- .../datadog_checks/dev/tooling/commands/validate/typos.py | 2 +- datadog_checks_dev/pyproject.toml | 2 +- disk/datadog_checks/disk/disk.py | 1 - ecs_fargate/datadog_checks/ecs_fargate/ecs_fargate.py | 2 +- kubelet/datadog_checks/kubelet/prometheus.py | 2 +- mongo/datadog_checks/mongo/collectors/replication_info.py | 4 ++-- network/tests/test_network.py | 1 - php_fpm/datadog_checks/php_fpm/php_fpm.py | 2 +- snmp/datadog_checks/snmp/snmp.py | 4 ++-- tls/datadog_checks/tls/utils.py | 1 - tokumx/datadog_checks/tokumx/tokumx.py | 4 ++-- 54 files changed, 56 insertions(+), 62 deletions(-) diff --git a/aerospike/datadog_checks/aerospike/aerospike.py b/aerospike/datadog_checks/aerospike/aerospike.py index 7481793455bde..0174f61fac609 100644 --- a/aerospike/datadog_checks/aerospike/aerospike.py +++ b/aerospike/datadog_checks/aerospike/aerospike.py @@ -416,7 +416,7 @@ def collect_latencies(self, namespaces): latencies = bucket_vals.split(',') if latencies and len(latencies) == 17: for i in range(len(latencies)): - bucket = 2 ** i + bucket = 2**i tags = namespace_tags + ['bucket:{}'.format(bucket)] latency_name = metric_name self.send(NAMESPACE_LATENCY_METRIC_TYPE, latency_name, latencies[i], tags) diff --git a/aerospike/tests/test_unit.py b/aerospike/tests/test_unit.py index 8ebe3a79d0b98..cba9727d0bc15 100644 --- a/aerospike/tests/test_unit.py +++ b/aerospike/tests/test_unit.py @@ -174,7 +174,7 @@ def test_collect_latencies_parser(aggregator): for metric_type in ['read', 'udf']: for i in range(17): - bucket = 2 ** i + bucket = 2**i aggregator.assert_metric( 'aerospike.namespace.latency.{}'.format(metric_type), tags=['namespace:{}'.format('test'), 'tag:value', 'bucket:{}'.format(str(bucket))], diff --git a/datadog_checks_base/datadog_checks/base/utils/network.py b/datadog_checks_base/datadog_checks/base/utils/network.py index 7f842f295b0a3..4f5c837b53d12 100644 --- a/datadog_checks_base/datadog_checks/base/utils/network.py +++ b/datadog_checks_base/datadog_checks/base/utils/network.py @@ -10,7 +10,6 @@ def closing(sock): return _closing(sock) - else: def closing(sock): diff --git a/datadog_checks_base/datadog_checks/base/utils/platform.py b/datadog_checks_base/datadog_checks/base/utils/platform.py index c4735447e096e..e9f871a7e46e8 100644 --- a/datadog_checks_base/datadog_checks/base/utils/platform.py +++ b/datadog_checks_base/datadog_checks/base/utils/platform.py @@ -78,7 +78,7 @@ def is_windows(name=None): @staticmethod def python_architecture(): - if sys.maxsize > 2 ** 32: + if sys.maxsize > 2**32: return "64bit" else: return "32bit" diff --git a/datadog_checks_base/tests/base/checks/openmetrics/utils.py b/datadog_checks_base/tests/base/checks/openmetrics/utils.py index 5248e374090d0..3dcae50e3cc2c 100644 --- a/datadog_checks_base/tests/base/checks/openmetrics/utils.py +++ b/datadog_checks_base/tests/base/checks/openmetrics/utils.py @@ -11,7 +11,6 @@ class LegacyCheck(OpenMetricsBaseCheckV2): def create_scraper(self, config): return OpenMetricsCompatibilityScraper(self, self.get_config_with_defaults(config)) - except Exception: pass diff --git a/datadog_checks_dev/datadog_checks/dev/fs.py b/datadog_checks_dev/datadog_checks/dev/fs.py index 917862944054f..c715d2ed466ff 100644 --- a/datadog_checks_dev/datadog_checks/dev/fs.py +++ b/datadog_checks_dev/datadog_checks/dev/fs.py @@ -27,7 +27,6 @@ def write_file_lines(file, lines, encoding='utf-8'): with open(file, 'w', encoding=encoding) as f: f.writelines(lines) - else: def write_file(file, contents, encoding='utf-8'): diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py index 367a2599a0ecb..c5736e0621d43 100644 --- a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py +++ b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py @@ -20,7 +20,7 @@ # Style deps: # We pin deps in order to make CI more stable/reliable. ISORT_DEP = 'isort==5.10.0' -BLACK_DEP = 'black==21.10b0' +BLACK_DEP = 'black==22.3.0' FLAKE8_DEP = 'flake8==4.0.1' FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==21.9.2' FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format==0.6.0' diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/agent/integrations_changelog.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/agent/integrations_changelog.py index cc6b3f8c5de02..d305294677fe2 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/agent/integrations_changelog.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/agent/integrations_changelog.py @@ -22,7 +22,7 @@ context_settings=CONTEXT_SETTINGS, short_help="Update integration CHANGELOG.md by adding the Agent version", ) -@click.argument('checks', autocompletion=complete_active_checks, nargs=-1) +@click.argument('checks', shell_complete=complete_active_checks, nargs=-1) @click.option('--since', help="Initial Agent version", default='6.3.0') @click.option('--to', help="Final Agent version") @click.option( diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/clean.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/clean.py index 718423eadc02b..8863ca8e107bf 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/clean.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/clean.py @@ -13,7 +13,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help="Remove a project's build artifacts") -@click.argument('check', autocompletion=complete_testable_checks, required=False) +@click.argument('check', shell_complete=complete_testable_checks, required=False) @click.option( '--compiled-only', '-c', is_flag=True, help=f"Remove compiled files only ({', '.join(sorted(DELETE_EVERYWHERE))})." ) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/edit.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/edit.py index 5dfdd07018278..8ec60636e8ad9 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/edit.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/edit.py @@ -11,8 +11,8 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Edit config file using default editor') -@click.argument('check', autocompletion=complete_active_checks) -@click.argument('env', autocompletion=complete_configured_envs) +@click.argument('check', shell_complete=complete_active_checks) +@click.argument('env', shell_complete=complete_configured_envs) @click.option('--editor', '-e', help='Editor to use') @click.pass_context def edit(ctx, check, env, editor): diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/ls.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/ls.py index 751bcf1d9ad18..90ad2c8bf8c2e 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/ls.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/ls.py @@ -10,7 +10,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='List active or available environments') -@click.argument('checks', nargs=-1, autocompletion=complete_testable_checks) +@click.argument('checks', nargs=-1, shell_complete=complete_testable_checks) def ls(checks): """List active or available environments.""" if checks: diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/reload.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/reload.py index 2661fc55bca96..c0736e157f1f0 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/reload.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/reload.py @@ -9,8 +9,8 @@ @click.command('reload', context_settings=CONTEXT_SETTINGS, short_help='Restart an Agent to detect environment changes') -@click.argument('check', autocompletion=complete_active_checks) -@click.argument('env', autocompletion=complete_configured_envs, required=False) +@click.argument('check', shell_complete=complete_active_checks) +@click.argument('env', shell_complete=complete_configured_envs, required=False) def reload_env(check, env): """Restart an Agent to detect environment changes.""" envs = get_configured_envs(check) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/shell.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/shell.py index 5c816df1a153c..38af40c82607a 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/shell.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/shell.py @@ -9,8 +9,8 @@ @click.command('shell', context_settings=CONTEXT_SETTINGS, short_help='Run a shell inside agent container') -@click.argument('check', autocompletion=complete_active_checks) -@click.argument('env', autocompletion=complete_configured_envs, required=False) +@click.argument('check', shell_complete=complete_active_checks) +@click.argument('env', shell_complete=complete_configured_envs, required=False) @click.option('-c', '--exec-command', help='Optionally execute command inside container, executes after any installs') @click.option('-v', '--install-vim', is_flag=True, help='Optionally install editing/viewing tools vim and less') @click.option('-i', '--install-tools', multiple=True, help='Optionally install custom tools') diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/start.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/start.py index 26a84ae00b866..af5aa0cb93dd6 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/start.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/start.py @@ -20,8 +20,8 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Start an environment') -@click.argument('check', autocompletion=complete_testable_checks) -@click.argument('env', autocompletion=complete_envs) +@click.argument('check', shell_complete=complete_testable_checks) +@click.argument('env', shell_complete=complete_envs) @click.option( '--agent', '-a', diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/stop.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/stop.py index 2c534ba8fbcaa..aa88c82fd940f 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/stop.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/stop.py @@ -13,8 +13,8 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Stop environments.') -@click.argument('check', autocompletion=complete_active_checks) -@click.argument('env', autocompletion=complete_configured_envs, required=False) +@click.argument('check', shell_complete=complete_active_checks) +@click.argument('env', shell_complete=complete_configured_envs, required=False) def stop(check, env): """Stop environments, use "all" as check argument to stop everything.""" all_checks = check == 'all' diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/test.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/test.py index d6de6462f4cff..4b8be8a3e516f 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/test.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/env/test.py @@ -14,7 +14,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Test an environment') -@click.argument('checks', autocompletion=complete_active_checks, nargs=-1) +@click.argument('checks', shell_complete=complete_active_checks, nargs=-1) @click.option( '--agent', '-a', diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/meta/catalog.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/meta/catalog.py index 18051a778cf73..bf44d53dd7839 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/meta/catalog.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/meta/catalog.py @@ -35,7 +35,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Create a catalog with information about integrations') -@click.argument('checks', nargs=-1, autocompletion=complete_valid_checks, required=True) +@click.argument('checks', nargs=-1, shell_complete=complete_valid_checks, required=True) @click.option( '-f', '--file', diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/build.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/build.py index fc10340f6147d..abd0e5f0ff502 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/build.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/build.py @@ -13,7 +13,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Build a wheel for a check') -@click.argument('check', autocompletion=complete_testable_checks) +@click.argument('check', shell_complete=complete_testable_checks) @click.option('--sdist', '-s', is_flag=True) def build(check, sdist): """Build a wheel for a check as it is on the repo HEAD""" diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/changelog.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/changelog.py index b510d3f91b2dc..686009513f4e6 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/changelog.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/changelog.py @@ -21,7 +21,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Update the changelog for a check') -@click.argument('check', autocompletion=complete_testable_checks, callback=validate_check_arg) +@click.argument('check', shell_complete=complete_testable_checks, callback=validate_check_arg) @click.argument('version') @click.argument('old_version', required=False) @click.option('--end') diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/make.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/make.py index 49c319c75bd24..dacc6956daf4a 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/make.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/make.py @@ -17,7 +17,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Release one or more checks') -@click.argument('checks', autocompletion=complete_valid_checks, nargs=-1, required=True) +@click.argument('checks', shell_complete=complete_valid_checks, nargs=-1, required=True) @click.option('--version') @click.option('--end') @click.option('--new', 'initial_release', is_flag=True, help='Ensure versions are at 1.0.0') diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/show/changes.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/show/changes.py index 2d0d4b4251d4a..e60c0bd1765d1 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/show/changes.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/show/changes.py @@ -20,7 +20,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Show all the pending PRs for a given check.') -@click.argument('check', autocompletion=complete_valid_checks, callback=validate_check_arg) +@click.argument('check', shell_complete=complete_valid_checks, callback=validate_check_arg) @click.option('--organization', '-r', default='DataDog', help="The Github organization the repository belongs to") @click.option( '--tag-pattern', diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/tag.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/tag.py index 8ae978224c30d..12118ae74c878 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/tag.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/tag.py @@ -14,7 +14,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Tag the git repo with the current release of a check') -@click.argument('check', autocompletion=complete_valid_checks) +@click.argument('check', shell_complete=complete_valid_checks) @click.argument('version', required=False) @click.option('--push/--no-push', default=True) @click.option('--dry-run', '-n', is_flag=True) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/upload.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/upload.py index 8042855101bba..5053bf1bb6ad9 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/upload.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/release/upload.py @@ -14,7 +14,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Build and upload a check to PyPI') -@click.argument('check', autocompletion=complete_valid_checks) +@click.argument('check', shell_complete=complete_valid_checks) @click.option('--sdist', '-s', is_flag=True) @click.option('--dry-run', '-n', is_flag=True) @click.pass_context diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/test.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/test.py index 3eabf681a0cc6..78daab0ed492f 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/test.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/test.py @@ -26,7 +26,7 @@ def display_envs(check_envs): @click.command(context_settings=CONTEXT_SETTINGS, short_help='Run tests') -@click.argument('checks', autocompletion=complete_testable_checks, nargs=-1) +@click.argument('checks', shell_complete=complete_testable_checks, nargs=-1) @click.option('--format-style', '-fs', is_flag=True, help='Run only the code style formatter') @click.option('--style', '-s', is_flag=True, help='Run only style checks') @click.option('--bench', '-b', is_flag=True, help='Run only benchmarks') diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_reqs.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_reqs.py index 567909bd40cde..d068b3a59908e 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_reqs.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_reqs.py @@ -16,7 +16,7 @@ context_settings=CONTEXT_SETTINGS, short_help="Verify that the checks versions are in sync with the requirements-agent-release.txt file", ) -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def agent_reqs(check): """Verify that the checks versions are in sync with the requirements-agent-release.txt file. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_signature.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_signature.py index e02d155deefae..3f4c6ef13dd11 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_signature.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/agent_signature.py @@ -16,7 +16,7 @@ context_settings=CONTEXT_SETTINGS, short_help='Validate that no integration uses the legacy signature', ) -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def legacy_signature(check): """Validate that no integration uses the legacy signature. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/all_validations.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/all_validations.py index 561c0a76be3e8..8574b2bac1474 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/all_validations.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/all_validations.py @@ -55,7 +55,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Run all CI validations for a repo') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.pass_context def all(ctx, check): """Run all CI validations for a repo. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/config.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/config.py index 92f42c860af5b..ff992ee41b090 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/config.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/config.py @@ -34,7 +34,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate default configuration files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--sync', '-s', is_flag=True, help='Generate example configuration files based on specifications') @click.option('--verbose', '-v', is_flag=True, help='Verbose mode') @click.pass_context diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dashboards.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dashboards.py index 0d57a5765f810..07db22bcef0c2 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dashboards.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dashboards.py @@ -69,7 +69,7 @@ def check_widgets(decoded, filename, app_uuid, fix, file_fixed, file_failed, dis @click.command('dashboards', context_settings=CONTEXT_SETTINGS, short_help='Validate dashboard definition JSON files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--fix', is_flag=True, help='Attempt to fix errors') def dashboards(check, fix): """Validate all Dashboard definition files. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dep.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dep.py index c098200cbafd4..7871d5d7eece3 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/dep.py @@ -140,7 +140,7 @@ def verify_dependency(source, name, python_versions, file): @click.command(context_settings=CONTEXT_SETTINGS, short_help='Verify dependencies across all checks') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option( '--require-base-check-version', is_flag=True, help='Require specific version for datadog-checks-base requirement' ) diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/eula.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/eula.py index 1f90406c4b28d..0aa93a347be5b 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/eula.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/eula.py @@ -10,7 +10,7 @@ @click.command('eula', context_settings=CONTEXT_SETTINGS, short_help='Validate EULA files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def eula(check): """Validate all EULA definition files. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/http.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/http.py index 83b14875ce040..5662f4335fcde 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/http.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/http.py @@ -119,7 +119,7 @@ def validate_use_http_wrapper(check): @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate usage of http wrapper') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def http(check): """Validate all integrations for usage of http wrapper.""" diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/imports.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/imports.py index 7f49f957f3bd8..867cb749ca7bb 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/imports.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/imports.py @@ -55,7 +55,7 @@ def validate_import(filepath, check, autofix): @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate proper base imports') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--autofix', is_flag=True, help='Apply suggested fix') @click.pass_context def imports(ctx, check, autofix): diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/integration_style.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/integration_style.py index fece8bbacbaae..6923e86bce500 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/integration_style.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/integration_style.py @@ -11,7 +11,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate check style for python files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--verbose', '-v', is_flag=True, help='Verbose mode') @click.pass_context def integration_style(ctx, check, verbose): diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/jmx_metrics.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/jmx_metrics.py index 4313b7c93dd3e..2d7802e7eb88d 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/jmx_metrics.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/jmx_metrics.py @@ -19,7 +19,7 @@ @click.command('jmx-metrics', context_settings=CONTEXT_SETTINGS, short_help='Validate JMX metrics files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--verbose', '-v', is_flag=True, help='Verbose mode') def jmx_metrics(check, verbose): """Validate all default JMX metrics definitions. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/manifest.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/manifest.py index d2f54137a1548..7043d796ddcaf 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/manifest.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/manifest.py @@ -27,7 +27,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate `manifest.json` files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--fix', is_flag=True, help='Attempt to fix errors') @click.pass_context def manifest(ctx, check, fix): diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/metadata.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/metadata.py index bea729ae5c2b5..bb50c53bb657a 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/metadata.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/metadata.py @@ -280,7 +280,7 @@ def check_duplicate_values(current_check, line, row, header_name, duplicates, fa '--check-duplicates', is_flag=True, help='Output warnings if there are duplicate short names and descriptions' ) @click.option('--show-warnings', '-w', is_flag=True, help='Show warnings in addition to failures') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def metadata(check, check_duplicates, show_warnings): """Validates metadata.csv files diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/models.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/models.py index ee3b2fc3101ca..f778525db4f5d 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/models.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/models.py @@ -66,7 +66,7 @@ def content_matches(current_model_file_lines, expected_model_file_lines): @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate configuration data models') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--sync', '-s', is_flag=True, help='Generate data models based on specifications') @click.option('--verbose', '-v', is_flag=True, help='Verbose mode') @click.pass_context diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/package.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/package.py index 8daf30b8547f6..1c94c8058c280 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/package.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/package.py @@ -36,7 +36,7 @@ def read_project_name(check_name): @click.command('package', context_settings=CONTEXT_SETTINGS, short_help='Validate Python package metadata') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def package(check): """Validate all files for Python package metadata. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/readmes.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/readmes.py index e3b68c9b56f6c..c51e6dddc8c3b 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/readmes.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/readmes.py @@ -26,7 +26,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate README.md files') @click.pass_context -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--format-links', '-fl', is_flag=True, help='Automatically format links') def readmes(ctx, check, format_links): """Validates README files. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/recommended_monitors.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/recommended_monitors.py index 12f6329b7c737..0cbcf7bdf63fb 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/recommended_monitors.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/recommended_monitors.py @@ -40,7 +40,7 @@ context_settings=CONTEXT_SETTINGS, short_help='Validate recommended monitor definition JSON files', ) -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def recommended_monitors(check): """Validate all recommended monitors definition files. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/saved_views.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/saved_views.py index 7f12634f3e724..a1f61f85c9447 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/saved_views.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/saved_views.py @@ -45,7 +45,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate saved view files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) def saved_views(check): """Validates saved view files diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/service_checks.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/service_checks.py index 43b2eef0192fb..497f82e6ef24d 100755 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/service_checks.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/service_checks.py @@ -49,7 +49,7 @@ @click.command('service-checks', context_settings=CONTEXT_SETTINGS, short_help='Validate `service_checks.json` files') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--sync', is_flag=True, help='Generate example configuration files based on specifications') def service_checks(check, sync): """Validate all `service_checks.json` files. diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/typos.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/typos.py index 150a51253bd76..5e9c10f3bd3e1 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/typos.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/typos.py @@ -15,7 +15,7 @@ @click.command(context_settings=CONTEXT_SETTINGS, short_help='Validate spelling') -@click.argument('check', autocompletion=complete_valid_checks, required=False) +@click.argument('check', shell_complete=complete_valid_checks, required=False) @click.option('--fix', is_flag=True, help='Apply suggested fix') @click.pass_context def typos(ctx, check, fix): diff --git a/datadog_checks_dev/pyproject.toml b/datadog_checks_dev/pyproject.toml index eefcbfbff6598..282510cadff3e 100644 --- a/datadog_checks_dev/pyproject.toml +++ b/datadog_checks_dev/pyproject.toml @@ -58,7 +58,7 @@ cli = [ "atomicwrites", "beautifulsoup4>=4.9.3", "build>=0.7.0", - "click~=8.0", + "click~=8.1", "codespell", "colorama", "datamodel-code-generator~=0.11.4", diff --git a/disk/datadog_checks/disk/disk.py b/disk/datadog_checks/disk/disk.py index c06495f62c154..f9ebcbf93f83e 100644 --- a/disk/datadog_checks/disk/disk.py +++ b/disk/datadog_checks/disk/disk.py @@ -25,7 +25,6 @@ def _base_device_name(device): return device.strip('\\').lower() - else: IGNORE_CASE = 0 diff --git a/ecs_fargate/datadog_checks/ecs_fargate/ecs_fargate.py b/ecs_fargate/datadog_checks/ecs_fargate/ecs_fargate.py index 24c844c3fc9b4..b029ebd7c8d21 100644 --- a/ecs_fargate/datadog_checks/ecs_fargate/ecs_fargate.py +++ b/ecs_fargate/datadog_checks/ecs_fargate/ecs_fargate.py @@ -239,7 +239,7 @@ def submit_perf_metrics(self, container_tags, container_id, container_stats): try: t_delta = int((parser.isoparse(t1) - parser.isoparse(t0)).total_seconds()) # Simplified formula for cpu_percent where system_delta = t_delta * active_cpus * (10 ** 9) - cpu_percent = (cpu_delta / (t_delta * (10 ** 9))) * 100.0 + cpu_percent = (cpu_delta / (t_delta * (10**9))) * 100.0 cpu_percent = round_value(cpu_percent, 2) self.gauge('ecs.fargate.cpu.percent', cpu_percent, tags) except ValueError: diff --git a/kubelet/datadog_checks/kubelet/prometheus.py b/kubelet/datadog_checks/kubelet/prometheus.py index a6536f12bdf57..e458f27b4b140 100644 --- a/kubelet/datadog_checks/kubelet/prometheus.py +++ b/kubelet/datadog_checks/kubelet/prometheus.py @@ -427,7 +427,7 @@ def container_cpu_usage_seconds_total(self, metric, scraper_config): metric.samples[i] = ( sample[self.SAMPLE_NAME], sample[self.SAMPLE_LABELS], - sample[self.SAMPLE_VALUE] * 10.0 ** 9, + sample[self.SAMPLE_VALUE] * 10.0**9, ) self._process_container_metric('rate', metric_name, metric, scraper_config) diff --git a/mongo/datadog_checks/mongo/collectors/replication_info.py b/mongo/datadog_checks/mongo/collectors/replication_info.py index a635b80675cd7..e4cd991004ab4 100644 --- a/mongo/datadog_checks/mongo/collectors/replication_info.py +++ b/mongo/datadog_checks/mongo/collectors/replication_info.py @@ -36,12 +36,12 @@ def collect(self, api): if ol_options: try: - oplog_data['logSizeMB'] = round_value(ol_options['size'] / 2.0 ** 20, 2) + oplog_data['logSizeMB'] = round_value(ol_options['size'] / 2.0**20, 2) oplog = localdb[collection_name] oplog_data['usedSizeMB'] = round_value( - localdb.command("collstats", collection_name)['size'] / 2.0 ** 20, 2 + localdb.command("collstats", collection_name)['size'] / 2.0**20, 2 ) op_asc_cursor = oplog.find({"ts": {"$exists": 1}}).sort("$natural", pymongo.ASCENDING).limit(1) diff --git a/network/tests/test_network.py b/network/tests/test_network.py index 7e5e989247624..2d735f78000b8 100644 --- a/network/tests/test_network.py +++ b/network/tests/test_network.py @@ -64,7 +64,6 @@ def decode_string(s): return s.decode(ESCAPE_ENCODING) - else: ESCAPE_ENCODING = 'string-escape' diff --git a/php_fpm/datadog_checks/php_fpm/php_fpm.py b/php_fpm/datadog_checks/php_fpm/php_fpm.py index 31118d6fa2c9b..22004515294e2 100644 --- a/php_fpm/datadog_checks/php_fpm/php_fpm.py +++ b/php_fpm/datadog_checks/php_fpm/php_fpm.py @@ -116,7 +116,7 @@ def _process_status(self, status_url, tags, http_host, use_fastcgi): # 503s originated here: https://github.com/php/php-src/blob/d84ef96/sapi/fpm/fpm/fpm_status.c#L96 if resp.status_code == 503 and i < max_attempts - 1: # retry - time.sleep(2 ** i + random.random()) + time.sleep(2**i + random.random()) continue resp.raise_for_status() diff --git a/snmp/datadog_checks/snmp/snmp.py b/snmp/datadog_checks/snmp/snmp.py index 829894921c6d6..7b04ce67a2067 100644 --- a/snmp/datadog_checks/snmp/snmp.py +++ b/snmp/datadog_checks/snmp/snmp.py @@ -43,7 +43,7 @@ DEFAULT_OID_BATCH_SIZE = 10 LOADER_TAG = 'loader:python' -_MAX_FETCH_NUMBER = 10 ** 6 +_MAX_FETCH_NUMBER = 10**6 def reply_invalid(oid): @@ -623,7 +623,7 @@ def submit_bandwidth_usage_metric_if_bandwidth_metric( return try: - bandwidth_usage_value = (bits_value / (if_high_speed * (10 ** 6))) * 100 + bandwidth_usage_value = (bits_value / (if_high_speed * (10**6))) * 100 except ZeroDivisionError: self.log.debug('Zero value at ifHighSpeed, skipping this row. index=%s', index) return diff --git a/tls/datadog_checks/tls/utils.py b/tls/datadog_checks/tls/utils.py index 87d0561284c70..0fd72a62620f0 100644 --- a/tls/datadog_checks/tls/utils.py +++ b/tls/datadog_checks/tls/utils.py @@ -67,7 +67,6 @@ def seconds_to_days(seconds): def closing(sock): return _closing(sock) - else: def closing(sock): diff --git a/tokumx/datadog_checks/tokumx/tokumx.py b/tokumx/datadog_checks/tokumx/tokumx.py index 9208d82d06cbd..b36503d98057b 100644 --- a/tokumx/datadog_checks/tokumx/tokumx.py +++ b/tokumx/datadog_checks/tokumx/tokumx.py @@ -350,8 +350,8 @@ def _get_replica_metrics(self, instance, conn, db, tags, server, status): data['replicationLag'] = lag.total_seconds() else: data['replicationLag'] = ( - lag.microseconds + (lag.seconds + lag.days * 24 * 3600) * 10 ** 6 - ) / 10.0 ** 6 + lag.microseconds + (lag.seconds + lag.days * 24 * 3600) * 10**6 + ) / 10.0**6 if current is not None: data['health'] = current['health']