Skip to content

Commit

Permalink
Merge pull request #3594 from webkom/dependabot/pip/black-24.4.2
Browse files Browse the repository at this point in the history
Bump black from 23.7.0 to 24.4.2
  • Loading branch information
eikhr authored Jul 6, 2024
2 parents 7ce0c1a + 0f754b2 commit 00a7e99
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 52 deletions.
14 changes: 8 additions & 6 deletions lego/apps/companies/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ def csv(self, *args, **kwargs):

event_string = f"-{event}" if event else ""
response = HttpResponse(content_type="text/csv")
response[
"Content-Disposition"
] = f'attachment; filename="{f"Company-interests-{year}-{semester}{event_string}"}.csv"'
response["Content-Disposition"] = (
f'attachment; filename="{f"Company-interests-{year}-{semester}{event_string}"}.csv"'
)

writer = csv.writer(response)
writer.writerow(
Expand Down Expand Up @@ -205,9 +205,11 @@ def csv(self, *args, **kwargs):
participant_range_end = companyInterest.participant_range_end
semesters = ", ".join(
[
f"Vår {semester.year}"
if semester.semester == SPRING
else f"Høst {semester.year}"
(
f"Vår {semester.year}"
if semester.semester == SPRING
else f"Høst {semester.year}"
)
for semester in companyInterest.semesters.all()
]
)
Expand Down
14 changes: 6 additions & 8 deletions lego/apps/email/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,12 @@ class Meta:

def validate(self, attrs: Any) -> Any:
# Use existing values where missing to support patch requests
get = (
lambda index: attrs[index]
if index in attrs
else getattr(self.instance, index)
)
length = (
lambda value: len(value) if hasattr(value, "__len__") else value.count()
)
def get(index):
return attrs[index] if index in attrs else getattr(self.instance, index)

def length(value):
return len(value) if hasattr(value, "__len__") else value.count()

# Require at least one receiver of the email list
users_len, emails_len = length(get("users")), length(get("additional_emails"))
if users_len == 0 and emails_len == 0:
Expand Down
8 changes: 5 additions & 3 deletions lego/apps/email/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,11 @@ def create_weekly_mail(user):
{
"week_number": week_number,
"events": events,
"todays_weekly": ""
if todays_weekly is None
else add_source_to_url(todays_weekly.get_absolute_url()),
"todays_weekly": (
""
if todays_weekly is None
else add_source_to_url(todays_weekly.get_absolute_url())
),
"joblistings": joblistings,
"frontend_url": settings.FRONTEND_URL,
},
Expand Down
6 changes: 3 additions & 3 deletions lego/apps/ical/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def add_meeting_to_ical_feed(feed, meeting, user):
"title": meeting.title,
"report": meeting.report,
"description": meeting.description,
"reportAuthor": meeting.report_author.full_name
if meeting.report_author
else "Ikke valgt",
"reportAuthor": (
meeting.report_author.full_name if meeting.report_author else "Ikke valgt"
),
"url": meeting.get_absolute_url(),
}
desc_template = loader.get_template("ical/meeting_description.txt")
Expand Down
1 change: 1 addition & 0 deletions lego/apps/search/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
The index_registry dict keeps the mapping between SearchIndexes and models.
'players.player': PlayerIndex
"""

index_registry = {}


Expand Down
8 changes: 5 additions & 3 deletions lego/apps/stats/analytics_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ def _proxy(method, user, *args, **kwargs):
kwargs["context"] = {
"version": environ.get("RELEASE", "latest"),
"system": "lego",
"environment": "development"
if development
else getattr(settings, "ENVIRONMENT_NAME", "unknown"),
"environment": (
"development"
if development
else getattr(settings, "ENVIRONMENT_NAME", "unknown")
),
}

if user.is_authenticated:
Expand Down
6 changes: 3 additions & 3 deletions lego/apps/surveys/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ def describe_results(survey):
survey = Survey.objects.get(pk=kwargs["pk"])

response = HttpResponse(content_type="text/csv")
response[
"Content-Disposition"
] = f'attachment; filename="{survey.title.replace(" ", "_")}.csv"'
response["Content-Disposition"] = (
f'attachment; filename="{survey.title.replace(" ", "_")}.csv"'
)

writer = csv.writer(response)
for question in describe_results(survey):
Expand Down
54 changes: 29 additions & 25 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ types-urllib3 = "1.26.25.13"
types-python-dateutil = "2.8.19.13"

[tool.poetry.group.formatting.dependencies]
black = "23.7.0"
black = "24.4.2"
isort = "5.12.0"

[tool.poetry.group.flake8.dependencies]
Expand Down

0 comments on commit 00a7e99

Please sign in to comment.