Merge pull request #346 from City-of-Turku/dependabot/pip/black-24.3.0

Bump black from 22.6.0 to 24.3.0

eco_counter/tests/test_import_counter_data.py

@@ -6,6 +6,7 @@
 The main purpose of these tests are to verify that the importer
 imports and calculates the data correctly.
 """
+
 import calendar
 from datetime import datetime, timedelta
 from io import StringIO

environment_data/management/commands/weather_observation_utils.py

@@ -45,9 +45,9 @@ def get_dataframe(stations, from_year=START_YEAR, from_month=1, initial_import=F
                 if not initial_import and from_year == current_date_time.year:
                     params["startTime"] = f"{from_year}-{from_month}-01T00:00Z"
                 else:
-                    params[
-                        "startTime"
-                    ] = f"{start_date_time.year}-{start_date_time.month}-01T00:00Z"
+                    params["startTime"] = (
+                        f"{start_date_time.year}-{start_date_time.month}-01T00:00Z"
+                    )
                 if current_date_time - relativedelta(months=1) < start_date_time:
                     params["endTime"] = current_date_time.strftime(TIME_FORMAT)
                 else:
@@ -56,9 +56,9 @@ def get_dataframe(stations, from_year=START_YEAR, from_month=1, initial_import=F
                         + relativedelta(months=1)
                         - relativedelta(hours=1)
                     )
-                    params[
-                        "endTime"
-                    ] = f"{tmp_time.year}-{tmp_time.month}-{tmp_time.day}T23:00Z"
+                    params["endTime"] = (
+                        f"{tmp_time.year}-{tmp_time.month}-{tmp_time.day}T23:00Z"
+                    )
 
                 response = REQUEST_SESSION.get(DATA_URL, params=params)
                 logger.info(f"Requested data from: {response.url}")

mobility_data/importers/bicycle_stands.py

@@ -2,6 +2,7 @@
 Note, bicycle stands are not imorter via the wfs importer
 as it needs logic to derive if the stand is hull lockable or covered.
 """
+
 import logging
 import os
 

mobility_data/importers/bike_service_stations.py

@@ -50,9 +50,9 @@ def __init__(self, feature):
                 # If no swedish address, retrieve it from the database.
                 if language == "sv":
                     street_name, number = addresses[0].split(" ")
-                    self.address[
-                        language
-                    ] = f"{get_street_name_translations(street_name, municipality)[language]} number"
+                    self.address[language] = (
+                        f"{get_street_name_translations(street_name, municipality)[language]} number"
+                    )
                 # Source data does not contain English addresses, assign the Finnsh
                 else:
                     self.address[language] = addresses[0]

mobility_data/importers/marinas.py

@@ -3,6 +3,7 @@
 Note, wfs importer is not used as the berths data is
 separately assigned to the marina mobile units.
 """
+
 import logging
 
 from django.conf import settings

mobility_data/importers/share_car_parking_places.py

@@ -47,9 +47,9 @@ def __init__(self, feature):
         street_name["en"] = street_name["fi"]
         self.extra[self.RESTRICTION_FIELD] = {}
         for i, language in enumerate(LANGUAGES):
-            self.name[
-                language
-            ] = f"{self.CAR_PARKING_NAME[language]}, {street_name[language]}"
+            self.name[language] = (
+                f"{self.CAR_PARKING_NAME[language]}, {street_name[language]}"
+            )
             self.address[language] = street_name[language]
             self.extra[self.RESTRICTION_FIELD][language] = restrictions[i].strip()
 

mobility_data/management/commands/import_mobility_data.py

@@ -1,6 +1,7 @@
 """
 Imports all mobility data sources.
 """
+
 import logging
 
 from django.core import management

mobility_data/tests/test_import_accessories.py

@@ -7,6 +7,7 @@
 has been removed from the test input data, as it causes GDAL
 DataSource to fail when loading data.
 """
+
 from unittest.mock import patch
 
 import pytest

mobility_data/tests/test_import_payment_zones.py

@@ -6,6 +6,7 @@
 has been removed from the test input data, as it causes GDAL
 DataSource to fail when loading data.
 """
+
 from unittest.mock import patch
 
 import pytest

mobility_data/tests/test_import_speed_limits.py

@@ -8,6 +8,7 @@
 has been removed from the test input data, as it causes GDAL
 DataSource to fail when loading data.
 """
+
 import pytest
 from django.conf import settings
 

requirements-dev.txt

@@ -8,7 +8,7 @@ asttokens==2.0.5
     # via stack-data
 backcall==0.2.0
     # via ipython
-black==22.6.0
+black==24.3.0
     # via
     #   -c requirements.txt
     #   ipython
@@ -32,6 +32,10 @@ mypy-extensions==0.4.3
     # via
     #   -c requirements.txt
     #   black
+packaging==24.0
+    # via
+    #   -c requirements.txt
+    #   black
 parso==0.8.2
     # via
     #   -c requirements.txt
@@ -64,10 +68,18 @@ six==1.16.0
     #   asttokens
 stack-data==0.2.0
     # via ipython
+tomli==1.2.1
+    # via
+    #   -c requirements.txt
+    #   black
 traitlets==5.1.0
     # via
     #   ipython
     #   matplotlib-inline
+typing-extensions==4.11.0
+    # via
+    #   -c requirements.txt
+    #   black
 wcwidth==0.2.5
     # via
     #   -c requirements.txt

requirements.txt

