From 9b91d1a7e0f6e05b247ff37ca6e07a0bb04b166a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Herv=C3=A9?= Date: Tue, 7 Nov 2023 11:40:27 +0100 Subject: [PATCH] Use ruff format instead of black (#1750) * Use ruff format instead of black * pre-commit fixes * pre-commit fixes * Try to skip exit failure * pre-commit fixes --------- Co-authored-by: ci.datadog-api-spec --- .pre-commit-config.yaml | 17 +++++++---------- generate.sh | 2 +- ruff.toml | 1 + setup.cfg | 14 -------------- src/datadog_api_client/configuration.py | 5 +++-- src/datadog_api_client/rest.py | 4 ++-- tests/conftest.py | 10 ++++++---- 7 files changed, 20 insertions(+), 33 deletions(-) create mode 100644 ruff.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 96e6c792a1..95747f3037 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,16 +46,13 @@ repos: pass_filenames: false additional_dependencies: - "poetry" -- repo: https://github.com/psf/black - rev: 23.3.0 - hooks: - - id: black - stages: [manual] - entry: black --fast --line-length 120 src examples tests - files: '^(src|examples|tests)' - pass_filenames: false -- repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.275 +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.1.4 hooks: - id: ruff entry: ruff --fix --quiet --exit-zero --fixable I001,F401 --ignore E501 src examples tests + pass_filenames: false + - id: ruff-format + entry: ruff format src examples tests + pass_filenames: false + diff --git a/generate.sh b/generate.sh index 59984ebb11..1c484499e2 100755 --- a/generate.sh +++ b/generate.sh @@ -28,5 +28,5 @@ pre_commit_wrapper generator pre_commit_wrapper examples pre_commit_wrapper docs pre_commit_wrapper ruff -pre_commit_wrapper black +pre_commit_wrapper ruff-format 1 pre_commit_wrapper api-docs diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000000..f11cf6352d --- /dev/null +++ b/ruff.toml @@ -0,0 +1 @@ +line-length = 120 diff --git a/setup.cfg b/setup.cfg index 32cc079580..f1d2dbfcb7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -77,17 +77,3 @@ datadog_api_client = py.typed [tool:pytest] # addopts = --black --cov=datadog_api_client --cov-config .coveragerc --cov-report=term-missing - -[flake8] -max-line-length = 120 -extend-ignore = E203 - -[tool:black] -line-length = 120 - -[tool:isort] -multi_line_output = 3 -include_trailing_comma = True -force_grid_wrap = 0 -use_parentheses = True -line_length = 120 diff --git a/src/datadog_api_client/configuration.py b/src/datadog_api_client/configuration.py index 35f62918d6..4ba616215a 100644 --- a/src/datadog_api_client/configuration.py +++ b/src/datadog_api_client/configuration.py @@ -536,8 +536,9 @@ def get_host_from_settings(self, index, variables=None, servers=None): if "enum_values" in variable and used_value not in variable["enum_values"]: raise ValueError( - "The variable `{}` in the host URL has invalid value " - "{}. Must be {}.".format(variable_name, variables[variable_name], variable["enum_values"]) + "The variable `{}` in the host URL has invalid value " "{}. Must be {}.".format( + variable_name, variables[variable_name], variable["enum_values"] + ) ) url = url.replace(f"{{{variable_name}}}", used_value) diff --git a/src/datadog_api_client/rest.py b/src/datadog_api_client/rest.py index 24db56963d..a3a6e9b330 100644 --- a/src/datadog_api_client/rest.py +++ b/src/datadog_api_client/rest.py @@ -90,7 +90,7 @@ def __init__(self, configuration, pools_size=4, maxsize=4): key_file=configuration.key_file, proxy_url=configuration.proxy, proxy_headers=configuration.proxy_headers, - **addition_pool_args + **addition_pool_args, ) else: self.pool_manager = urllib3.PoolManager( @@ -100,7 +100,7 @@ def __init__(self, configuration, pools_size=4, maxsize=4): ca_certs=configuration.ssl_ca_cert, cert_file=configuration.cert_file, key_file=configuration.key_file, - **addition_pool_args + **addition_pool_args, ) def request( diff --git a/tests/conftest.py b/tests/conftest.py index 62e3e8e99c..899dd83dd5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -282,8 +282,9 @@ def freezed_time(default_cassette_name, record_mode, vcr): freeze_file = pathlib.Path(vcr._path).with_suffix(".frozen") if not freeze_file.exists(): msg = ( - "Time file '{}' not found: create one setting `RECORD=true` or " - "ignore it using `RECORD=none`".format(freeze_file) + "Time file '{}' not found: create one setting `RECORD=true` or " "ignore it using `RECORD=none`".format( + freeze_file + ) ) raise RuntimeError(msg) with freeze_file.open("r") as f: @@ -291,8 +292,9 @@ def freezed_time(default_cassette_name, record_mode, vcr): if not pathlib.Path(vcr._path).exists(): msg = ( - "Cassette '{}' not found: create one setting `RECORD=true` or " - "ignore it using `RECORD=none`".format(vcr._path) + "Cassette '{}' not found: create one setting `RECORD=true` or " "ignore it using `RECORD=none`".format( + vcr._path + ) ) raise RuntimeError(msg)