diff --git a/poetry.lock b/poetry.lock index f20e31dc..fbd94177 100644 --- a/poetry.lock +++ b/poetry.lock @@ -37,17 +37,17 @@ css = ["tinycss2 (>=1.1.0,<1.3)"] [[package]] name = "boto3" -version = "1.34.130" +version = "1.34.131" description = "The AWS SDK for Python" optional = false python-versions = ">=3.8" files = [ - {file = "boto3-1.34.130-py3-none-any.whl", hash = "sha256:c163fb7135a94e7b8c8c478a44071c843f05e212fa4bec3105f8a437ecbf1bcb"}, - {file = "boto3-1.34.130.tar.gz", hash = "sha256:b781d267dd5e7583966e05697f6bd45e2f46c01dc619ba0860b042963ee69296"}, + {file = "boto3-1.34.131-py3-none-any.whl", hash = "sha256:05e388cb937e82be70bfd7eb0c84cf8011ff35cf582a593873ac21675268683b"}, + {file = "boto3-1.34.131.tar.gz", hash = "sha256:dab8f72a6c4e62b4fd70da09e08a6b2a65ea2115b27dd63737142005776ef216"}, ] [package.dependencies] -botocore = ">=1.34.130,<1.35.0" +botocore = ">=1.34.131,<1.35.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.10.0,<0.11.0" @@ -56,13 +56,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.34.130" +version = "1.34.131" description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">=3.8" files = [ - {file = "botocore-1.34.130-py3-none-any.whl", hash = "sha256:a3b36e9dac1ed31c4cb3a5c5e540a7d8a9b90ff1d17f87734e674154b41776d8"}, - {file = "botocore-1.34.130.tar.gz", hash = "sha256:a242b3b0a836b14f308a309565cd63e88654cec238f9b73abbbd3c0526db4c81"}, + {file = "botocore-1.34.131-py3-none-any.whl", hash = "sha256:13b011d7b206ce00727dcee26548fa3b550db9046d5a0e90ac25a6e6c8fde6ef"}, + {file = "botocore-1.34.131.tar.gz", hash = "sha256:502ddafe1d627fcf1e4c007c86454e5dd011dba7c58bd8e8a5368a79f3e387dc"}, ] [package.dependencies] @@ -118,19 +118,19 @@ typing_extensions = ">=3.10.0.0" [[package]] name = "django" -version = "3.2.25" -description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design." +version = "4.2.13" +description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" files = [ - {file = "Django-3.2.25-py3-none-any.whl", hash = "sha256:a52ea7fcf280b16f7b739cec38fa6d3f8953a5456986944c3ca97e79882b4e38"}, - {file = "Django-3.2.25.tar.gz", hash = "sha256:7ca38a78654aee72378594d63e51636c04b8e28574f5505dff630895b5472777"}, + {file = "Django-4.2.13-py3-none-any.whl", hash = "sha256:a17fcba2aad3fc7d46fdb23215095dbbd64e6174bf4589171e732b18b07e426a"}, + {file = "Django-4.2.13.tar.gz", hash = "sha256:837e3cf1f6c31347a1396a3f6b65688f2b4bb4a11c580dcb628b5afe527b68a5"}, ] [package.dependencies] -asgiref = ">=3.3.2,<4" -pytz = "*" -sqlparse = ">=0.2.2" +asgiref = ">=3.6.0,<4" +sqlparse = ">=0.3.1" +tzdata = {version = "*", markers = "sys_platform == \"win32\""} [package.extras] argon2 = ["argon2-cffi (>=19.1.0)"] @@ -138,17 +138,17 @@ bcrypt = ["bcrypt"] [[package]] name = "django-bootstrap3" -version = "23.6" +version = "24.2" description = "Bootstrap 3 for Django" optional = false python-versions = ">=3.8" files = [ - {file = "django-bootstrap3-23.6.tar.gz", hash = "sha256:f8563b2641bcad3a8626beda979ff697c8375002cbf906fbd49f4be97b0f8a54"}, - {file = "django_bootstrap3-23.6-py3-none-any.whl", hash = "sha256:ba1334104c390ca9dc5b985a8d8ec45fab2c6401e4abb8d3a47d3b225614c3d9"}, + {file = "django_bootstrap3-24.2-py3-none-any.whl", hash = "sha256:b07a122ba5ac4050735fd430839e6a0312f3d5c8cfc4b7e9da1cb93cd6c63331"}, + {file = "django_bootstrap3-24.2.tar.gz", hash = "sha256:09c659b37aa1e7473aa59a0b5518a3f08207b90399eb6e1b315d06290ed56740"}, ] [package.dependencies] -Django = ">=3.2" +Django = ">=4.1" [[package]] name = "django-contrib-comments" @@ -166,17 +166,17 @@ Django = ">=2.2" [[package]] name = "django-debug-toolbar" -version = "4.3.0" +version = "4.4.2" description = "A configurable set of panels that display various debug information about the current request/response." optional = false python-versions = ">=3.8" files = [ - {file = "django_debug_toolbar-4.3.0-py3-none-any.whl", hash = "sha256:e09b7dcb8417b743234dfc57c95a7c1d1d87a88844abd13b4c5387f807b31bf6"}, - {file = "django_debug_toolbar-4.3.0.tar.gz", hash = "sha256:0b0dddee5ea29b9cb678593bc0d7a6d76b21d7799cb68e091a2148341a80f3c4"}, + {file = "django_debug_toolbar-4.4.2-py3-none-any.whl", hash = "sha256:5d7afb2ea5f8730241e5b0735396e16cd1fd8c6b53a2f3e1e30bbab9abb23728"}, + {file = "django_debug_toolbar-4.4.2.tar.gz", hash = "sha256:9204050fcb1e4f74216c5b024bc76081451926a6303993d6c513f5e142675927"}, ] [package.dependencies] -django = ">=3.2.4" +django = ">=4.2.9" sqlparse = ">=0.2" [[package]] @@ -209,18 +209,18 @@ Django = ">=3.2" [[package]] name = "django-modeltranslation" -version = "0.18.11" +version = "0.19.4" description = "Translates Django models using a registration approach." optional = false python-versions = "*" files = [ - {file = "django-modeltranslation-0.18.11.tar.gz", hash = "sha256:a6e2c459e3b31852287d030bc6e29fa28576db97455dccd399fe08ac8e9223b9"}, - {file = "django_modeltranslation-0.18.11-py3-none-any.whl", hash = "sha256:81b68e4dc806a3b779ac88babe1cbd99d5318d374a43b3737a65fb0f4c1cffe8"}, + {file = "django_modeltranslation-0.19.4-py3-none-any.whl", hash = "sha256:89974574390662ea63edd996c71c5740478fa2173630468af6e024703bf88606"}, + {file = "django_modeltranslation-0.19.4.tar.gz", hash = "sha256:8afab046e8d3f5bad1f25819426225430f4bfc3688127e56522f605d7d803f01"}, ] [package.dependencies] -Django = ">=3.2" -typing-extensions = "*" +Django = ">=4.2" +typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} [[package]] name = "django-notifications-hq" @@ -556,6 +556,17 @@ files = [ {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] +[[package]] +name = "tzdata" +version = "2024.1" +description = "Provider of IANA time zone data" +optional = false +python-versions = ">=2" +files = [ + {file = "tzdata-2024.1-py2.py3-none-any.whl", hash = "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"}, + {file = "tzdata-2024.1.tar.gz", hash = "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd"}, +] + [[package]] name = "unicodecsv" version = "0.14.1" @@ -627,4 +638,4 @@ brotli = ["brotli"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "dc92f61547a417a8de65de388cfccf773ad58934105b683222c50bd363e1c493" +content-hash = "d7e71b6957d49b77bd6dca7a261967ad12f9d35b74b16125d4fb52adc0316a87" diff --git a/pyproject.toml b/pyproject.toml index f94589a5..1ffee163 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ repository = "https://github.com/ODNZSL/NZSL-signbank" [tool.poetry.dependencies] python = "^3.9" -django = "~3.2.25" +django = "~4.2.13" django-bootstrap3 = "*" django-contrib-comments = "*" django-debug-toolbar = "*" diff --git a/signbank/comments.py b/signbank/comments.py index e085ae0f..4ef2fc34 100644 --- a/signbank/comments.py +++ b/signbank/comments.py @@ -8,8 +8,8 @@ from django.forms import ModelForm from django.forms.models import model_to_dict from django.http import HttpResponseForbidden -from django.utils.translation import ugettext as _ -from django.utils.translation import ugettext_lazy as _lazy +from django.utils.translation import gettext as _ +from django.utils.translation import gettext_lazy as _lazy from django.contrib.sites.shortcuts import get_current_site from django.dispatch import receiver from django.contrib.contenttypes.models import ContentType diff --git a/signbank/customregistration/forms.py b/signbank/customregistration/forms.py index 33d2ef1f..14568aed 100644 --- a/signbank/customregistration/forms.py +++ b/signbank/customregistration/forms.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django_registration.forms import RegistrationFormTermsOfService diff --git a/signbank/customregistration/signals.py b/signbank/customregistration/signals.py index 3985e85c..a1366ff1 100644 --- a/signbank/customregistration/signals.py +++ b/signbank/customregistration/signals.py @@ -1,6 +1,6 @@ from django.dispatch import receiver from django.contrib.auth.models import User -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django_registration.signals import user_registered from notifications.signals import notify diff --git a/signbank/dictionary/admin.py b/signbank/dictionary/admin.py index f508e81b..ef9ada2e 100644 --- a/signbank/dictionary/admin.py +++ b/signbank/dictionary/admin.py @@ -9,7 +9,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.db import models from django.forms import CheckboxSelectMultiple, ModelForm, Textarea -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from guardian.admin import GuardedModelAdmin from modeltranslation.admin import TranslationAdmin as ModelTranslationAdmin from reversion.admin import VersionAdmin diff --git a/signbank/dictionary/adminviews.py b/signbank/dictionary/adminviews.py index 222f1214..52d233f1 100644 --- a/signbank/dictionary/adminviews.py +++ b/signbank/dictionary/adminviews.py @@ -21,7 +21,7 @@ from django.template.loader import render_to_string from django.urls import reverse from django.utils.translation import get_language -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.views.generic.detail import DetailView from django.views.generic.list import ListView from django_comments.models import Comment diff --git a/signbank/dictionary/choicelists.py b/signbank/dictionary/choicelists.py index 83c3a90e..8b8365bc 100644 --- a/signbank/dictionary/choicelists.py +++ b/signbank/dictionary/choicelists.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ __author__ = 'heilniem' diff --git a/signbank/dictionary/csv_import.py b/signbank/dictionary/csv_import.py index 0bfdff69..7fde6df7 100644 --- a/signbank/dictionary/csv_import.py +++ b/signbank/dictionary/csv_import.py @@ -20,7 +20,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import render, reverse from django.utils.timezone import get_current_timezone -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django_comments.models import Comment from guardian.shortcuts import get_objects_for_user, get_perms from tagging.models import Tag, TaggedItem diff --git a/signbank/dictionary/delete.py b/signbank/dictionary/delete.py index 83677774..c0da25b5 100644 --- a/signbank/dictionary/delete.py +++ b/signbank/dictionary/delete.py @@ -2,7 +2,7 @@ from django.shortcuts import get_object_or_404 from django.core.exceptions import PermissionDenied from django.contrib import messages -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.http import HttpResponse, HttpResponseForbidden, HttpResponseNotAllowed from guardian.shortcuts import get_perms diff --git a/signbank/dictionary/forms.py b/signbank/dictionary/forms.py index f7e8796a..ce514368 100644 --- a/signbank/dictionary/forms.py +++ b/signbank/dictionary/forms.py @@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.db.utils import OperationalError, ProgrammingError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from tagging.models import Tag from .models import (AllowedTags, Dataset, FieldChoice, Gloss, Lemma, GlossRelation, diff --git a/signbank/dictionary/models.py b/signbank/dictionary/models.py index 689863e9..1f0ca87c 100644 --- a/signbank/dictionary/models.py +++ b/signbank/dictionary/models.py @@ -13,7 +13,7 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned from django.db import OperationalError, models from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from tagging.models import Tag from tagging.registry import AlreadyRegistered, register as tagging_register diff --git a/signbank/dictionary/publicviews.py b/signbank/dictionary/publicviews.py index 7f551699..ed8e1fa0 100644 --- a/signbank/dictionary/publicviews.py +++ b/signbank/dictionary/publicviews.py @@ -6,7 +6,7 @@ from django.db.models import Q, Prefetch from django.db.models.functions import Substr, Upper from django.templatetags.static import static -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.views.decorators.cache import cache_page from django.shortcuts import get_object_or_404 diff --git a/signbank/dictionary/templates/dictionary/paginate.html b/signbank/dictionary/templates/dictionary/paginate.html index 0994ce4b..cba7c839 100644 --- a/signbank/dictionary/templates/dictionary/paginate.html +++ b/signbank/dictionary/templates/dictionary/paginate.html @@ -1,7 +1,7 @@ {% if page_obj.paginator.num_pages > 1 %}