diff --git a/geonode_mapstore_client/apps.py b/geonode_mapstore_client/apps.py index 2d7e0948b9..93294719eb 100644 --- a/geonode_mapstore_client/apps.py +++ b/geonode_mapstore_client/apps.py @@ -11,14 +11,15 @@ import os from django.views.generic import TemplateView -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.apps import apps, AppConfig as BaseAppConfig def run_setup_hooks(*args, **kwargs): from geonode.urls import urlpatterns from django.conf import settings - from django.conf.urls import url, include + from django.conf.urls import include + from django.urls import re_path from geonode.api.urls import router from geonode.security.permissions import VIEW_PERMISSIONS, OWNER_PERMISSIONS from geonode.groups.conf import settings as groups_settings @@ -68,14 +69,14 @@ def run_setup_hooks(*args, **kwargs): pass urlpatterns += [ - url( + re_path( r"^catalogue/", TemplateView.as_view( template_name="geonode-mapstore-client/catalogue.html" ), ), # required, otherwise will raise no-lookup errors to be analysed - url(r"^api/v2/", include(router.urls)), + re_path(r"^api/v2/", include(router.urls)), ] # adding default format for metadata schema validation diff --git a/geonode_mapstore_client/models.py b/geonode_mapstore_client/models.py index 444d8b5f1d..fa33ce8644 100644 --- a/geonode_mapstore_client/models.py +++ b/geonode_mapstore_client/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.postgres.fields import ArrayField from django.dispatch import receiver from django.db.models import signals diff --git a/requirements.txt b/requirements.txt index 9872f94952..6f0ca1c834 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ -django>=3.2.0,<4.0 +django>=4.2,<5.0 idna>=2.5,<2.11 requests>=2.13.0 Markdown>=3.2.2 MarkupSafe>=1.1.1 -djangorestframework<=3.12.0,>=3.8.0 urllib3>=1.25.9 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index ea7f717064..bfd756b6d6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,12 +21,11 @@ packages = find: include_package_data = True zip_safe = False install_requires = - django >= 3.2.0, < 4.0 + django >= 4.2, < 5.0 idna >= 2.5, < 2.11 requests >= 2.13.0 Markdown >= 2.6.11 MarkupSafe >= 1.1.1 - djangorestframework <= 3.12.0, >= 3.8.0 urllib3 >= 1.25 [options.packages.find]