@@ -20,7 +20,7 @@ attrs==21.2.0
     #   requests-cache
 billiard==3.6.4.0
     # via celery
-black==22.6.0
+black==24.3.0
     # via -r requirements.in
 cattrs==1.8.0
     # via requests-cache
@@ -138,8 +138,10 @@ numpy==1.23.0
     # via
     #   -r requirements.in
     #   pandas
-packaging==21.0
-    # via pytest
+packaging==24.0
+    # via
+    #   black
+    #   pytest
 pandas==2.0.1
     # via -r requirements.in
 parso==0.8.2
@@ -172,8 +174,6 @@ pyflakes==2.3.1
     # via flake8
 pykml==0.2.0
     # via -r requirements.in
-pyparsing==2.4.7
-    # via packaging
 pyrsistent==0.19.3
     # via jsonschema
 pyshp==2.3.1
@@ -240,6 +240,8 @@ tomli==1.2.1
     #   pep517
 tqdm==4.62.3
     # via -r requirements.in
+typing-extensions==4.11.0
+    # via black
 tzdata==2022.1
     # via
     #   django-celery-beat

services/api.py

@@ -134,9 +134,9 @@ def to_internal_value(self, data):
                 value = obj[language]  # "musiikkiklubit"
                 if language == settings.LANGUAGES[0][0]:  # default language
                     extra_fields[field_name] = value  # { "name": "musiikkiklubit" }
-                extra_fields[
-                    "{}_{}".format(field_name, language)
-                ] = value  # { "name_fi": "musiikkiklubit" }
+                extra_fields["{}_{}".format(field_name, language)] = (
+                    value  # { "name_fi": "musiikkiklubit" }
+                )
             del data[field_name]  # delete original translated fields
 
         # handle other than translated fields
@@ -733,9 +733,9 @@ def to_representation(self, obj):
         if "accessibility_shortcoming_count" in getattr(
             self, "keep_fields", ["accessibility_shortcoming_count"]
         ):
-            ret[
-                "accessibility_shortcoming_count"
-            ] = shortcomings.accessibility_shortcoming_count
+            ret["accessibility_shortcoming_count"] = (
+                shortcomings.accessibility_shortcoming_count
+            )
 
         if "request" not in self.context:
             return ret

services/content_metrics.py

@@ -5,6 +5,7 @@
 with either long field contents or a large amount of related
 objects.
 """
+
 from django.db.models import Case, Count, IntegerField, Sum, When
 from django.db.models.functions import Length
 

services/search/api.py

@@ -17,6 +17,7 @@
  - The search_columns can be manually updated with the index_search_columns
 and emptied with the empty_search_columns management script.
 """
+
 import logging
 import re
 from itertools import chain
@@ -127,9 +128,9 @@ def to_representation(self, obj):
                 shortcomings = obj.accessibility_shortcomings
             except UnitAccessibilityShortcomings.DoesNotExist:
                 shortcomings = UnitAccessibilityShortcomings()
-            representation[
-                "accessibility_shortcoming_count"
-            ] = shortcomings.accessibility_shortcoming_count
+            representation["accessibility_shortcoming_count"] = (
+                shortcomings.accessibility_shortcoming_count
+            )
             representation["contract_type"] = UnitSerializer.get_contract_type(
                 self, obj
             )

services/utils/accessibility_shortcoming_calculator.py

@@ -131,9 +131,11 @@ def _calculate_shortcomings(self, rule, properties, messages, profile_id):
                 "{}: {} {}".format(
                     rule["id"],
                     rule["operator"],
-                    "{}recorded".format("" if message_recorded else "not ")
-                    if not is_ok
-                    else "passed",
+                    (
+                        "{}recorded".format("" if message_recorded else "not ")
+                        if not is_ok
+                        else "passed"
+                    ),
                 )
             )
             return is_ok, message_recorded

smbackend/settings.py

@@ -223,7 +223,7 @@ def gettext(s):
             991,  # health stations
             1097,  # basic education
             2125,  # pre school education
-            869  # municipal day care
+            869,  # municipal day care
             #  25344, # recycling
             #  25480, # public libraries
         ],

smbackend_turku/importers/divisions.py

@@ -4,6 +4,7 @@
 and modified to fit the WFS server of Turku.
 
 """
+
 import os
 import re
 from datetime import datetime

smbackend_turku/importers/geo_search.py

@@ -205,9 +205,9 @@ def save_page(self, results, municipality):
         for result in results:
             postal_code = result["postal_code_area"]["postal_code"]
             if postal_code not in self.postal_code_areas_cache:
-                self.postal_code_areas_cache[
-                    postal_code
-                ] = self.get_or_create_postal_code_area(postal_code, result)
+                self.postal_code_areas_cache[postal_code] = (
+                    self.get_or_create_postal_code_area(postal_code, result)
+                )
 
             (
                 street_name_fi,
@@ -353,9 +353,9 @@ def enrich_page(self, results, municipality):
 
             postal_code = result["postal_code_area"]["postal_code"]
             if postal_code not in self.postal_code_areas_cache:
-                self.postal_code_areas_cache[
-                    postal_code
-                ] = self.get_or_create_postal_code_area(postal_code, result)
+                self.postal_code_areas_cache[postal_code] = (
+                    self.get_or_create_postal_code_area(postal_code, result)
+                )
             # name_sv is not added as there might be a swedish translation
             street_entry = {
                 "name": street_name_fi,