Skip to content

Commit

Permalink
Update django requirement from ~=4.2.0 to ~=5.0 (#2084)
Browse files Browse the repository at this point in the history
* Update django requirement from ~=4.2.0 to ~=5.0

Updates the requirements on [django](https://github.com/django/django) to permit the latest version.
- [Commits](django/django@4.2...5.0)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update psycopg to v3

* Revert "Update psycopg to v3"

This reverts commit 96100e7.

* Replace deprecated usages of format_html without formatting arguments

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Richard Ebeling <dev@richardebeling.de>
  • Loading branch information
dependabot[bot] and richardebeling authored Jan 8, 2024
1 parent 75bee41 commit 5e92e91
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions evap/staff/importers/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.core.exceptions import ValidationError
from django.db import transaction
from django.db.models import Q
from django.utils.html import format_html
from django.utils.html import escape, format_html
from django.utils.translation import gettext as _
from django.utils.translation import ngettext

Expand Down Expand Up @@ -199,9 +199,9 @@ def finalize(self) -> None:

def _add_user_data_mismatch_warning(self, user: UserProfile, user_data: UserData):
if self.test_run:
msg = format_html(_("The existing user would be overwritten with the following data:"))
msg = escape(_("The existing user would be overwritten with the following data:"))
else:
msg = format_html(_("The existing user was overwritten with the following data:"))
msg = escape(_("The existing user was overwritten with the following data:"))

msg = (
msg
Expand All @@ -227,7 +227,7 @@ def _add_user_inactive_warning(self, user: UserProfile):
self.importer_log.add_warning(msg, category=ImporterLogEntry.Category.INACTIVE)

def _add_user_name_collision_warning(self, user_data: UserData, users_with_same_names: Iterable[UserProfile]):
msg = format_html(_("A user in the import file has the same first and last name as an existing user:"))
msg = escape(_("A user in the import file has the same first and last name as an existing user:"))
for user in users_with_same_names:
msg += format_html("<br /> - {} ({})", self._create_user_string(user), _("existing"))
msg += format_html("<br /> - {} ({})", self._create_user_string(user_data), _("import"))
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
django-extensions==3.2.3
django-fsm==2.8.1
django~=4.2.0
django~=5.0
mozilla-django-oidc==3.0.0
openpyxl==3.1.2
psycopg2-binary==2.9.9
Expand Down

0 comments on commit 5e92e91

Please sign in to comment.