From 97460a45ec71f5662ecefeb601737dfbea011f4d Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Thu, 8 Feb 2024 10:48:23 +0400 Subject: [PATCH] Switch to 2024 black style (#1701) (cherry picked from commit b02fe7f6aab465eaff3824d06a39c9d3f7c30ac4) --- elasticsearch_dsl/analysis.py | 10 +++++++--- noxfile.py | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/elasticsearch_dsl/analysis.py b/elasticsearch_dsl/analysis.py index 5277e5a1c..0d7a1a425 100644 --- a/elasticsearch_dsl/analysis.py +++ b/elasticsearch_dsl/analysis.py @@ -211,9 +211,13 @@ def get_definition(self): if "filters" in d: d["filters"] = [ # comma delimited string given by user - fs if isinstance(fs, str) else - # list of strings or TokenFilter objects - ", ".join(f.to_dict() if hasattr(f, "to_dict") else f for f in fs) + ( + fs + if isinstance(fs, str) + else + # list of strings or TokenFilter objects + ", ".join(f.to_dict() if hasattr(f, "to_dict") else f for f in fs) + ) for fs in self.filters ] return d diff --git a/noxfile.py b/noxfile.py index da4e6bd61..f44c2a739 100644 --- a/noxfile.py +++ b/noxfile.py @@ -55,7 +55,7 @@ def test(session): @nox.session(python="3.12") def format(session): - session.install("black~=23.0", "isort") + session.install("black~=24.0", "isort") session.run("black", "--target-version=py37", *SOURCE_FILES) session.run("isort", *SOURCE_FILES) session.run("python", "utils/license-headers.py", "fix", *SOURCE_FILES) @@ -65,7 +65,7 @@ def format(session): @nox.session(python="3.12") def lint(session): - session.install("flake8", "black~=23.0", "isort") + session.install("flake8", "black~=24.0", "isort") session.run("black", "--check", "--target-version=py37", *SOURCE_FILES) session.run("isort", "--check", *SOURCE_FILES) session.run("flake8", "--ignore=E501,E741,W503", *SOURCE_FILES)