Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Django 4 #1673

Merged
merged 5 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions geonode_mapstore_client/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -76,14 +77,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
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/models.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down