Skip to content

Commit f833e4e

Browse files
jlahovnikjlahovnik
committed
style: fix pre-commit formatting
1 parent cfff782 commit f833e4e

20 files changed

Lines changed: 158 additions & 155 deletions

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
- flake8-eradicate
2727

2828
- repo: 'https://github.com/ambv/black'
29-
rev: 22.12.0
29+
rev: 25.11.0
3030
hooks:
3131
- id: black
3232
args: ['--safe']

‎eodag/api/core.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,9 @@ def fetch_collections_list(self, provider: Optional[str] = None) -> None:
555555
already_fetched = True
556556
for provider_to_fetch in self._providers.filter_by_name_or_group(provider):
557557
if provider_to_fetch.fetchable and provider_to_fetch.search_config:
558-
providers_discovery_configs_fetchable[
559-
provider_to_fetch.name
560-
] = provider_to_fetch.search_config.discover_collections
558+
providers_discovery_configs_fetchable[provider_to_fetch.name] = (
559+
provider_to_fetch.search_config.discover_collections
560+
)
561561
if not provider_to_fetch.collections_fetched:
562562
already_fetched = False
563563

@@ -792,9 +792,9 @@ def update_collections_list(
792792
)
793793
else:
794794
# to provider_products_config
795-
provider_products_config[
796-
new_collection
797-
] = new_collection_conf
795+
provider_products_config[new_collection] = (
796+
new_collection_conf
797+
)
798798
ext_collections_conf[provider] = new_collections_conf
799799
new_collections.append(new_collection)
800800
# increase the increment if the new collection had
@@ -2276,9 +2276,9 @@ def list_queryables(
22762276
for search_param, field_info in queryables_fields.items():
22772277
if search_param in kwargs and field_info.alias:
22782278
if isinstance(field_info.alias, AliasChoices):
2279-
kwargs_alias[
2280-
str(field_info.alias.choices[0])
2281-
] = kwargs_alias.pop(search_param)
2279+
kwargs_alias[str(field_info.alias.choices[0])] = (
2280+
kwargs_alias.pop(search_param)
2281+
)
22822282
else:
22832283
kwargs_alias[field_info.alias] = kwargs_alias.pop(search_param)
22842284

‎eodag/api/product/metadata_mapping.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,9 +1953,7 @@ def get_queryable_from_provider(
19531953
candidates: list[str] = (
19541954
[str(a[0]) for a in queryable_alias.convert_to_aliases()]
19551955
if isinstance(queryable_alias, AliasChoices)
1956-
else [queryable_alias]
1957-
if queryable_alias is not None
1958-
else []
1956+
else [queryable_alias] if queryable_alias is not None else []
19591957
)
19601958
candidates.append(k)
19611959
# Core search strips the ``<provider>:`` / ``<provider>_`` prefix

‎eodag/api/provider.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,9 @@ def _copy_matching_credentials(
473473
if provider_auth_config and not credentials_in_auth(provider_auth_config):
474474
for conf_with_creds in auth_confs_with_creds:
475475
if conf_with_creds.matches_target_auth(provider_auth_config):
476-
getattr(
477-
self.config, key
478-
).credentials = conf_with_creds.credentials
476+
getattr(self.config, key).credentials = (
477+
conf_with_creds.credentials
478+
)
479479
return
480480

481481
def delete_collection(self, name: str) -> None:

‎eodag/plugins/authentication/aws_auth.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ def authenticate_objects(
247247
break
248248
try:
249249
# connect to aws s3 and get bucket auhenticated objects
250-
authenticated_objects[
251-
bucket_name
252-
] = self._get_authenticated_objects(bucket_name, common_prefix)
250+
authenticated_objects[bucket_name] = (
251+
self._get_authenticated_objects(bucket_name, common_prefix)
252+
)
253253

254254
except AuthenticationError as e:
255255
logger.warning("Unexpected error: %s" % e)

‎eodag/plugins/manager.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ def _build_plugin(
493493
plugin: Union[Api, Search, Download, Authentication, Crunch] = plugin_class(
494494
provider, plugin_conf
495495
)
496-
self._built_plugins_cache[
497-
(provider, topic_class.__name__, auth_match_md5)
498-
] = plugin
496+
self._built_plugins_cache[(provider, topic_class.__name__, auth_match_md5)] = (
497+
plugin
498+
)
499499
return plugin

‎eodag/plugins/search/build_search_result.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,10 @@ def _preprocess_search_params(self, params: dict[str, Any]) -> dict[str, Any]:
428428
if "/to/" in _dc_qp.get("date", ""):
429429
params[START], params[END] = _dc_qp["date"].split("/to/")
430430
elif "/" in _dc_qp.get("date", ""):
431-
(params[START], params[END],) = _dc_qp[
431+
(
432+
params[START],
433+
params[END],
434+
) = _dc_qp[
432435
"date"
433436
].split("/")
434437
elif _dc_qp.get("date"):

‎eodag/plugins/search/cop_marine.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def _get_date_from_yyyymmdd(date_str: str, item_key: str) -> Optional[dt.datetim
6969

7070

7171
def _get_dates_from_dataset_data(
72-
dataset_item: dict[str, Any]
72+
dataset_item: dict[str, Any],
7373
) -> Optional[dict[str, str]]:
7474
dates = {}
7575
if "start_datetime" in dataset_item["properties"]:
@@ -517,9 +517,9 @@ def query(
517517

518518
owner_displayname = obj.get("Owner", {}).get("DisplayName")
519519
if owner_displayname is not None:
520-
asset_properties[
521-
"cop_marine:owner_name"
522-
] = owner_displayname
520+
asset_properties["cop_marine:owner_name"] = (
521+
owner_displayname
522+
)
523523

524524
product = self._create_product(
525525
collection,

‎eodag/plugins/search/qssearch.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -345,24 +345,24 @@ def __init__(self, provider: str, config: PluginConfig) -> None:
345345
self.config.discover_collections["results_entry"] = string_to_jsonpath(
346346
self.config.discover_collections["results_entry"], force=True
347347
)
348-
self.config.discover_collections[
349-
"generic_collection_id"
350-
] = mtd_cfg_as_conversion_and_querypath(
351-
{"foo": self.config.discover_collections["generic_collection_id"]}
352-
)[
353-
"foo"
354-
]
348+
self.config.discover_collections["generic_collection_id"] = (
349+
mtd_cfg_as_conversion_and_querypath(
350+
{"foo": self.config.discover_collections["generic_collection_id"]}
351+
)["foo"]
352+
)
355353
self.config.discover_collections[
356354
"generic_collection_parsable_properties"
357355
] = mtd_cfg_as_conversion_and_querypath(
358356
self.config.discover_collections[
359357
"generic_collection_parsable_properties"
360358
]
361359
)
362-
self.config.discover_collections[
363-
"generic_collection_parsable_metadata"
364-
] = mtd_cfg_as_conversion_and_querypath(
365-
self.config.discover_collections["generic_collection_parsable_metadata"]
360+
self.config.discover_collections["generic_collection_parsable_metadata"] = (
361+
mtd_cfg_as_conversion_and_querypath(
362+
self.config.discover_collections[
363+
"generic_collection_parsable_metadata"
364+
]
365+
)
366366
)
367367
if (
368368
"single_collection_parsable_metadata"
@@ -432,10 +432,10 @@ def __init__(self, provider: str, config: PluginConfig) -> None:
432432
# metadata_mapping from current product
433433
if "metadata_mapping" in self.config.products[collection].keys():
434434
# parse mapping to apply
435-
self.config.products[collection][
436-
"metadata_mapping"
437-
] = mtd_cfg_as_conversion_and_querypath(
438-
self.config.products[collection]["metadata_mapping"]
435+
self.config.products[collection]["metadata_mapping"] = (
436+
mtd_cfg_as_conversion_and_querypath(
437+
self.config.products[collection]["metadata_mapping"]
438+
)
439439
)
440440

441441
# from current product, updated mapping at the end
@@ -622,14 +622,14 @@ def conf_update_from_collection_result(
622622
].items():
623623
merged_metadata_mapping.pop(metadata, None)
624624
merged_metadata_mapping[metadata] = mapping
625-
unparsable_properties[
626-
"metadata_mapping"
627-
] = merged_metadata_mapping
628-
conf_update_dict["providers_config"][
629-
generic_collection_id
630-
] = dict(
631-
extracted_mapping,
632-
**unparsable_properties,
625+
unparsable_properties["metadata_mapping"] = (
626+
merged_metadata_mapping
627+
)
628+
conf_update_dict["providers_config"][generic_collection_id] = (
629+
dict(
630+
extracted_mapping,
631+
**unparsable_properties,
632+
)
633633
)
634634
# collections_config extraction
635635
collection_properties = properties_from_json(
@@ -1782,12 +1782,12 @@ def query(
17821782
plugin_config_backup = copy_deepcopy(self.config)
17831783

17841784
self.config.api_endpoint = query_value
1785-
self.config.products[collection][
1786-
"metadata_mapping"
1787-
] = mtd_cfg_as_conversion_and_querypath(
1788-
self.config.products[collection]["specific_qssearch"][
1789-
"metadata_mapping"
1790-
]
1785+
self.config.products[collection]["metadata_mapping"] = (
1786+
mtd_cfg_as_conversion_and_querypath(
1787+
self.config.products[collection]["specific_qssearch"][
1788+
"metadata_mapping"
1789+
]
1790+
)
17911791
)
17921792
self.config.results_entry = self.config.products[collection][
17931793
"specific_qssearch"

‎eodag/types/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,9 @@ def python_field_definition_to_json(
292292
if isinstance(type_data, str):
293293
json_field_definition["type"] = type_data
294294
elif type_data is None:
295-
json_field_definition["type"] = json_field_definition[
296-
"min"
297-
] = json_field_definition["max"] = None
295+
json_field_definition["type"] = json_field_definition["min"] = (
296+
json_field_definition["max"]
297+
) = None
298298
else:
299299
json_field_definition["type"] = [row["type"] for row in type_data]
300300
json_field_definition["min"] = [
@@ -310,9 +310,9 @@ def python_field_definition_to_json(
310310
if isinstance(field_type, str):
311311
json_field_definition["type"] = field_type
312312
elif field_type is None:
313-
json_field_definition["type"] = json_field_definition[
314-
"min"
315-
] = json_field_definition["max"] = None
313+
json_field_definition["type"] = json_field_definition["min"] = (
314+
json_field_definition["max"]
315+
) = None
316316
else:
317317
json_field_definition["type"] = [row["type"] for row in field_type]
318318
json_field_definition["min"] = [

0 commit comments

Comments
 (0)