From 5659de9ce9a201c911cf270b6483748869f367cb Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Thu, 6 Feb 2025 11:00:17 +0100 Subject: [PATCH] update black --- server/belga/io/feed_parsers/belga_dpa_newsml_2_0.py | 10 +++++----- .../planning_exports/format_news_events_tommorow.py | 6 +++--- server/belga/publish/belga_newsml_1_2.py | 12 ++++++------ server/belga/schema.py | 6 +++--- server/belga/search_providers.py | 8 +++----- server/dev-requirements.txt | 2 +- .../io/feed_parsers/belga_anp_newsml_1_2_test.py | 6 +++--- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/server/belga/io/feed_parsers/belga_dpa_newsml_2_0.py b/server/belga/io/feed_parsers/belga_dpa_newsml_2_0.py index d5b76e3a..d38250e1 100644 --- a/server/belga/io/feed_parsers/belga_dpa_newsml_2_0.py +++ b/server/belga/io/feed_parsers/belga_dpa_newsml_2_0.py @@ -123,11 +123,11 @@ def parse(self, xml, provider=None): try: genre_role = genre_name.attrib["role"] if genre_role == "nrol:display": - item[ - "headline" - ] = "({genre}): {headline}".format( - genre=genre_name.text, - headline=item["headline"], + item["headline"] = ( + "({genre}): {headline}".format( + genre=genre_name.text, + headline=item["headline"], + ) ) break except KeyError: diff --git a/server/belga/planning_exports/format_news_events_tommorow.py b/server/belga/planning_exports/format_news_events_tommorow.py index 10146a79..89fb679d 100644 --- a/server/belga/planning_exports/format_news_events_tommorow.py +++ b/server/belga/planning_exports/format_news_events_tommorow.py @@ -52,9 +52,9 @@ def format_event_for_tommorow( dates = formatted_event["dates"] start_local = utc_to_local(dates["tz"], dates["start"]) end_local = utc_to_local(dates["tz"], dates["end"]) - formatted_event[ - "time" - ] = f"{start_local.strftime('%H:%M')} - {end_local.strftime('%H:%M')}" + formatted_event["time"] = ( + f"{start_local.strftime('%H:%M')} - {end_local.strftime('%H:%M')}" + ) # Check if calendar has changed if formatted_event["calendars"] != calendar: diff --git a/server/belga/publish/belga_newsml_1_2.py b/server/belga/publish/belga_newsml_1_2.py index 94fd4ad0..5831e280 100644 --- a/server/belga/publish/belga_newsml_1_2.py +++ b/server/belga/publish/belga_newsml_1_2.py @@ -259,12 +259,12 @@ def _format_identification(self, newsitem): SubElement(news_identifier, "RevisionId", attrib=revision).text = str( self._current_item.get(config.VERSION, "") ) - SubElement( - news_identifier, "PublicIdentifier" - ).text = self._generate_public_identifier( - self._current_item[config.ID_FIELD], - self._current_item.get(config.VERSION, ""), - revision.get("Update", ""), + SubElement(news_identifier, "PublicIdentifier").text = ( + self._generate_public_identifier( + self._current_item[config.ID_FIELD], + self._current_item.get(config.VERSION, ""), + revision.get("Update", ""), + ) ) def _format_newsmanagement(self, newsitem): diff --git a/server/belga/schema.py b/server/belga/schema.py index 32040509..042f05bc 100644 --- a/server/belga/schema.py +++ b/server/belga/schema.py @@ -2,6 +2,6 @@ def init_app(app): for resource in ("ingest", "archive", "published"): for field in ("body_html",): mapping = app.config["DOMAIN"][resource]["schema"][field]["mapping"] - mapping[ - "search_analyzer" - ] = "default" # use custom analyzer from settings.py + mapping["search_analyzer"] = ( + "default" # use custom analyzer from settings.py + ) diff --git a/server/belga/search_providers.py b/server/belga/search_providers.py index 0e8d7f2d..13793d89 100644 --- a/server/belga/search_providers.py +++ b/server/belga/search_providers.py @@ -549,11 +549,9 @@ def format_list_item(self, data): "ednote": get_text(data.get("editorialInfo")), } if data.get("assetType") == "RelatedArticle" and data.get("comments"): - formatted_data["firstcreated"] = formatted_data[ - "versioncreated" - ] = formatted_data["firstpublished"] = get_datetime( - datetime.strptime(data.get("comments"), "%Y%m%d%H%M%S") - ) + formatted_data["firstcreated"] = formatted_data["versioncreated"] = ( + formatted_data["firstpublished"] + ) = get_datetime(datetime.strptime(data.get("comments"), "%Y%m%d%H%M%S")) return formatted_data diff --git a/server/dev-requirements.txt b/server/dev-requirements.txt index 757bb238..fac7f954 100644 --- a/server/dev-requirements.txt +++ b/server/dev-requirements.txt @@ -1,6 +1,6 @@ -r requirements.txt -black==23.12.1 +black==25.1.0 flake8==7.1.1 pep8==1.7.1 httmock==1.4.0 diff --git a/server/tests/io/feed_parsers/belga_anp_newsml_1_2_test.py b/server/tests/io/feed_parsers/belga_anp_newsml_1_2_test.py index 6555dfe7..91e37149 100644 --- a/server/tests/io/feed_parsers/belga_anp_newsml_1_2_test.py +++ b/server/tests/io/feed_parsers/belga_anp_newsml_1_2_test.py @@ -149,8 +149,8 @@ def test_extract_city_from_body(self): city = BelgaANPNewsMLOneFeedParser().extract_city(item) self.assertEqual(city, "San Mateo") - item[ - "body_html" - ] = "NL

San Mateo (ANP/RTL) - FNV kondigt werkonderbrekingen aan bij PostNL," + item["body_html"] = ( + "NL

San Mateo (ANP/RTL) - FNV kondigt werkonderbrekingen aan bij PostNL," + ) city = BelgaANPNewsMLOneFeedParser().extract_city(item) self.assertEqual(city, "San Mateo")