Switch to Black 2025 code style

Author: pquentin

elasticsearch/dsl/_sync/search.py

@@ -16,15 +16,7 @@
 #  under the License.
 
 import contextlib
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    Iterator,
-    List,
-    Optional,
-    cast,
-)
+from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional, cast
 
 from typing_extensions import Self
 

elasticsearch/dsl/search_base.py

@@ -698,12 +698,12 @@ def ensure_strings(fields: "InstrumentedField") -> str: ...
 
         @overload
         def ensure_strings(
-            fields: List[Union[str, "InstrumentedField"]]
+            fields: List[Union[str, "InstrumentedField"]],
         ) -> List[str]: ...
 
         @overload
         def ensure_strings(
-            fields: Dict[str, List[Union[str, "InstrumentedField"]]]
+            fields: Dict[str, List[Union[str, "InstrumentedField"]]],
         ) -> Dict[str, List[str]]: ...
 
         def ensure_strings(
@@ -712,7 +712,7 @@ def ensure_strings(
                 "InstrumentedField",
                 List[Union[str, "InstrumentedField"]],
                 Dict[str, List[Union[str, "InstrumentedField"]]],
-            ]
+            ],
         ) -> Union[str, List[str], Dict[str, List[str]]]:
             if isinstance(fields, dict):
                 return {k: ensure_strings(v) for k, v in fields.items()}

elasticsearch/helpers/vectorstore/_sync/vectorstore.py

@@ -22,10 +22,7 @@
 from elasticsearch import Elasticsearch
 from elasticsearch._version import __versionstr__ as lib_version
 from elasticsearch.helpers import BulkIndexError, bulk
-from elasticsearch.helpers.vectorstore import (
-    EmbeddingService,
-    RetrievalStrategy,
-)
+from elasticsearch.helpers.vectorstore import EmbeddingService, RetrievalStrategy
 from elasticsearch.helpers.vectorstore._utils import maximal_marginal_relevance
 
 logger = logging.getLogger(__name__)

examples/dsl/search_as_you_type.py

@@ -28,12 +28,7 @@
 import os
 from typing import TYPE_CHECKING, Optional
 
-from elasticsearch.dsl import (
-    Document,
-    SearchAsYouType,
-    connections,
-    mapped_field,
-)
+from elasticsearch.dsl import Document, SearchAsYouType, connections, mapped_field
 from elasticsearch.dsl.query import MultiMatch
 
 

noxfile.py

@@ -66,7 +66,7 @@ def test_otel(session):
 
 @nox.session()
 def format(session):
-    session.install(".", "black~=24.0", "isort", "flynt", "unasync>=0.6.0", "jinja2")
+    session.install(".", "black~=25.0", "isort", "flynt", "unasync>=0.6.0", "jinja2")
 
     session.run("python", "utils/run-unasync.py")
     session.run("python", "utils/run-unasync-dsl.py")
@@ -88,7 +88,7 @@ def lint(session):
 
     session.install(
         "flake8",
-        "black~=24.0",
+        "black~=25.0",
         "mypy",
         "isort",
         "types-requests",

test_elasticsearch/test_dsl/_sync/test_index.py

@@ -22,14 +22,7 @@
 import pytest
 from pytest import raises
 
-from elasticsearch.dsl import (
-    Date,
-    Document,
-    Index,
-    IndexTemplate,
-    Text,
-    analyzer,
-)
+from elasticsearch.dsl import Date, Document, Index, IndexTemplate, Text, analyzer
 
 
 class Post(Document):

test_elasticsearch/test_dsl/_sync/test_search.py

@@ -21,15 +21,7 @@
 import pytest
 from pytest import raises
 
-from elasticsearch.dsl import (
-    Document,
-    EmptySearch,
-    Q,
-    Search,
-    query,
-    types,
-    wrappers,
-)
+from elasticsearch.dsl import Document, EmptySearch, Q, Search, query, types, wrappers
 from elasticsearch.dsl.exceptions import IllegalOperation
 
 

test_elasticsearch/test_dsl/test_integration/_sync/test_search.py

@@ -20,15 +20,7 @@
 from pytest import raises
 
 from elasticsearch import ApiError, Elasticsearch
-from elasticsearch.dsl import (
-    Date,
-    Document,
-    Keyword,
-    MultiSearch,
-    Q,
-    Search,
-    Text,
-)
+from elasticsearch.dsl import Date, Document, Keyword, MultiSearch, Q, Search, Text
 from elasticsearch.dsl.response import aggs
 
 from ..test_data import FLAT_DATA

test_elasticsearch/test_dsl/test_result.py

@@ -130,7 +130,7 @@ def test_iterating_over_response_gives_you_hits(dummy_response: Dict[str, Any])
 
 
 def test_hits_get_wrapped_to_contain_additional_attrs(
-    dummy_response: Dict[str, Any]
+    dummy_response: Dict[str, Any],
 ) -> None:
     res = response.Response(Search(), dummy_response)
     hits = res.hits
@@ -140,7 +140,7 @@ def test_hits_get_wrapped_to_contain_additional_attrs(
 
 
 def test_hits_provide_dot_and_bracket_access_to_attrs(
-    dummy_response: Dict[str, Any]
+    dummy_response: Dict[str, Any],
 ) -> None:
     res = response.Response(Search(), dummy_response)
     h = res.hits[0]