From 789dd759c9ca4d00cb8e533eb6e46fae0418d948 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 25 Jul 2023 16:14:10 -0400
Subject: [PATCH 01/24] Update ugettext -> gettext

---
 arches/app/datatypes/base.py                                  | 2 +-
 arches/app/datatypes/concept_types.py                         | 2 +-
 arches/app/datatypes/datatypes.py                             | 4 ++--
 arches/app/datatypes/url.py                                   | 2 +-
 arches/app/etl_modules/base_data_editor.py                    | 2 +-
 arches/app/etl_modules/base_import_module.py                  | 2 +-
 arches/app/etl_modules/branch_csv_importer.py                 | 2 +-
 arches/app/etl_modules/import_single_csv.py                   | 2 +-
 arches/app/functions/primary_descriptors.py                   | 2 +-
 arches/app/models/concept.py                                  | 2 +-
 arches/app/models/graph.py                                    | 2 +-
 arches/app/models/models.py                                   | 2 +-
 arches/app/models/resource.py                                 | 2 +-
 arches/app/models/tile.py                                     | 2 +-
 arches/app/search/base_index.py                               | 2 +-
 arches/app/search/components/map_filter.py                    | 2 +-
 arches/app/search/elasticsearch_dsl_builder.py                | 2 +-
 arches/app/search/search_export.py                            | 2 +-
 arches/app/tasks.py                                           | 2 +-
 arches/app/utils/data_management/resources/formats/csvfile.py | 2 +-
 arches/app/utils/data_management/resources/formats/format.py  | 2 +-
 .../utils/data_management/sparql_providers/aat_provider.py    | 2 +-
 arches/app/utils/forms.py                                     | 2 +-
 arches/app/utils/middleware.py                                | 2 +-
 arches/app/utils/response.py                                  | 2 +-
 arches/app/utils/task_management.py                           | 2 +-
 arches/app/views/api.py                                       | 2 +-
 arches/app/views/auth.py                                      | 2 +-
 arches/app/views/concept.py                                   | 2 +-
 arches/app/views/etl_manager.py                               | 2 +-
 arches/app/views/graph.py                                     | 2 +-
 arches/app/views/language.py                                  | 2 +-
 arches/app/views/manifest_manager.py                          | 2 +-
 arches/app/views/map.py                                       | 2 +-
 arches/app/views/plugin.py                                    | 2 +-
 arches/app/views/resource.py                                  | 2 +-
 arches/app/views/search.py                                    | 2 +-
 arches/app/views/tile.py                                      | 2 +-
 arches/app/views/user.py                                      | 2 +-
 arches/management/commands/load_ontology.py                   | 2 +-
 40 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/arches/app/datatypes/base.py b/arches/app/datatypes/base.py
index efa6adabc5d..649f3bc7acd 100644
--- a/arches/app/datatypes/base.py
+++ b/arches/app/datatypes/base.py
@@ -3,7 +3,7 @@
 from arches.app.models import models
 from arches.app.models.system_settings import settings
 from arches.app.search.elasticsearch_dsl_builder import Dsl, Bool, Terms, Exists, Nested
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/arches/app/datatypes/concept_types.py b/arches/app/datatypes/concept_types.py
index 6937e194312..42915e39023 100644
--- a/arches/app/datatypes/concept_types.py
+++ b/arches/app/datatypes/concept_types.py
@@ -3,7 +3,7 @@
 import csv
 import logging
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models import models
 from arches.app.models import concept
 from django.core.cache import cache
diff --git a/arches/app/datatypes/datatypes.py b/arches/app/datatypes/datatypes.py
index b2322becaf7..11a10f96717 100644
--- a/arches/app/datatypes/datatypes.py
+++ b/arches/app/datatypes/datatypes.py
@@ -48,7 +48,7 @@
 from django.core.files import File
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage, default_storage
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.contrib.gis.geos import GEOSGeometry
 from django.contrib.gis.geos import GeometryCollection
 from django.contrib.gis.geos import fromstr
@@ -56,7 +56,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import ValidationError
 from django.db import connection, transaction
-from django.utils.translation import get_language, ugettext as _
+from django.utils.translation import get_language, gettext as _
 
 from elasticsearch import Elasticsearch
 from elasticsearch.exceptions import NotFoundError
diff --git a/arches/app/datatypes/url.py b/arches/app/datatypes/url.py
index cf496dd8718..594c53610c8 100644
--- a/arches/app/datatypes/url.py
+++ b/arches/app/datatypes/url.py
@@ -27,7 +27,7 @@
 from rdflib import ConjunctiveGraph as Graph
 from rdflib import URIRef, Literal, Namespace
 from rdflib.namespace import RDF, RDFS, XSD, DC, DCTERMS
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 archesproject = Namespace(settings.ARCHES_NAMESPACE_FOR_DATA_EXPORT)
 cidoc_nm = Namespace("http://www.cidoc-crm.org/cidoc-crm/")
diff --git a/arches/app/etl_modules/base_data_editor.py b/arches/app/etl_modules/base_data_editor.py
index 8031326304b..caadb6cded5 100644
--- a/arches/app/etl_modules/base_data_editor.py
+++ b/arches/app/etl_modules/base_data_editor.py
@@ -5,7 +5,7 @@
 import uuid
 from django.db import connection
 from django.http import HttpRequest
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.datatypes.datatypes import DataTypeFactory
 from arches.app.etl_modules.base_import_module import BaseImportModule
 from arches.app.models.models import GraphModel, Node
diff --git a/arches/app/etl_modules/base_import_module.py b/arches/app/etl_modules/base_import_module.py
index d040efe8ba4..0e8842c8bb7 100644
--- a/arches/app/etl_modules/base_import_module.py
+++ b/arches/app/etl_modules/base_import_module.py
@@ -2,7 +2,7 @@
 import os
 from django.core.files.storage import default_storage
 from django.db.utils import IntegrityError, ProgrammingError
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.decorators import method_decorator
 from django.db import connection
 from arches.app.utils.decorators import user_created_transaction_match
diff --git a/arches/app/etl_modules/branch_csv_importer.py b/arches/app/etl_modules/branch_csv_importer.py
index 34230bbe99a..787fb338cdf 100644
--- a/arches/app/etl_modules/branch_csv_importer.py
+++ b/arches/app/etl_modules/branch_csv_importer.py
@@ -10,7 +10,7 @@
 from django.http import HttpResponse
 from openpyxl import load_workbook
 from django.db import connection
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.core.files.storage import default_storage
 from arches.app.datatypes.datatypes import DataTypeFactory
 from arches.app.models.models import Node
diff --git a/arches/app/etl_modules/import_single_csv.py b/arches/app/etl_modules/import_single_csv.py
index 938629a95a2..8d8c117f4dd 100644
--- a/arches/app/etl_modules/import_single_csv.py
+++ b/arches/app/etl_modules/import_single_csv.py
@@ -9,7 +9,7 @@
 from django.core.files.storage import default_storage
 from django.db import connection
 from django.db.models.functions import Lower
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.datatypes.datatypes import DataTypeFactory
 from arches.app.models.models import GraphModel, Node, NodeGroup
 from arches.app.models.system_settings import settings
diff --git a/arches/app/functions/primary_descriptors.py b/arches/app/functions/primary_descriptors.py
index d734d5f9e7c..617173fc0cc 100644
--- a/arches/app/functions/primary_descriptors.py
+++ b/arches/app/functions/primary_descriptors.py
@@ -4,7 +4,7 @@
 from arches.app.functions.base import BaseFunction
 from arches.app.models import models
 from arches.app.datatypes.datatypes import DataTypeFactory
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 logger = logging.getLogger(__name__)
 
diff --git a/arches/app/models/concept.py b/arches/app/models/concept.py
index 069fa586b30..4ce93ef3b8a 100644
--- a/arches/app/models/concept.py
+++ b/arches/app/models/concept.py
@@ -29,7 +29,7 @@
 from arches.app.search.elasticsearch_dsl_builder import Term, Query, Bool, Match, Terms
 from arches.app.search.mappings import CONCEPTS_INDEX
 from arches.app.utils.betterJSONSerializer import JSONSerializer, JSONDeserializer
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.translation import get_language
 from django.db import IntegrityError
 from psycopg2.extensions import AsIs
diff --git a/arches/app/models/graph.py b/arches/app/models/graph.py
index 96e294c9d0e..bc69836d761 100644
--- a/arches/app/models/graph.py
+++ b/arches/app/models/graph.py
@@ -31,7 +31,7 @@
 from arches.app.datatypes.datatypes import DataTypeFactory
 from arches.app.utils.betterJSONSerializer import JSONSerializer, JSONDeserializer
 from arches.app.search.search_engine_factory import SearchEngineFactory
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from pyld.jsonld import compact, JsonLdError
 from django.db.models.base import Deferred
 from django.utils import translation
diff --git a/arches/app/models/models.py b/arches/app/models/models.py
index 9dbfef8738d..64544eaac68 100644
--- a/arches/app/models/models.py
+++ b/arches/app/models/models.py
@@ -27,7 +27,7 @@
 from django.db.models.signals import post_delete, pre_save, post_save
 from django.dispatch import receiver
 from django.utils import translation
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.contrib.auth.models import User
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
diff --git a/arches/app/models/resource.py b/arches/app/models/resource.py
index 89afb0f571c..af5daef6dea 100644
--- a/arches/app/models/resource.py
+++ b/arches/app/models/resource.py
@@ -26,7 +26,7 @@
 from django.contrib.auth.models import User, Group
 from django.forms.models import model_to_dict
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.translation import get_language
 from arches.app.models import models
 from arches.app.models.models import EditLog
diff --git a/arches/app/models/tile.py b/arches/app/models/tile.py
index 71bd7f057bd..51eb72ee26a 100644
--- a/arches/app/models/tile.py
+++ b/arches/app/models/tile.py
@@ -30,7 +30,7 @@
 from django.db.models import Q
 from django.contrib.auth.models import User
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models import models
 from arches.app.models.resource import Resource
 from arches.app.models.resource import EditLog
diff --git a/arches/app/search/base_index.py b/arches/app/search/base_index.py
index 4f057ce3471..90d508ac7be 100644
--- a/arches/app/search/base_index.py
+++ b/arches/app/search/base_index.py
@@ -1,6 +1,6 @@
 import pyprind
 from datetime import datetime
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models import models
 from arches.app.models.resource import Resource
 from arches.app.models.system_settings import settings
diff --git a/arches/app/search/components/map_filter.py b/arches/app/search/components/map_filter.py
index d664cfc5dd7..97b9234ce49 100644
--- a/arches/app/search/components/map_filter.py
+++ b/arches/app/search/components/map_filter.py
@@ -1,7 +1,7 @@
 import logging
 from django.contrib.gis.geos import GEOSGeometry
 from django.db import connection
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models.system_settings import settings
 from arches.app.utils.betterJSONSerializer import JSONSerializer, JSONDeserializer
 from arches.app.search.elasticsearch_dsl_builder import Bool, Nested, Terms, GeoShape
diff --git a/arches/app/search/elasticsearch_dsl_builder.py b/arches/app/search/elasticsearch_dsl_builder.py
index 1ec9fe34d91..a179435b288 100644
--- a/arches/app/search/elasticsearch_dsl_builder.py
+++ b/arches/app/search/elasticsearch_dsl_builder.py
@@ -17,7 +17,7 @@
 """
 
 from arches.app.utils.betterJSONSerializer import JSONSerializer
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 
 class Dsl(object):
diff --git a/arches/app/search/search_export.py b/arches/app/search/search_export.py
index 9639edd827a..6cfaaa29be1 100644
--- a/arches/app/search/search_export.py
+++ b/arches/app/search/search_export.py
@@ -25,7 +25,7 @@
 import re
 from django.contrib.gis.geos import GeometryCollection, GEOSGeometry
 from django.core.files import File
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.urls import reverse
 from arches.app.models import models
 from arches.app.models.system_settings import settings
diff --git a/arches/app/tasks.py b/arches/app/tasks.py
index 5b29d3df5c6..ef43d7c9d86 100644
--- a/arches/app/tasks.py
+++ b/arches/app/tasks.py
@@ -9,7 +9,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import connection
 from django.http import HttpRequest
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models import models
 from arches.app.utils import import_class_from_string
 from tempfile import NamedTemporaryFile
diff --git a/arches/app/utils/data_management/resources/formats/csvfile.py b/arches/app/utils/data_management/resources/formats/csvfile.py
index 3e2e773943f..9abc5e38c7a 100644
--- a/arches/app/utils/data_management/resources/formats/csvfile.py
+++ b/arches/app/utils/data_management/resources/formats/csvfile.py
@@ -35,7 +35,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
 from django.db.models import Q
-from django.utils.translation import ugettext as _, get_language
+from django.utils.translation import gettext as _, get_language
 
 logger = logging.getLogger(__name__)
 
diff --git a/arches/app/utils/data_management/resources/formats/format.py b/arches/app/utils/data_management/resources/formats/format.py
index ae192befe78..b4cc2260d80 100644
--- a/arches/app/utils/data_management/resources/formats/format.py
+++ b/arches/app/utils/data_management/resources/formats/format.py
@@ -16,7 +16,7 @@
 from django.contrib.gis.geos import MultiPolygon
 from django.contrib.gis.geos import MultiLineString
 from django.db import connection, transaction
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 
 class MissingGraphException(Exception):
diff --git a/arches/app/utils/data_management/sparql_providers/aat_provider.py b/arches/app/utils/data_management/sparql_providers/aat_provider.py
index 4fd709ad20a..b8990c05ec6 100644
--- a/arches/app/utils/data_management/sparql_providers/aat_provider.py
+++ b/arches/app/utils/data_management/sparql_providers/aat_provider.py
@@ -17,7 +17,7 @@
 """
 
 import urllib.request, urllib.error, urllib.parse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models.models import DValueType
 from arches.app.models.concept import Concept, ConceptValue
 from arches.app.models.system_settings import settings
diff --git a/arches/app/utils/forms.py b/arches/app/utils/forms.py
index 4c7ba4c94d2..63c10d5c52a 100644
--- a/arches/app/utils/forms.py
+++ b/arches/app/utils/forms.py
@@ -21,7 +21,7 @@
 from django.contrib.auth.models import User
 from django.db import transaction
 from django.forms.widgets import PasswordInput, TextInput
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models import models
 from captcha.fields import ReCaptchaField
 import logging
diff --git a/arches/app/utils/middleware.py b/arches/app/utils/middleware.py
index 334b0d31b4a..96c05145f46 100644
--- a/arches/app/utils/middleware.py
+++ b/arches/app/utils/middleware.py
@@ -4,7 +4,7 @@
 from django.contrib.auth.models import User, AnonymousUser
 from django.utils.deprecation import MiddlewareMixin
 from django.utils.functional import SimpleLazyObject
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models.system_settings import settings
 from arches.app.utils.response import Http401Response
 from arches.app.utils.betterJSONSerializer import JSONSerializer, JSONDeserializer
diff --git a/arches/app/utils/response.py b/arches/app/utils/response.py
index 4934c08338b..ea6fcc62c01 100644
--- a/arches/app/utils/response.py
+++ b/arches/app/utils/response.py
@@ -1,7 +1,7 @@
 from io import StringIO
 import logging
 from django.http import HttpResponse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.utils.betterJSONSerializer import JSONSerializer
 from arches.app.models.system_settings import settings
 
diff --git a/arches/app/utils/task_management.py b/arches/app/utils/task_management.py
index f31d0d4e414..e3c0845c193 100644
--- a/arches/app/utils/task_management.py
+++ b/arches/app/utils/task_management.py
@@ -1,6 +1,6 @@
 import logging
 from kombu import Connection
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models.system_settings import settings
 from arches.celery import app
 import time
diff --git a/arches/app/views/api.py b/arches/app/views/api.py
index 954dcf20cba..67d9f7112c6 100644
--- a/arches/app/views/api.py
+++ b/arches/app/views/api.py
@@ -26,7 +26,7 @@
 from django.core.cache import cache
 from django.forms.models import model_to_dict
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.core.files.base import ContentFile
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.decorators import method_decorator
diff --git a/arches/app/views/auth.py b/arches/app/views/auth.py
index ce4839aaac8..4dbe47cb84a 100644
--- a/arches/app/views/auth.py
+++ b/arches/app/views/auth.py
@@ -34,7 +34,7 @@
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.html import strip_tags
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.http import urlencode
 from django.core.mail import EmailMultiAlternatives
 from django.urls import reverse
diff --git a/arches/app/views/concept.py b/arches/app/views/concept.py
index 31c2ef8e440..1ae7f6057ac 100644
--- a/arches/app/views/concept.py
+++ b/arches/app/views/concept.py
@@ -23,7 +23,7 @@
 from django.shortcuts import render
 from django.utils.decorators import method_decorator
 from django.utils.module_loading import import_string
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.translation import get_language
 from arches.app.models import models
 from arches.app.models.system_settings import settings
diff --git a/arches/app/views/etl_manager.py b/arches/app/views/etl_manager.py
index f9375a0df6e..c8f8c046648 100644
--- a/arches/app/views/etl_manager.py
+++ b/arches/app/views/etl_manager.py
@@ -5,7 +5,7 @@
 from django.core.paginator import Paginator
 from django.forms.models import model_to_dict
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.http import HttpResponse
 from django.views.generic import View
 from arches.app.models.models import ETLModule, LoadEvent, LoadStaging
diff --git a/arches/app/views/graph.py b/arches/app/views/graph.py
index ffdef83fe39..1255aaa8f5d 100644
--- a/arches/app/views/graph.py
+++ b/arches/app/views/graph.py
@@ -24,7 +24,7 @@
 from django.db import transaction
 from django.shortcuts import redirect, render
 from django.db.models import Q
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.decorators import method_decorator
 from django.http import HttpResponseNotFound, HttpResponse
 from django.views.generic import View, TemplateView
diff --git a/arches/app/views/language.py b/arches/app/views/language.py
index 53ec0a94163..079e7d14e17 100644
--- a/arches/app/views/language.py
+++ b/arches/app/views/language.py
@@ -23,7 +23,7 @@
 
 from arches.app.utils.response import JSONResponse
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import View
 from arches.app.utils.betterJSONSerializer import JSONSerializer
 
diff --git a/arches/app/views/manifest_manager.py b/arches/app/views/manifest_manager.py
index f85935e0e58..5d031d1f93e 100644
--- a/arches/app/views/manifest_manager.py
+++ b/arches/app/views/manifest_manager.py
@@ -7,7 +7,7 @@
 from revproxy.views import ProxyView
 from django.core.files.storage import default_storage
 from django.http import HttpRequest
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import View
 from arches.app.utils.response import JSONResponse, JSONErrorResponse
 from arches.app.models import models
diff --git a/arches/app/views/map.py b/arches/app/views/map.py
index b56dc591bc4..3eca63c7654 100644
--- a/arches/app/views/map.py
+++ b/arches/app/views/map.py
@@ -18,7 +18,7 @@
 from django.db import transaction
 from django.shortcuts import render
 from django.http import Http404
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.decorators import method_decorator
 from guardian.shortcuts import get_users_with_perms, get_groups_with_perms
 from revproxy.views import ProxyView
diff --git a/arches/app/views/plugin.py b/arches/app/views/plugin.py
index ad671941dea..b5f00fdc86d 100644
--- a/arches/app/views/plugin.py
+++ b/arches/app/views/plugin.py
@@ -17,7 +17,7 @@
 """
 
 from django.shortcuts import render, redirect
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from arches.app.models import models
 from arches.app.models.system_settings import settings
 from arches.app.utils.betterJSONSerializer import JSONSerializer
diff --git a/arches/app/views/resource.py b/arches/app/views/resource.py
index e5250f30d5d..02ee5505e3c 100644
--- a/arches/app/views/resource.py
+++ b/arches/app/views/resource.py
@@ -33,7 +33,7 @@
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import View
 from django.utils import translation
 
diff --git a/arches/app/views/search.py b/arches/app/views/search.py
index 2c8860e501d..c6dbeb11f69 100644
--- a/arches/app/views/search.py
+++ b/arches/app/views/search.py
@@ -27,7 +27,7 @@
 from django.db import connection
 from django.http import HttpResponseNotFound
 from django.shortcuts import render
-from django.utils.translation import get_language, ugettext as _
+from django.utils.translation import get_language, gettext as _
 from django.utils.decorators import method_decorator
 from arches.app.models import models
 from arches.app.models.concept import Concept
diff --git a/arches/app/views/tile.py b/arches/app/views/tile.py
index f1efd6d3b56..751b0f6f861 100644
--- a/arches/app/views/tile.py
+++ b/arches/app/views/tile.py
@@ -34,7 +34,7 @@
 from django.contrib.auth.models import User
 from django.http import HttpResponseNotFound, HttpResponseBadRequest
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.views.generic import View
 from django.db import transaction
diff --git a/arches/app/views/user.py b/arches/app/views/user.py
index aa95ea3db1e..2d2798f26f3 100644
--- a/arches/app/views/user.py
+++ b/arches/app/views/user.py
@@ -23,7 +23,7 @@
 import django.contrib.auth.password_validation as validation
 from django.shortcuts import render
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import View
 from arches.app.models import models
 from arches.app.models.card import Card
diff --git a/arches/management/commands/load_ontology.py b/arches/management/commands/load_ontology.py
index aa02f5e4047..992b9a0b09d 100644
--- a/arches/management/commands/load_ontology.py
+++ b/arches/management/commands/load_ontology.py
@@ -22,7 +22,7 @@
 import os
 import uuid
 import shutil
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.core.management.base import BaseCommand, CommandError
 from django.core.files import File
 from django.db import transaction

From d0e240f6237054cc456f60fdd38876dba32fb066 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 25 Jul 2023 16:36:08 -0400
Subject: [PATCH 02/24] Replace deprecated url() with re_path() or path()

Update arches project template to use path()
---
 .../arches-templates/project_name/urls.py-tpl |   4 +-
 arches/urls.py                                | 320 +++++++++---------
 2 files changed, 162 insertions(+), 162 deletions(-)

diff --git a/arches/install/arches-templates/project_name/urls.py-tpl b/arches/install/arches-templates/project_name/urls.py-tpl
index 92333d226fb..46a478cd63a 100644
--- a/arches/install/arches-templates/project_name/urls.py-tpl
+++ b/arches/install/arches-templates/project_name/urls.py-tpl
@@ -1,10 +1,10 @@
-from django.conf.urls import include, url
 from django.conf import settings
 from django.conf.urls.static import static
 from django.conf.urls.i18n import i18n_patterns
+from django.urls import include, path
 
 urlpatterns = [
-    url(r'^', include('arches.urls')),
+    path('', include('arches.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # if settings.SHOW_LANGUAGE_SWITCH is True:
diff --git a/arches/urls.py b/arches/urls.py
index 72c5f13ebca..dd9e4c283f8 100644
--- a/arches/urls.py
+++ b/arches/urls.py
@@ -19,8 +19,8 @@
 from arches.app.views.language import LanguageView
 from django.views.decorators.cache import cache_page
 from django.contrib.auth import views as auth_views
-from django.conf.urls import include, url
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.urls import include, path, re_path
 from arches.app.views import concept, main, map, search, graph, api
 from arches.app.views.admin import ReIndexResources, FileView, ClearUserPermissionCache
 from arches.app.views.etl_manager import ETLManagerView
@@ -88,49 +88,49 @@
 
 
 urlpatterns = [
-    url(r"^$", main.index, name="root"),
-    url(r"^index.htm", main.index, name="home"),
-    url(r"^auth/password$", ChangePasswordView.as_view(), name="change_password"),
-    url(r"^auth/signup$", SignupView.as_view(), name="signup"),
-    url(r"^auth/confirm_signup$", ConfirmSignupView.as_view(), name="confirm_signup"),
-    url(r"^auth/get_client_id$", GetClientIdView.as_view(), name="get_client_id"),
-    url(r"^auth/user_profile$", UserProfileView.as_view(), name="user_profile"),
-    url(r"^auth/server_settings$", ServerSettingView.as_view(), name="server_settings"),
-    url(r"^auth/get_dev_token$", Token.as_view(), name="get_dev_token"),
-    url(r"^auth/eoauth_cb$", ExternalOauth.callback, name="external_oauth_callback"),
-    url(r"^auth/eoauth_start$", ExternalOauth.start, name="external_oauth_start"),
-    url(r"^auth/", LoginView.as_view(), name="auth"),
-    url(r"^rdm/(?P<conceptid>%s|())$" % uuid_regex, RDMView.as_view(), name="rdm"),
-    url(r"^admin/reindex/resources$", ReIndexResources.as_view(), name="reindex"),
-    url(r"^files/(?P<fileid>%s)$" % uuid_regex, FileView.as_view(), name="file_access"),
-    url(r"^concepts/(?P<conceptid>%s)/manage_parents/$" % uuid_regex, concept.manage_parents, name="concept_manage_parents"),
-    url(r"^concepts/(?P<conceptid>%s)/confirm_delete/$" % uuid_regex, concept.confirm_delete, name="confirm_delete"),
-    url(r"^concepts/(?P<conceptid>%s)/make_collection/$" % uuid_regex, concept.make_collection, name="make_collection"),
-    url(r"^concepts/(?P<conceptid>%s|())$" % uuid_regex, concept.concept, name="concept"),
-    url(r"^concepts/tree/(?P<mode>.*)", concept.concept_tree, name="concept_tree"),
-    url(r"^concepts/search$", concept.search, name="concept_search"),
-    url(
+    re_path(r"^$", main.index, name="root"),
+    re_path(r"^index.htm", main.index, name="home"),
+    re_path(r"^auth/password$", ChangePasswordView.as_view(), name="change_password"),
+    re_path(r"^auth/signup$", SignupView.as_view(), name="signup"),
+    re_path(r"^auth/confirm_signup$", ConfirmSignupView.as_view(), name="confirm_signup"),
+    re_path(r"^auth/get_client_id$", GetClientIdView.as_view(), name="get_client_id"),
+    re_path(r"^auth/user_profile$", UserProfileView.as_view(), name="user_profile"),
+    re_path(r"^auth/server_settings$", ServerSettingView.as_view(), name="server_settings"),
+    re_path(r"^auth/get_dev_token$", Token.as_view(), name="get_dev_token"),
+    re_path(r"^auth/eoauth_cb$", ExternalOauth.callback, name="external_oauth_callback"),
+    re_path(r"^auth/eoauth_start$", ExternalOauth.start, name="external_oauth_start"),
+    re_path(r"^auth/", LoginView.as_view(), name="auth"),
+    re_path(r"^rdm/(?P<conceptid>%s|())$" % uuid_regex, RDMView.as_view(), name="rdm"),
+    re_path(r"^admin/reindex/resources$", ReIndexResources.as_view(), name="reindex"),
+    re_path(r"^files/(?P<fileid>%s)$" % uuid_regex, FileView.as_view(), name="file_access"),
+    re_path(r"^concepts/(?P<conceptid>%s)/manage_parents/$" % uuid_regex, concept.manage_parents, name="concept_manage_parents"),
+    re_path(r"^concepts/(?P<conceptid>%s)/confirm_delete/$" % uuid_regex, concept.confirm_delete, name="confirm_delete"),
+    re_path(r"^concepts/(?P<conceptid>%s)/make_collection/$" % uuid_regex, concept.make_collection, name="make_collection"),
+    re_path(r"^concepts/(?P<conceptid>%s|())$" % uuid_regex, concept.concept, name="concept"),
+    re_path(r"^concepts/tree/(?P<mode>.*)", concept.concept_tree, name="concept_tree"),
+    re_path(r"^concepts/search$", concept.search, name="concept_search"),
+    re_path(
         r"^concepts/(?P<conceptid>%s)/from_sparql_endpoint$" % uuid_regex,
         concept.add_concepts_from_sparql_endpoint,
         name="from_sparql_endpoint",
     ),
-    url(r"^concepts/search_sparql_endpoint$", concept.search_sparql_endpoint_for_concepts, name="search_sparql_endpoint"),
-    url(r"^concepts/dropdown", concept.dropdown, name="dropdown"),
-    url(r"^concepts/paged_dropdown", concept.paged_dropdown, name="paged_dropdown"),
-    url(r"^concepts/export/(?P<conceptid>%s)$" % uuid_regex, concept.export, name="export_concept"),
-    url(r"^concepts/export/collections", concept.export_collections, name="export_concept_collections"),
-    url(r"^concepts/collections", concept.get_concept_collections, name="get_concept_collections"),
-    url(r"^concepts/get_pref_label", concept.get_pref_label, name="get_pref_label"),
-    url(r"^conceptvalue/", concept.concept_value, name="concept_value"),
-    url(r"^search$", search.SearchView.as_view(), name="search_home"),
-    url(r"^search/terms$", search.search_terms, name="search_terms"),
-    url(r"^search/resources$", search.search_results, name="search_results"),
-    url(r"^search/time_wheel_config$", search.time_wheel_config, name="time_wheel_config"),
-    url(r"^search/export_results$", search.export_results, name="export_results"),
-    url(r"^search/get_export_file$", search.get_export_file, name="get_export_file"),
-    url(r"^search/get_dsl$", search.get_dsl_from_search_string, name="get_dsl"),
-    url(r"^buffer/$", search.buffer, name="buffer"),
-    url(
+    re_path(r"^concepts/search_sparql_endpoint$", concept.search_sparql_endpoint_for_concepts, name="search_sparql_endpoint"),
+    re_path(r"^concepts/dropdown", concept.dropdown, name="dropdown"),
+    re_path(r"^concepts/paged_dropdown", concept.paged_dropdown, name="paged_dropdown"),
+    re_path(r"^concepts/export/(?P<conceptid>%s)$" % uuid_regex, concept.export, name="export_concept"),
+    re_path(r"^concepts/export/collections", concept.export_collections, name="export_concept_collections"),
+    re_path(r"^concepts/collections", concept.get_concept_collections, name="get_concept_collections"),
+    re_path(r"^concepts/get_pref_label", concept.get_pref_label, name="get_pref_label"),
+    re_path(r"^conceptvalue/", concept.concept_value, name="concept_value"),
+    re_path(r"^search$", search.SearchView.as_view(), name="search_home"),
+    re_path(r"^search/terms$", search.search_terms, name="search_terms"),
+    re_path(r"^search/resources$", search.search_results, name="search_results"),
+    re_path(r"^search/time_wheel_config$", search.time_wheel_config, name="time_wheel_config"),
+    re_path(r"^search/export_results$", search.export_results, name="export_results"),
+    re_path(r"^search/get_export_file$", search.get_export_file, name="get_export_file"),
+    re_path(r"^search/get_dsl$", search.get_dsl_from_search_string, name="get_dsl"),
+    re_path(r"^buffer/$", search.buffer, name="buffer"),
+    re_path(
         r"^settings/",
         ResourceEditorView.as_view(),
         {
@@ -141,170 +141,170 @@
         },
         name="config",
     ),
-    url(r"^graph/new$", GraphDataView.as_view(action="new_graph"), name="new_graph"),
-    url(r"^graph/import/", GraphDataView.as_view(action="import_graph"), name="import_graph"),
-    url(r"^graph/reorder_nodes$", GraphDataView.as_view(action="reorder_nodes"), name="reorder_nodes"),
-    url(r"^graph/permissions$", PermissionDataView.as_view(), name="permission_data"),
-    url(r"^resource/permissions$", ResourcePermissionDataView.as_view(), name="resource_permission_data"),
-    url(
+    re_path(r"^graph/new$", GraphDataView.as_view(action="new_graph"), name="new_graph"),
+    re_path(r"^graph/import/", GraphDataView.as_view(action="import_graph"), name="import_graph"),
+    re_path(r"^graph/reorder_nodes$", GraphDataView.as_view(action="reorder_nodes"), name="reorder_nodes"),
+    re_path(r"^graph/permissions$", PermissionDataView.as_view(), name="permission_data"),
+    re_path(r"^resource/permissions$", ResourcePermissionDataView.as_view(), name="resource_permission_data"),
+    re_path(
         r"^graph/permissions/permission_manager_data$",
         PermissionDataView.as_view(action="get_permission_manager_data"),
         name="permission_manager_data",
     ),
-    url(r"^graph/(?P<graphid>%s|())$" % uuid_regex, GraphManagerView.as_view(), name="graph"),
-    url(r"^graph/(?P<graphid>%s)/nodes$" % uuid_regex, GraphDataView.as_view(action="get_nodes"), name="graph_nodes"),
-    url(r"^graph/(?P<graphid>%s)/append_branch$" % uuid_regex, GraphDataView.as_view(action="append_branch"), name="append_branch"),
-    url(r"^graph/(?P<graphid>%s)/append_node$" % uuid_regex, GraphDataView.as_view(action="append_node"), name="append_node"),
-    url(r"^graph/(?P<graphid>%s)/move_node$" % uuid_regex, GraphDataView.as_view(action="move_node"), name="move_node"),
-    url(r"^graph/(?P<graphid>%s)/update_node$" % uuid_regex, GraphDataView.as_view(action="update_node"), name="update_node"),
-    url(r"^graph/(?P<graphid>%s)/delete_node$" % uuid_regex, GraphDataView.as_view(action="delete_node"), name="delete_node"),
-    url(
+    re_path(r"^graph/(?P<graphid>%s|())$" % uuid_regex, GraphManagerView.as_view(), name="graph"),
+    re_path(r"^graph/(?P<graphid>%s)/nodes$" % uuid_regex, GraphDataView.as_view(action="get_nodes"), name="graph_nodes"),
+    re_path(r"^graph/(?P<graphid>%s)/append_branch$" % uuid_regex, GraphDataView.as_view(action="append_branch"), name="append_branch"),
+    re_path(r"^graph/(?P<graphid>%s)/append_node$" % uuid_regex, GraphDataView.as_view(action="append_node"), name="append_node"),
+    re_path(r"^graph/(?P<graphid>%s)/move_node$" % uuid_regex, GraphDataView.as_view(action="move_node"), name="move_node"),
+    re_path(r"^graph/(?P<graphid>%s)/update_node$" % uuid_regex, GraphDataView.as_view(action="update_node"), name="update_node"),
+    re_path(r"^graph/(?P<graphid>%s)/delete_node$" % uuid_regex, GraphDataView.as_view(action="delete_node"), name="delete_node"),
+    re_path(
         r"^graph/(?P<graphid>%s)/delete_instances$" % uuid_regex, GraphDataView.as_view(action="delete_instances"), name="delete_instances"
     ),
-    url(r"^graph/(?P<graphid>%s)/clone$" % uuid_regex, GraphDataView.as_view(action="clone_graph"), name="clone_graph"),
-    url(r"^graph/(?P<graphid>%s)/export$" % uuid_regex, GraphDataView.as_view(action="export_graph"), name="export_graph"),
-    url(r"^graph/(?P<graphid>%s)/delete$" % uuid_regex, GraphDataView.as_view(action="delete_graph"), name="delete_graph"),
-    url(r"^graph/(?P<graphid>%s)/export_branch$" % uuid_regex, GraphDataView.as_view(action="export_branch"), name="export_branch"),
-    url(
+    re_path(r"^graph/(?P<graphid>%s)/clone$" % uuid_regex, GraphDataView.as_view(action="clone_graph"), name="clone_graph"),
+    re_path(r"^graph/(?P<graphid>%s)/export$" % uuid_regex, GraphDataView.as_view(action="export_graph"), name="export_graph"),
+    re_path(r"^graph/(?P<graphid>%s)/delete$" % uuid_regex, GraphDataView.as_view(action="delete_graph"), name="delete_graph"),
+    re_path(r"^graph/(?P<graphid>%s)/export_branch$" % uuid_regex, GraphDataView.as_view(action="export_branch"), name="export_branch"),
+    re_path(
         r"^graph/(?P<graphid>%s)/export_mapping_file$" % uuid_regex,
         GraphDataView.as_view(action="export_mapping_file"),
         name="export_mapping_file",
     ),
-    url(
+    re_path(
         r"^graph/(?P<graphid>%s)/get_related_nodes/(?P<nodeid>%s)$" % (uuid_regex, uuid_regex),
         GraphDataView.as_view(action="get_related_nodes"),
         name="get_related_nodes",
     ),
-    url(
+    re_path(
         r"^graph/(?P<graphid>%s)/get_valid_domain_nodes/(?P<nodeid>%s|())$" % (uuid_regex, uuid_regex),
         GraphDataView.as_view(action="get_valid_domain_nodes"),
         name="get_valid_domain_nodes",
     ),
-    url(
+    re_path(
         r"^graph/(?P<graphid>%s)/get_domain_connections$" % uuid_regex,
         GraphDataView.as_view(action="get_domain_connections"),
         name="get_domain_connections",
     ),
-    url(r"^graph/(?P<graphid>%s)/publish$" % uuid_regex, GraphPublicationView.as_view(action="publish"), name="publish_graph"),
-    url(r"^graph/(?P<graphid>%s)/unpublish$" % uuid_regex, GraphPublicationView.as_view(action="unpublish"), name="unpublish_graph"),
-    url(r"^graph/(?P<graphid>%s)/function_manager$" % uuid_regex, FunctionManagerView.as_view(), name="function_manager"),
-    url(r"^graph/(?P<graphid>%s)/apply_functions$" % uuid_regex, FunctionManagerView.as_view(), name="apply_functions"),
-    url(r"^graph/(?P<graphid>%s)/remove_functions$" % uuid_regex, FunctionManagerView.as_view(), name="remove_functions"),
-    url(r"^graph_designer/(?P<graphid>%s)$" % uuid_regex, GraphDesignerView.as_view(), name="graph_designer"),
-    url(r"^graph_settings/(?P<graphid>%s)$" % uuid_regex, GraphSettingsView.as_view(), name="graph_settings"),
-    url(r"^components/datatypes/(?P<template>[a-zA-Z_-]*)", DatatypeTemplateView.as_view(), name="datatype_template"),
-    url(r"^resource$", ResourceListView.as_view(), name="resource"),
-    url(r"^resource/(?P<resourceid>%s)$" % uuid_regex, ResourceEditorView.as_view(), name="resource_editor"),
-    url(r"^add-resource/(?P<graphid>%s)$" % uuid_regex, ResourceEditorView.as_view(), name="add_resource"),
-    url(r"^resource/(?P<resourceid>%s)/copy$" % uuid_regex, ResourceEditorView.as_view(action="copy"), name="resource_copy"),
-    url(r"^resource/(?P<resourceid>%s)/history$" % uuid_regex, ResourceEditLogView.as_view(), name="resource_edit_log"),
-    url(r"^resource/(?P<resourceid>%s)/data/(?P<formid>%s)$" % (uuid_regex, uuid_regex), ResourceData.as_view(), name="resource_data"),
-    url(r"^resource/(?P<resourceid>%s)/cards$" % uuid_regex, ResourceCards.as_view(), name="resource_cards"),
-    url(r"^resource/history$", ResourceEditLogView.as_view(), name="edit_history"),
-    url(r"^resource/related/(?P<resourceid>%s|())$" % uuid_regex, RelatedResourcesView.as_view(), name="related_resources"),
-    url(r"^resource/related/candidates", RelatedResourcesView.as_view(action="get_candidates"), name="related_resource_candidates"),
-    url(r"^resource/related/relatable", RelatedResourcesView.as_view(action="get_relatable_resources"), name="relatable_resources"),
-    url(r"^resource/descriptors/(?P<resourceid>%s|())$" % uuid_regex, ResourceDescriptors.as_view(), name="resource_descriptors"),
-    url(r"^resource/(?P<resourceid>%s)/tiles$" % uuid_regex, ResourceTiles.as_view(), name="resource_tiles"),
-    url(r"^report/(?P<resourceid>%s)$" % uuid_regex, ResourceReportView.as_view(), name="resource_report"),
-    url(r"^transaction/(?P<transactionid>%s)/reverse$" % uuid_regex, ReverseTransaction.as_view(), name="transaction_reverse"),
-    url(r"^card/(?P<cardid>%s|())$" % uuid_regex, CardView.as_view(action="update_card"), name="card"),
-    url(r"^reorder_cards/", CardView.as_view(action="reorder_cards"), name="reorder_cards"),
-    url(r"^node/(?P<graphid>%s)$" % uuid_regex, GraphDataView.as_view(action="update_node"), name="node"),
-    url(r"^nodegroup/", NodegroupView.as_view(action="exportable"), name="nodegroup"),
-    url(r"^language/", LanguageView.as_view(), name="language"),
-    url(r"^node_layer/(?P<graphid>%s)$" % uuid_regex, GraphDataView.as_view(action="update_node_layer"), name="node_layer"),
-    url(r"^widgets/(?P<template>[a-zA-Z_-]*)", main.widget, name="widgets"),
-    url(r"^report-templates/(?P<template>[a-zA-Z_-]*)", main.report_templates, name="report-templates"),
-    url(r"^function-templates/(?P<template>[a-zA-Z_-]*)", main.function_templates, name="function-templates"),
-    url(r"^help-templates$", main.help_templates, name="help_templates"),
-    url(r"^tile$", TileData.as_view(action="update_tile"), name="tile"),
-    url(r"^tiles/reorder_tiles$", TileData.as_view(action="reorder_tiles"), name="reorder_tiles"),
-    url(r"^tiles/tile_history$", TileData.as_view(action="tile_history"), name="tile_history"),
-    url(r"^tiles/delete_provisional_tile$", TileData.as_view(action="delete_provisional_tile"), name="delete_provisional_tile"),
-    url(r"^tiles/download_files$", TileData.as_view(action="download_files"), name="download_files"),
-    url(r"^templates/(?P<template>[a-zA-Z_\-./]*)", main.templates, name="templates"),
-    url(r"^map_layer_manager/(?P<maplayerid>%s)$" % uuid_regex, MapLayerManagerView.as_view(), name="map_layer_update"),
-    url(r"^map_layer_manager/*", MapLayerManagerView.as_view(), name="map_layer_manager"),
-    url(r"^feature_popup_content$", main.feature_popup_content, name="feature_popup_content"),
-    url(r"^user$", UserManagerView.as_view(), name="user_profile_manager"),
-    url(r"^user/get_user_names$", UserManagerView.as_view(action="get_user_names"), name="get_user_names"),
-    url(r"^notifications$", NotificationView.as_view(), name="get_notifications"),
-    url(r"^notifications/dismiss$", NotificationView.as_view(action="dismiss"), name="dismiss_notifications"),
-    url(r"^notifications/get_types$", NotificationView.as_view(action="get_types"), name="get_notification_types"),
-    url(r"^notifications/update_types$", NotificationView.as_view(action="update_types"), name="update_notification_types"),
-    url(r"^%s/(?P<path>.*)$" % settings.KIBANA_CONFIG_BASEPATH, api.KibanaProxy.as_view()),
-    url(r"^graphs/(?P<graph_id>%s)$" % (uuid_regex), api.Graphs.as_view(), name="graphs_api"),
-    url(r"^graphs", api.Graphs.as_view(action="get_graph_models"), name="get_graph_models_api"),
-    url(r"^resources/(?P<graphid>%s)/(?P<resourceid>%s|())$" % (uuid_regex, uuid_regex), api.Resources.as_view(), name="resources_graphid"),
-    url(r"^resources/(?P<slug>[-\w]+)/(?P<resourceid>%s|())$" % uuid_regex, api.Resources.as_view(), name="resources_slug"),
-    url(r"^resources/(?P<resourceid>%s|())$" % uuid_regex, api.Resources.as_view(), name="resources"),
-    url(r"^api/tiles/(?P<tileid>%s|())$" % (uuid_regex), api.Tile.as_view(), name="api_tiles"),
-    url(r"^api/nodes/(?P<nodeid>%s|())$" % (uuid_regex), api.Node.as_view(), name="api_nodes"),
-    url(r"^api/nodegroup/(?P<nodegroupid>%s|())$" % (uuid_regex), api.NodeGroup.as_view(), name="api_nodegroup"),
-    url(r"^api/instance_permissions/$", api.InstancePermission.as_view(), name="api_instance_permissions"),
-    url(r"^api/node_value/$", api.NodeValue.as_view(), name="api_node_value"),
-    url(r"^api/resource_report/(?P<resourceid>%s|())$" % (uuid_regex), api.ResourceReport.as_view(), name="api_resource_report"),
-    url(r"^api/bulk_resource_report$", api.BulkResourceReport.as_view(), name="api_bulk_resource_report"),
-    url(
+    re_path(r"^graph/(?P<graphid>%s)/publish$" % uuid_regex, GraphPublicationView.as_view(action="publish"), name="publish_graph"),
+    re_path(r"^graph/(?P<graphid>%s)/unpublish$" % uuid_regex, GraphPublicationView.as_view(action="unpublish"), name="unpublish_graph"),
+    re_path(r"^graph/(?P<graphid>%s)/function_manager$" % uuid_regex, FunctionManagerView.as_view(), name="function_manager"),
+    re_path(r"^graph/(?P<graphid>%s)/apply_functions$" % uuid_regex, FunctionManagerView.as_view(), name="apply_functions"),
+    re_path(r"^graph/(?P<graphid>%s)/remove_functions$" % uuid_regex, FunctionManagerView.as_view(), name="remove_functions"),
+    re_path(r"^graph_designer/(?P<graphid>%s)$" % uuid_regex, GraphDesignerView.as_view(), name="graph_designer"),
+    re_path(r"^graph_settings/(?P<graphid>%s)$" % uuid_regex, GraphSettingsView.as_view(), name="graph_settings"),
+    re_path(r"^components/datatypes/(?P<template>[a-zA-Z_-]*)", DatatypeTemplateView.as_view(), name="datatype_template"),
+    re_path(r"^resource$", ResourceListView.as_view(), name="resource"),
+    re_path(r"^resource/(?P<resourceid>%s)$" % uuid_regex, ResourceEditorView.as_view(), name="resource_editor"),
+    re_path(r"^add-resource/(?P<graphid>%s)$" % uuid_regex, ResourceEditorView.as_view(), name="add_resource"),
+    re_path(r"^resource/(?P<resourceid>%s)/copy$" % uuid_regex, ResourceEditorView.as_view(action="copy"), name="resource_copy"),
+    re_path(r"^resource/(?P<resourceid>%s)/history$" % uuid_regex, ResourceEditLogView.as_view(), name="resource_edit_log"),
+    re_path(r"^resource/(?P<resourceid>%s)/data/(?P<formid>%s)$" % (uuid_regex, uuid_regex), ResourceData.as_view(), name="resource_data"),
+    re_path(r"^resource/(?P<resourceid>%s)/cards$" % uuid_regex, ResourceCards.as_view(), name="resource_cards"),
+    re_path(r"^resource/history$", ResourceEditLogView.as_view(), name="edit_history"),
+    re_path(r"^resource/related/(?P<resourceid>%s|())$" % uuid_regex, RelatedResourcesView.as_view(), name="related_resources"),
+    re_path(r"^resource/related/candidates", RelatedResourcesView.as_view(action="get_candidates"), name="related_resource_candidates"),
+    re_path(r"^resource/related/relatable", RelatedResourcesView.as_view(action="get_relatable_resources"), name="relatable_resources"),
+    re_path(r"^resource/descriptors/(?P<resourceid>%s|())$" % uuid_regex, ResourceDescriptors.as_view(), name="resource_descriptors"),
+    re_path(r"^resource/(?P<resourceid>%s)/tiles$" % uuid_regex, ResourceTiles.as_view(), name="resource_tiles"),
+    re_path(r"^report/(?P<resourceid>%s)$" % uuid_regex, ResourceReportView.as_view(), name="resource_report"),
+    re_path(r"^transaction/(?P<transactionid>%s)/reverse$" % uuid_regex, ReverseTransaction.as_view(), name="transaction_reverse"),
+    re_path(r"^card/(?P<cardid>%s|())$" % uuid_regex, CardView.as_view(action="update_card"), name="card"),
+    re_path(r"^reorder_cards/", CardView.as_view(action="reorder_cards"), name="reorder_cards"),
+    re_path(r"^node/(?P<graphid>%s)$" % uuid_regex, GraphDataView.as_view(action="update_node"), name="node"),
+    re_path(r"^nodegroup/", NodegroupView.as_view(action="exportable"), name="nodegroup"),
+    re_path(r"^language/", LanguageView.as_view(), name="language"),
+    re_path(r"^node_layer/(?P<graphid>%s)$" % uuid_regex, GraphDataView.as_view(action="update_node_layer"), name="node_layer"),
+    re_path(r"^widgets/(?P<template>[a-zA-Z_-]*)", main.widget, name="widgets"),
+    re_path(r"^report-templates/(?P<template>[a-zA-Z_-]*)", main.report_templates, name="report-templates"),
+    re_path(r"^function-templates/(?P<template>[a-zA-Z_-]*)", main.function_templates, name="function-templates"),
+    re_path(r"^help-templates$", main.help_templates, name="help_templates"),
+    re_path(r"^tile$", TileData.as_view(action="update_tile"), name="tile"),
+    re_path(r"^tiles/reorder_tiles$", TileData.as_view(action="reorder_tiles"), name="reorder_tiles"),
+    re_path(r"^tiles/tile_history$", TileData.as_view(action="tile_history"), name="tile_history"),
+    re_path(r"^tiles/delete_provisional_tile$", TileData.as_view(action="delete_provisional_tile"), name="delete_provisional_tile"),
+    re_path(r"^tiles/download_files$", TileData.as_view(action="download_files"), name="download_files"),
+    re_path(r"^templates/(?P<template>[a-zA-Z_\-./]*)", main.templates, name="templates"),
+    re_path(r"^map_layer_manager/(?P<maplayerid>%s)$" % uuid_regex, MapLayerManagerView.as_view(), name="map_layer_update"),
+    re_path(r"^map_layer_manager/*", MapLayerManagerView.as_view(), name="map_layer_manager"),
+    re_path(r"^feature_popup_content$", main.feature_popup_content, name="feature_popup_content"),
+    re_path(r"^user$", UserManagerView.as_view(), name="user_profile_manager"),
+    re_path(r"^user/get_user_names$", UserManagerView.as_view(action="get_user_names"), name="get_user_names"),
+    re_path(r"^notifications$", NotificationView.as_view(), name="get_notifications"),
+    re_path(r"^notifications/dismiss$", NotificationView.as_view(action="dismiss"), name="dismiss_notifications"),
+    re_path(r"^notifications/get_types$", NotificationView.as_view(action="get_types"), name="get_notification_types"),
+    re_path(r"^notifications/update_types$", NotificationView.as_view(action="update_types"), name="update_notification_types"),
+    re_path(r"^%s/(?P<path>.*)$" % settings.KIBANA_CONFIG_BASEPATH, api.KibanaProxy.as_view()),
+    re_path(r"^graphs/(?P<graph_id>%s)$" % (uuid_regex), api.Graphs.as_view(), name="graphs_api"),
+    re_path(r"^graphs", api.Graphs.as_view(action="get_graph_models"), name="get_graph_models_api"),
+    re_path(r"^resources/(?P<graphid>%s)/(?P<resourceid>%s|())$" % (uuid_regex, uuid_regex), api.Resources.as_view(), name="resources_graphid"),
+    re_path(r"^resources/(?P<slug>[-\w]+)/(?P<resourceid>%s|())$" % uuid_regex, api.Resources.as_view(), name="resources_slug"),
+    re_path(r"^resources/(?P<resourceid>%s|())$" % uuid_regex, api.Resources.as_view(), name="resources"),
+    re_path(r"^api/tiles/(?P<tileid>%s|())$" % (uuid_regex), api.Tile.as_view(), name="api_tiles"),
+    re_path(r"^api/nodes/(?P<nodeid>%s|())$" % (uuid_regex), api.Node.as_view(), name="api_nodes"),
+    re_path(r"^api/nodegroup/(?P<nodegroupid>%s|())$" % (uuid_regex), api.NodeGroup.as_view(), name="api_nodegroup"),
+    re_path(r"^api/instance_permissions/$", api.InstancePermission.as_view(), name="api_instance_permissions"),
+    re_path(r"^api/node_value/$", api.NodeValue.as_view(), name="api_node_value"),
+    re_path(r"^api/resource_report/(?P<resourceid>%s|())$" % (uuid_regex), api.ResourceReport.as_view(), name="api_resource_report"),
+    re_path(r"^api/bulk_resource_report$", api.BulkResourceReport.as_view(), name="api_bulk_resource_report"),
+    re_path(
         r"^api/bulk_disambiguated_resource_instance$",
         api.BulkDisambiguatedResourceInstance.as_view(),
         name="api_bulk_disambiguated_resource_instance",
     ),
-    url(r"^api/search/export_results$", api.SearchExport.as_view(), name="api_export_results"),
-    url(r"^rdm/concepts/(?P<conceptid>%s|())$" % uuid_regex, api.Concepts.as_view(), name="concepts"),
-    url(r"^plugins/(?P<pluginid>%s)$" % uuid_regex, PluginView.as_view(), name="plugins"),
-    url(r"^plugins/(?P<slug>[-\w]+)$", PluginView.as_view(), name="plugins"),
-    url(r"^cards/(?P<resourceid>%s|())$" % uuid_regex, api.Card.as_view(), name="api_card"),
-    url(r"^search_component_data/(?P<componentname>[-\w]+)$", api.SearchComponentData.as_view(), name="api_search_component_data"),
-    url(r"^geojson$", api.GeoJSON.as_view(), name="geojson"),
-    url(
+    re_path(r"^api/search/export_results$", api.SearchExport.as_view(), name="api_export_results"),
+    re_path(r"^rdm/concepts/(?P<conceptid>%s|())$" % uuid_regex, api.Concepts.as_view(), name="concepts"),
+    re_path(r"^plugins/(?P<pluginid>%s)$" % uuid_regex, PluginView.as_view(), name="plugins"),
+    re_path(r"^plugins/(?P<slug>[-\w]+)$", PluginView.as_view(), name="plugins"),
+    re_path(r"^cards/(?P<resourceid>%s|())$" % uuid_regex, api.Card.as_view(), name="api_card"),
+    re_path(r"^search_component_data/(?P<componentname>[-\w]+)$", api.SearchComponentData.as_view(), name="api_search_component_data"),
+    re_path(r"^geojson$", api.GeoJSON.as_view(), name="geojson"),
+    re_path(
         r"^mvt/(?P<nodeid>%s)/(?P<zoom>[0-9]+|\{z\})/(?P<x>[0-9]+|\{x\})/(?P<y>[0-9]+|\{y\}).pbf$" % uuid_regex,
         api.MVT.as_view(),
         name="mvt",
     ),
-    url(r"^images$", api.Images.as_view(), name="images"),
-    url(r"^ontology_properties$", api.OntologyProperty.as_view(), name="ontology_properties"),
-    url(r"^validate/(?P<itemtype>[-\w]+)/(?P<itemid>[-\w]+)", api.Validator.as_view(), name="validate"),
-    url(r"^validate/(?P<itemtype>[-\w]+)", api.Validator.as_view(), name="validatejson"),
-    url(r"^tileserver/(?P<path>.*)$", TileserverProxyView.as_view()),
-    url(r"^history/$", ResourceActivityStreamCollectionView.as_view(), name="as_stream_collection"),
-    url(r"^history/(?P<page>[0-9]+)$", ResourceActivityStreamPageView.as_view(), name="as_stream_page"),
-    url(r"^icons$", IconDataView.as_view(), name="icons"),
+    re_path(r"^images$", api.Images.as_view(), name="images"),
+    re_path(r"^ontology_properties$", api.OntologyProperty.as_view(), name="ontology_properties"),
+    re_path(r"^validate/(?P<itemtype>[-\w]+)/(?P<itemid>[-\w]+)", api.Validator.as_view(), name="validate"),
+    re_path(r"^validate/(?P<itemtype>[-\w]+)", api.Validator.as_view(), name="validatejson"),
+    re_path(r"^tileserver/(?P<path>.*)$", TileserverProxyView.as_view()),
+    re_path(r"^history/$", ResourceActivityStreamCollectionView.as_view(), name="as_stream_collection"),
+    re_path(r"^history/(?P<page>[0-9]+)$", ResourceActivityStreamPageView.as_view(), name="as_stream_page"),
+    re_path(r"^icons$", IconDataView.as_view(), name="icons"),
     # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    # re_path(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Uncomment the next line to enable the admin:
-    url(r"^admin/", admin.site.urls),
-    url("i18n/", include("django.conf.urls.i18n")),
-    url(
+    re_path(r"^admin/", admin.site.urls),
+    path("i18n/", include("django.conf.urls.i18n")),
+    re_path(
         r"^password_reset/$",
         PasswordResetView.as_view(),
         name="password_reset",
     ),
-    url(r"^password_reset/done/$", auth_views.PasswordResetDoneView.as_view(), name="password_reset_done"),
+    re_path(r"^password_reset/done/$", auth_views.PasswordResetDoneView.as_view(), name="password_reset_done"),
     path(
         "reset/<uidb64>/<token>/",
         PasswordResetConfirmView.as_view(),
         name="password_reset_confirm",
     ),
-    url(r"^reset/done/$", auth_views.PasswordResetCompleteView.as_view(), name="password_reset_complete"),
-    url(r"^o/", include("oauth2_provider.urls", namespace="oauth2")),
-    url(r"^iiifmanifest$", api.IIIFManifest.as_view(), name="iiifmanifest"),
-    url(r"^iiifserver/(?P<path>.*)$", IIIFServerProxyView.as_view()),
-    url(r"^iiifannotations$", api.IIIFAnnotations.as_view(), name="iiifannotations"),
-    url(r"^iiifannotationnodes$", api.IIIFAnnotationNodes.as_view(), name="iiifannotationnodes"),
-    url(r"^manifest/(?P<id>[0-9]+)$", api.Manifest.as_view(), name="manifest"),
-    url(r"^image-service-manager", ManifestManagerView.as_view(), name="manifest_manager"),
-    url(r"^two-factor-authentication-settings", TwoFactorAuthenticationSettingsView.as_view(), name="two-factor-authentication-settings"),
-    url(r"^two-factor-authentication-login", TwoFactorAuthenticationLoginView.as_view(), name="two-factor-authentication-login"),
-    url(r"^two-factor-authentication-reset", TwoFactorAuthenticationResetView.as_view(), name="two-factor-authentication-reset"),
-    url(r"^etl-manager$", ETLManagerView.as_view(), name="etl_manager"),
-    url(r"^clear-user-permission-cache", ClearUserPermissionCache.as_view(), name="clear_user_permission_cache"),
-    url(r"^transform-edtf-for-tile", api.TransformEdtfForTile.as_view(), name="transform_edtf_for_tile"),
+    re_path(r"^reset/done/$", auth_views.PasswordResetCompleteView.as_view(), name="password_reset_complete"),
+    re_path(r"^o/", include("oauth2_provider.urls", namespace="oauth2")),
+    re_path(r"^iiifmanifest$", api.IIIFManifest.as_view(), name="iiifmanifest"),
+    re_path(r"^iiifserver/(?P<path>.*)$", IIIFServerProxyView.as_view()),
+    re_path(r"^iiifannotations$", api.IIIFAnnotations.as_view(), name="iiifannotations"),
+    re_path(r"^iiifannotationnodes$", api.IIIFAnnotationNodes.as_view(), name="iiifannotationnodes"),
+    re_path(r"^manifest/(?P<id>[0-9]+)$", api.Manifest.as_view(), name="manifest"),
+    re_path(r"^image-service-manager", ManifestManagerView.as_view(), name="manifest_manager"),
+    re_path(r"^two-factor-authentication-settings", TwoFactorAuthenticationSettingsView.as_view(), name="two-factor-authentication-settings"),
+    re_path(r"^two-factor-authentication-login", TwoFactorAuthenticationLoginView.as_view(), name="two-factor-authentication-login"),
+    re_path(r"^two-factor-authentication-reset", TwoFactorAuthenticationResetView.as_view(), name="two-factor-authentication-reset"),
+    re_path(r"^etl-manager$", ETLManagerView.as_view(), name="etl_manager"),
+    re_path(r"^clear-user-permission-cache", ClearUserPermissionCache.as_view(), name="clear_user_permission_cache"),
+    re_path(r"^transform-edtf-for-tile", api.TransformEdtfForTile.as_view(), name="transform_edtf_for_tile"),
 ]
 
 if settings.DEBUG:
     try:
-        urlpatterns += [url("silk/", include("silk.urls", namespace="silk"))]
+        urlpatterns += [path("silk/", include("silk.urls", namespace="silk"))]
     except:
         pass

From a9d8e74c7f369dce2c8f4146ecffd5041c9c4d11 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 25 Jul 2023 16:49:25 -0400
Subject: [PATCH 03/24] Replace deprecated elastic search timeout param

---
 arches/install/arches-templates/project_name/settings.py-tpl | 2 +-
 arches/settings.py                                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arches/install/arches-templates/project_name/settings.py-tpl b/arches/install/arches-templates/project_name/settings.py-tpl
index 6a6a0a0dd0b..d774a8c4e64 100644
--- a/arches/install/arches-templates/project_name/settings.py-tpl
+++ b/arches/install/arches-templates/project_name/settings.py-tpl
@@ -54,7 +54,7 @@ DEBUG = True
 ROOT_URLCONF = '{{ project_name }}.urls'
 
 # Modify this line as needed for your project to connect to elasticsearch with a password that you generate
-ELASTICSEARCH_CONNECTION_OPTIONS = {"timeout": 30, "verify_certs": False, "basic_auth": ("elastic", "E1asticSearchforArche5")}
+ELASTICSEARCH_CONNECTION_OPTIONS = {"request_timeout": 30, "verify_certs": False, "basic_auth": ("elastic", "E1asticSearchforArche5")}
 
 # a prefix to append to all elasticsearch indexes, note: must be lower case
 ELASTICSEARCH_PREFIX = '{{ project_name }}'
diff --git a/arches/settings.py b/arches/settings.py
index 72c2a2a8fd9..4980cf1dbee 100644
--- a/arches/settings.py
+++ b/arches/settings.py
@@ -62,10 +62,10 @@
 ELASTICSEARCH_HOSTS = [{"scheme": "https", "host": "localhost", "port": ELASTICSEARCH_HTTP_PORT}]
 
 # Comment out this line for a development setup after running the ubuntu_setup.sh script
-ELASTICSEARCH_CONNECTION_OPTIONS = {"timeout": 30}
+ELASTICSEARCH_CONNECTION_OPTIONS = {"request_timeout": 30}
 
 # Uncomment this line for a development setup after running the ubuntu_setup.sh script (do not use in production)
-# ELASTICSEARCH_CONNECTION_OPTIONS = {"timeout": 30, "verify_certs": False, "basic_auth": ("elastic", "E1asticSearchforArche5")}
+# ELASTICSEARCH_CONNECTION_OPTIONS = {"request_timeout": 30, "verify_certs": False, "basic_auth": ("elastic", "E1asticSearchforArche5")}
 
 # a prefix to append to all elasticsearch indexes, note: must be lower case
 ELASTICSEARCH_PREFIX = "arches"

From c1e4979570b7fed0ba3d82f1fc1a60db997a699b Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 25 Jul 2023 17:19:28 -0400
Subject: [PATCH 04/24] Upgrade Django to 4.0.10

Update django-related dependencies to versions
supporting Django 4.0.
---
 arches/install/requirements.txt | 12 ++++++------
 pyproject.toml                  |  2 +-
 setup.py                        |  4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
index 20546ee1f43..98d833e997d 100644
--- a/arches/install/requirements.txt
+++ b/arches/install/requirements.txt
@@ -1,19 +1,19 @@
-Django==3.2.20
+Django==4.0.10
 psycopg2==2.9.6
 urllib3<2
 elasticsearch>=8.3.1,<9.0.0
 rdflib==4.2.2
-django-guardian==2.3.0
+django-guardian==2.4.0
 python-memcached==1.59
 celery==5.2.7
 django-celery-results==2.4.0
 mapbox-vector-tile==1.2.0
 SPARQLWrapper==1.8.5
-django-recaptcha==2.0.6
+django-recaptcha==3.0.0
 edtf==4.0.1
 arches-django-revproxy==0.10.0
-django-cors-headers==3.1.1
-django-oauth-toolkit==1.2.0
+django-cors-headers==3.12.0
+django-oauth-toolkit==1.6.3
 polib==1.1.1
 PyLD[requests]==1.0.5
 pyprind==2.11.3
@@ -28,7 +28,7 @@ arcgis2geojson==2.0.0
 openpyxl==3.0.7
 django_compressor==3.1
 django-libsass==0.9
-django-webpack-loader==1.5.0
+django-webpack-loader==1.6.0
 filetype==1.0.13
 defusedxml==0.7.1
 requests-oauthlib==1.3.1
diff --git a/pyproject.toml b/pyproject.toml
index 5ceb87bd523..446e92ed3a2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 140
-target-version = ['py37']
+target-version = ['py39']
 include = '\.pyi?$'
 exclude = '''
 /(
diff --git a/setup.py b/setup.py
index c8b8bbc5f73..536c975ed74 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,9 @@ def run(self):
         "Topic :: Software Development :: Build Tools",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.7",
-        "Framework :: Django :: 1.11",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Framework :: Django :: 4.0",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     ],
     # What does your project relate to?

From 5161c301d1c099a9f8cfb73b3da71080b76d2328 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Tue, 25 Jul 2023 17:23:43 -0400
Subject: [PATCH 05/24] Remove deprecated USE_L10N setting

---
 arches/settings.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arches/settings.py b/arches/settings.py
index 4980cf1dbee..3d61a3597e3 100644
--- a/arches/settings.py
+++ b/arches/settings.py
@@ -235,10 +235,6 @@
     os.path.join(ROOT_DIR, "locale"),
 ]
 
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
 # Sets default max upload size to 15MB
 DATA_UPLOAD_MAX_MEMORY_SIZE = 15728640
 

From eee606352eef98e1a69ceb74376c663cff504469 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Wed, 26 Jul 2023 18:04:25 -0400
Subject: [PATCH 06/24] Work around AttributeError for I18n_String* JSONExact
 lookups

---
 arches/app/models/fields/i18n.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arches/app/models/fields/i18n.py b/arches/app/models/fields/i18n.py
index fc3d6653d5c..04689919035 100644
--- a/arches/app/models/fields/i18n.py
+++ b/arches/app/models/fields/i18n.py
@@ -5,10 +5,13 @@
 from django.utils.translation import gettext_lazy as _
 from django.db.models import JSONField
 from django.db.models.sql.compiler import SQLInsertCompiler
+from django.db.models.sql.where import NothingNode
 from django.utils.translation import get_language
 
 
-class I18n_String(object):
+class I18n_String(NothingNode):
+    """Subclassing NothingNode works around https://code.djangoproject.com/ticket/34745."""
+
     def __init__(self, value=None, lang=None, use_nulls=False, attname=None):
         self.attname = attname
         self.value = value
@@ -213,7 +216,7 @@ def get_prep_value(self, value):
         return I18n_String(value, attname=self.attname, use_nulls=self.use_nulls)
 
 
-class I18n_JSON(object):
+class I18n_JSON(NothingNode):
     def __init__(self, value=None, lang=None, use_nulls=False, attname=None):
         self.attname = attname
         self.value = value

From 4cb1af0fe1ce53f175f217a9ce68ee74049f9a34 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 27 Jul 2023 10:33:09 -0400
Subject: [PATCH 07/24] Add mandatory algorithm value to oauth test setup

---
 tests/base_test.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/base_test.py b/tests/base_test.py
index 9db8b821832..72fe43ca7c1 100644
--- a/tests/base_test.py
+++ b/tests/base_test.py
@@ -29,7 +29,6 @@
 from django.db import connection
 from django.core import management
 from django.test.runner import DiscoverRunner
-from django.test.utils import teardown_databases as _teardown_databases
 from oauth2_provider.models import Application
 
 from arches.app.search.mappings import (
@@ -106,14 +105,19 @@ def setUpClass(cls):
             INSERT INTO public.oauth2_provider_application(
                 id, client_id, redirect_uris, client_type, authorization_grant_type,
                 client_secret,
-                name, user_id, skip_authorization, created, updated)
+                name, user_id, skip_authorization, created, updated, algorithm)
             VALUES (
                 44, '{oauth_client_id}', 'http://localhost:8000/test', 'public', 'client-credentials',
                 '{oauth_client_secret}',
-                'TEST APP', {user_id}, false, '1-1-2000', '1-1-2000');
+                'TEST APP', {user_id}, false, '1-1-2000', '1-1-2000', '{jwt_algorithm}');
         """
 
-        sql = sql.format(user_id=1, oauth_client_id=OAUTH_CLIENT_ID, oauth_client_secret=OAUTH_CLIENT_SECRET)
+        sql = sql.format(
+            user_id=1,
+            oauth_client_id=OAUTH_CLIENT_ID,
+            oauth_client_secret=OAUTH_CLIENT_SECRET,
+            jwt_algorithm=test_settings.JWT_ALGORITHM,
+        )
         cursor.execute(sql)
 
     @classmethod

From 996ef2c41d5d6069d228911902aa0f4ef4feb4cb Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 27 Jul 2023 11:10:26 -0400
Subject: [PATCH 08/24] Replace deprecated body param in es.search() calls

Refs https://github.com/elastic/elasticsearch-py/issues/1698

Also replace deprecated ignore param.
---
 arches/app/models/concept.py  | 2 +-
 arches/app/search/mappings.py | 6 +++---
 arches/app/search/search.py   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arches/app/models/concept.py b/arches/app/models/concept.py
index 4ce93ef3b8a..b3480f2ff24 100644
--- a/arches/app/models/concept.py
+++ b/arches/app/models/concept.py
@@ -1444,7 +1444,7 @@ def exact_val_match(val, conceptid=None):
                 }
             }
 
-    concept_label_results = se.search(index=CONCEPTS_INDEX, body=exact_val_match(label, conceptid))
+    concept_label_results = se.search(index=CONCEPTS_INDEX, **exact_val_match(label, conceptid))
     if concept_label_results is None:
         print("Found no matches for label:'{0}' and concept_id: '{1}'".format(label, conceptid))
         return
diff --git a/arches/app/search/mappings.py b/arches/app/search/mappings.py
index 464ed192d48..263357f973b 100644
--- a/arches/app/search/mappings.py
+++ b/arches/app/search/mappings.py
@@ -57,7 +57,7 @@ def prepare_terms_index(create=False):
 
     if create:
         se = SearchEngineFactory().create()
-        se.create_index(index=TERMS_INDEX, body=index_settings)
+        se.create_index(index=TERMS_INDEX, **index_settings)
 
     return index_settings
 
@@ -90,7 +90,7 @@ def prepare_concepts_index(create=False):
 
     if create:
         se = SearchEngineFactory().create()
-        se.create_index(index=CONCEPTS_INDEX, body=index_settings)
+        se.create_index(index=CONCEPTS_INDEX, **index_settings)
 
     return index_settings
 
@@ -253,7 +253,7 @@ def prepare_search_index(create=False):
 
     if create:
         se = SearchEngineFactory().create()
-        se.create_index(index=RESOURCES_INDEX, body=index_settings)
+        se.create_index(index=RESOURCES_INDEX, **index_settings)
 
     return index_settings
 
diff --git a/arches/app/search/search.py b/arches/app/search/search.py
index 088e4f39e69..6a485bb791c 100644
--- a/arches/app/search/search.py
+++ b/arches/app/search/search.py
@@ -161,11 +161,11 @@ def create_mapping(self, index, fieldname="", fieldtype="string", fieldindex=Non
 
         index = self._add_prefix(index)
         self.es.indices.create(index=index, ignore=400)
-        self.es.indices.put_mapping(index=index, body=body)
+        self.es.indices.put_mapping(index=index, **body)
 
     def create_index(self, **kwargs):
         kwargs = self._add_prefix(**kwargs)
-        self.es.indices.create(ignore=400, **kwargs)
+        self.es.options(ignore_status=400).indices.create(**kwargs)
         print("creating index : %s" % kwargs.get("index", ""))
 
     def index_data(self, index=None, body=None, idfield=None, id=None, **kwargs):
@@ -191,7 +191,7 @@ def index_data(self, index=None, body=None, idfield=None, id=None, **kwargs):
                     id = getattr(document, idfield)
 
             try:
-                self.es.index(index=index, body=document, id=id)
+                self.es.index(index=index, document=document, id=id)
             except Exception as detail:
                 self.logger.warning(
                     "%s: WARNING: failed to index document: %s \nException detail: %s\n" % (datetime.now(), document, detail)

From 8a1e6f109ae81477842e5f8cfb988636cc8c28ac Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 27 Jul 2023 11:43:16 -0400
Subject: [PATCH 09/24] Replace deprecated ignore param to es create()

Refs https://www.elastic.co/guide/en/elasticsearch/client/python-api/current/migration.html#migration-options
---
 arches/app/search/search.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arches/app/search/search.py b/arches/app/search/search.py
index 6a485bb791c..343d70ed085 100644
--- a/arches/app/search/search.py
+++ b/arches/app/search/search.py
@@ -102,7 +102,7 @@ def delete(self, **kwargs):
                     raise detail
         else:
             try:
-                return self.es.delete(ignore=[404], **kwargs)
+                return self.es.options(ignore_status=404).delete(**kwargs)
             except Exception as detail:
                 self.logger.warning("%s: WARNING: failed to delete document: %s \nException detail: %s\n" % (datetime.now(), body, detail))
                 raise detail
@@ -115,7 +115,7 @@ def delete_index(self, **kwargs):
 
         kwargs = self._add_prefix(**kwargs)
         print("deleting index : %s" % kwargs.get("index"))
-        return self.es.indices.delete(ignore=[400, 404], **kwargs)
+        return self.es.options(ignore_status=[400, 404]).indices.delete(**kwargs)
 
     def search(self, **kwargs):
         """
@@ -160,7 +160,7 @@ def create_mapping(self, index, fieldname="", fieldtype="string", fieldindex=Non
         """
 
         index = self._add_prefix(index)
-        self.es.indices.create(index=index, ignore=400)
+        self.es.options(ignore_status=400).indices.create(index=index)
         self.es.indices.put_mapping(index=index, **body)
 
     def create_index(self, **kwargs):

From 5bda792d094c596f51b02c9a508bc9c335bdf69a Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 27 Jul 2023 13:52:07 -0400
Subject: [PATCH 10/24] Replace deprecated assertEquals()

---
 tests/localization/po_file_tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/localization/po_file_tests.py b/tests/localization/po_file_tests.py
index 29ec8d3c2ae..7df5968c21c 100644
--- a/tests/localization/po_file_tests.py
+++ b/tests/localization/po_file_tests.py
@@ -39,7 +39,7 @@ def test_populate(self):
         CardXNodeXWidget.objects.all = m_all_method
         CardModel.objects.all = m_all_method
         writer.populate()
-        self.assertEquals(m_all_method.call_count, 2)
+        self.assertEqual(m_all_method.call_count, 2)
 
     def test_populate_from_card_x_node_x_widget(self):
         "Test to ensure PO Entries are appended with appropriate english messageids (no translations)"

From 4c4d68db6ddb57ea155feff30425401a999522f1 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 27 Jul 2023 14:30:23 -0400
Subject: [PATCH 11/24] Replace deprecated body argument to es.count()

---
 arches/app/search/base_index.py                |  4 ++--
 arches/app/search/elasticsearch_dsl_builder.py |  2 +-
 arches/app/search/search.py                    | 18 +++++++++++-------
 arches/app/utils/index_database.py             |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/arches/app/search/base_index.py b/arches/app/search/base_index.py
index 90d508ac7be..f6a4a06165d 100644
--- a/arches/app/search/base_index.py
+++ b/arches/app/search/base_index.py
@@ -84,7 +84,7 @@ def index_resources(self, resources=None, batch_size=settings.BULK_IMPORT_BATCH_
         start = datetime.now()
         q = Query(se=self.se)
         self.se.refresh(index=self.index_name)
-        count_before = self.se.count(index=self.index_name, body=q.dsl)
+        count_before = self.se.count(index=self.index_name, **q.dsl)
         result_summary = {"database": len(resources), "indexed": 0}
         if quiet is False:
             bar = pyprind.ProgBar(len(resources), bar_char="█") if len(resources) > 1 else None
@@ -98,7 +98,7 @@ def index_resources(self, resources=None, batch_size=settings.BULK_IMPORT_BATCH_
                     indexer.add(index=self.index_name, id=doc_id, data=document)
 
         self.se.refresh(index=self.index_name)
-        result_summary["indexed"] = self.se.count(index=self.index_name, body=q.dsl) - count_before
+        result_summary["indexed"] = self.se.count(index=self.index_name, **q.dsl) - count_before
         status = "Passed" if result_summary["database"] == result_summary["indexed"] else "Failed"
         print(f"Custom Index - {settings.ELASTICSEARCH_PREFIX}_{self.index_name}")
         print(
diff --git a/arches/app/search/elasticsearch_dsl_builder.py b/arches/app/search/elasticsearch_dsl_builder.py
index a179435b288..60ddbd8d693 100644
--- a/arches/app/search/elasticsearch_dsl_builder.py
+++ b/arches/app/search/elasticsearch_dsl_builder.py
@@ -98,7 +98,7 @@ def search(self, index="", **kwargs):
             return self.se.search(index=index, scroll=self.scroll, **self.dsl)
 
     def count(self, index="", **kwargs):
-        return self.se.count(index=index, body=self.dsl)
+        return self.se.count(index=index, **self.dsl)
 
     def delete(self, index="", **kwargs):
         return self.se.delete(index=index, body=self.dsl, **kwargs)
diff --git a/arches/app/search/search.py b/arches/app/search/search.py
index 343d70ed085..fef10ea23b0 100644
--- a/arches/app/search/search.py
+++ b/arches/app/search/search.py
@@ -209,13 +209,17 @@ def create_bulk_item(self, op_type="index", index=None, id=None, data=None):
 
     def count(self, **kwargs):
         kwargs = self._add_prefix(**kwargs)
-        body = kwargs.pop("body", None)
-
-        # need to only pass in the query key as other keys (eg: _source) are not allowed
-        if body:
-            query = body.pop("query", None)
-            if query:
-                kwargs["body"] = {"query": query}
+        query = kwargs.pop("query", None)
+
+        # need to only pass in the query and index keys
+        # as other keys (eg: _source) are not allowed
+        if query:
+            index = None
+            if 'index' in kwargs:
+                index = kwargs["index"]
+            kwargs = {"query": query}
+            if index:
+                kwargs["index"] = index
 
         count = self.es.count(**kwargs)
         if count is not None:
diff --git a/arches/app/utils/index_database.py b/arches/app/utils/index_database.py
index 2932e7ca983..332c4a55d1e 100644
--- a/arches/app/utils/index_database.py
+++ b/arches/app/utils/index_database.py
@@ -287,7 +287,7 @@ def index_resources_by_type(
         q = Query(se=se)
         term = Term(field="graph_id", term=str(resource_type))
         q.add_query(term)
-        result_summary = {"database": len(resources), "indexed": se.count(index=RESOURCES_INDEX, body=q.dsl)}
+        result_summary = {"database": len(resources), "indexed": se.count(index=RESOURCES_INDEX, **q.dsl)}
         status = "Passed" if result_summary["database"] == result_summary["indexed"] else "Failed"
         logger.info(
             "Status: {0}, Resource Type: {1}, In Database: {2}, Indexed: {3}, Took: {4} seconds".format(

From e59aba545475d74ab3f54e26c61d8f39363bdb6f Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 3 Aug 2023 10:26:31 -0400
Subject: [PATCH 12/24] Fix typos in README and CONTRIBUTING

---
 CONTRIBUTING.md | 2 +-
 README.md       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 689b6f68054..af4f7b89e5e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ If you find a bug in the source code or a mistake in the documentation, you can
 with a fix.
 
 #### Submitting an Issue
-Before you submit your issue search the archive, maybe your question was already answered. Please take a minute to search through the open issues in the repo, and if you find one that matches your own, feel free to comment and your thoughts.
+Before you submit your issue search the archive, maybe your question was already answered. Please take a minute to search through the open issues in the repo, and if you find one that matches your own, feel free to comment and add your thoughts.
 If your issue appears to be a bug, and hasn't been reported, open a new issue. Be sure to create your issue in the Arches repo and not a fork of Arches so that it is visible to the community.
 
 Please add the [appropriate labels](https://github.com/archesproject/arches/wiki/Issue-and-Pull-Request-Labels) to the issue (multiple labels are ok) to help us keep track of them.
diff --git a/README.md b/README.md
index a0ce7e2a52d..b4b6b91c329 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ to create a frontend asset bundle. This process should complete in less than 2 m
 
 Finally, visit `localhost:8000` in a browser (only Chrome is fully supported at this time).
 
-If you run into problems, please review our the full [installation documentation](http://arches.readthedocs.io/en/stable/installation/)
+If you run into problems, please review our full [installation documentation](http://arches.readthedocs.io/en/stable/installation/)
 
 #### Release Cycle
 

From 2482f034cbc1e0fec6eb1a814b8133b0a52a85d4 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 3 Aug 2023 10:59:01 -0400
Subject: [PATCH 13/24] Provide `get_response` arg to middleware in tests

---
 tests/views/auth_tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/views/auth_tests.py b/tests/views/auth_tests.py
index 29ba4f0d958..6f5aaa45a41 100644
--- a/tests/views/auth_tests.py
+++ b/tests/views/auth_tests.py
@@ -352,13 +352,13 @@ def apply_middleware(request):
 
 
 def save_session(request):
-    middleware = SessionMiddleware()
+    middleware = SessionMiddleware(request)
     middleware.process_request(request)
     request.session.save()
 
 
 def set_anonymous_user(request):
-    set_anon_middleware = SetAnonymousUser()
+    set_anon_middleware = SetAnonymousUser(request)
     set_anon_middleware.process_request(request)
 
 

From 7a9b939e365364d75f45aab950c483eaddf3f0e6 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 3 Aug 2023 11:07:47 -0400
Subject: [PATCH 14/24] Require Python 3.8+

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 536c975ed74..865a9382380 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@ def run(self):
     scripts=["arches/install/arches-project"],
     cmdclass={"install": post_install},
     install_requires=requirements,
+    python_requires=">=3.8",
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
         # How mature is this project? Common values are
@@ -46,9 +47,9 @@ def run(self):
         "Intended Audience :: Information Technology",
         "Topic :: Software Development :: Build Tools",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Framework :: Django :: 4.0",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     ],

From dc6b9226f84207d1727fb2ae68c1d200b66ddffb Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 3 Aug 2023 11:19:23 -0400
Subject: [PATCH 15/24] Replace deprecated logging.warn()

---
 arches/app/datatypes/concept_types.py              |  4 ++--
 arches/app/datatypes/url.py                        |  2 +-
 arches/app/etl_modules/base_import_module.py       |  2 +-
 arches/app/models/models.py                        |  2 +-
 arches/app/tasks.py                                |  8 ++++----
 .../data_management/resources/formats/csvfile.py   | 14 +++++++-------
 .../data_management/resources/formats/rdffile.py   |  2 +-
 arches/app/utils/decorators.py                     |  2 +-
 arches/app/utils/forms.py                          |  2 +-
 arches/app/views/manifest_manager.py               |  6 +++---
 arches/management/commands/packages.py             |  4 ++--
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/arches/app/datatypes/concept_types.py b/arches/app/datatypes/concept_types.py
index 42915e39023..f805fc77aaf 100644
--- a/arches/app/datatypes/concept_types.py
+++ b/arches/app/datatypes/concept_types.py
@@ -184,7 +184,7 @@ def transform_value_for_tile(self, value, **kwargs):
                 try:
                     value = self.lookup_labelid_from_label(value, kwargs)
                 except:
-                    logger.warn(_("Unable to convert {0} to concept label".format(value)))
+                    logger.warning(_("Unable to convert {0} to concept label".format(value)))
         return value
 
     def transform_export_values(self, value, *args, **kwargs):
@@ -328,7 +328,7 @@ def transform_value_for_tile(self, value, **kwargs):
                             ret.append(self.lookup_labelid_from_label(v, kwargs))
                         except:
                             ret.append(v)
-                            logger.warn(_("Unable to convert {0} to concept label".format(v)))
+                            logger.warning(_("Unable to convert {0} to concept label".format(v)))
         return ret
 
     def transform_export_values(self, value, *args, **kwargs):
diff --git a/arches/app/datatypes/url.py b/arches/app/datatypes/url.py
index 594c53610c8..c543be22a12 100644
--- a/arches/app/datatypes/url.py
+++ b/arches/app/datatypes/url.py
@@ -41,7 +41,7 @@
 try:
     default_url_widget = Widget.objects.get(name=default_widget_name)
 except Widget.DoesNotExist as e:
-    logger.warn("Setting 'url' datatype's default widget to None ({0} widget not found).".format(default_widget_name))
+    logger.warning("Setting 'url' datatype's default widget to None ({0} widget not found).".format(default_widget_name))
 
 details = {
     "datatype": "url",
diff --git a/arches/app/etl_modules/base_import_module.py b/arches/app/etl_modules/base_import_module.py
index 0e8842c8bb7..4ad513771c7 100644
--- a/arches/app/etl_modules/base_import_module.py
+++ b/arches/app/etl_modules/base_import_module.py
@@ -43,7 +43,7 @@ def reverse(self, request, **kwargs):
         except Exception as e:
             response["data"] = e
             logger.error(e)
-        logger.warn(response)
+        logger.warning(response)
         return response
 
     def save_to_tiles(self, loadid, finalize_import=True, multiprocessing=True):
diff --git a/arches/app/models/models.py b/arches/app/models/models.py
index 64544eaac68..8f7e87b3275 100644
--- a/arches/app/models/models.py
+++ b/arches/app/models/models.py
@@ -1519,7 +1519,7 @@ def send_email_on_save(sender, instance, **kwargs):
                 instance.save()
         except Exception as e:
             logger = logging.getLogger(__name__)
-            logger.warn("Email Server not correctly set up. See settings to configure.")
+            logger.warning("Email Server not correctly set up. See settings to configure.")
 
     return False
 
diff --git a/arches/app/tasks.py b/arches/app/tasks.py
index ef43d7c9d86..4fdd52fd1cc 100644
--- a/arches/app/tasks.py
+++ b/arches/app/tasks.py
@@ -176,7 +176,7 @@ def update_user_task_record(arg_dict={}):
 @shared_task
 def log_error(request, exc, traceback, msg=None):
     logger = logging.getLogger(__name__)
-    logger.warn(exc)
+    logger.warning(exc)
     try:
         task_obj = models.UserXTask.objects.get(taskid=request.id)
         task_obj.status = "ERROR"
@@ -192,8 +192,8 @@ def log_error(request, exc, traceback, msg=None):
 @shared_task
 def on_chord_error(request, exc, traceback):
     logger = logging.getLogger(__name__)
-    logger.warn(exc)
-    logger.warn(traceback)
+    logger.warning(exc)
+    logger.warning(traceback)
     msg = f"Package Load erred on import_business_data. Exception: {exc}. See logs for details."
     user = User.objects.get(id=1)
     notify_completion(msg, user)
@@ -285,7 +285,7 @@ def create_user_task_record(taskid, taskname, userid):
         new_task_record = models.UserXTask.objects.create(user=user, taskid=taskid, datestart=datetime.now(), name=taskname)
     except Exception as e:
         logger = logging.getLogger(__name__)
-        logger.warn(e)
+        logger.warning(e)
 
 
 def notify_completion(msg, user, notiftype_name=None, context=None):
diff --git a/arches/app/utils/data_management/resources/formats/csvfile.py b/arches/app/utils/data_management/resources/formats/csvfile.py
index 9abc5e38c7a..0a4c3c3166e 100644
--- a/arches/app/utils/data_management/resources/formats/csvfile.py
+++ b/arches/app/utils/data_management/resources/formats/csvfile.py
@@ -445,7 +445,7 @@ def save_resource(
                     save_count = save_count - 1
 
         else:
-            logger.warn(
+            logger.warning(
                 "No resource created for legacyid: {legacyid}. Make sure there is data to be imported \
                     for this resource and it is mapped properly in your mapping file."
             )
@@ -507,7 +507,7 @@ def get_display_nodes(graphid):
 
                 for k, v in f["descriptor_types"].items():
                     if "string_template" in v and v["string_template"] != [""]:
-                        logger.warn(
+                        logger.warning(
                             "The {0} {1} in the {2} display function.".format(
                                 ", ".join(v["string_template"]),
                                 "nodes participate" if len(v["string_template"]) > 1 else "node participates",
@@ -515,7 +515,7 @@ def get_display_nodes(graphid):
                             )
                         )
                     else:
-                        logger.warn("No nodes participate in the {0} display function.".format(k))
+                        logger.warning("No nodes participate in the {0} display function.".format(k))
 
             return display_nodeids
 
@@ -654,7 +654,7 @@ def create_reference_data(new_concepts, create_collections):
                                 collection_legacyoid = node.name + "_" + str(node.graph_id) + "_import"
                                 # check to see that there is not already a collection for this node
                                 if node.config["rdmCollection"] is not None:
-                                    logger.warn(
+                                    logger.warning(
                                         "A collection already exists for the {node.name} node. \
                                             Use the add option to add concepts to this collection."
                                     )
@@ -774,7 +774,7 @@ def column_names_to_targetids(row, mapping, row_number):
                     errors = []
                     new_row = []
                     if "ADDITIONAL" in row or "MISSING" in row:
-                        logger.warn(
+                        logger.warning(
                             "No resource created for ResourceID {0}. Line {1} has additional or missing columns.".format(
                                 row["ResourceID"], str(int(row_number.split("on line ")[1]))
                             )
@@ -812,7 +812,7 @@ def transform_value(datatype, value, source, nodeid):
                             value = datatype_instance.transform_value_for_tile(value, nodeid=nodeid)
                             errors = datatype_instance.validate(value, row_number=row_number, source=source, nodeid=nodeid)
                         except Exception as e:
-                            logger.warn(
+                            logger.warning(
                                 "The following value could not be interpreted as a {0} value: {1}".format(
                                     datatype_instance.datatype_model.classname, value
                                 )
@@ -1142,7 +1142,7 @@ def populate_child_tiles(source_data):
         finally:
             for e in self.errors:
                 if e["type"] == "WARNING":
-                    logger.warn(e["message"])
+                    logger.warning(e["message"])
                 elif e["type"] == "ERROR":
                     logger.error(e["message"])
                 else:
diff --git a/arches/app/utils/data_management/resources/formats/rdffile.py b/arches/app/utils/data_management/resources/formats/rdffile.py
index a56950e08e6..b3bbdfb6479 100644
--- a/arches/app/utils/data_management/resources/formats/rdffile.py
+++ b/arches/app/utils/data_management/resources/formats/rdffile.py
@@ -153,7 +153,7 @@ def add_edge_to_graph(graph, domainnode, rangenode, edge, tile, graph_info):
             # JSON-LD fails assert if domain node empty while range node has data. 
             # Unknown!=Undefined, but reasonable substitution to omit edge from null domain.
             if pkg["d_uri"] is None and pkg["range_tile_data"]:
-                self.logger.warn(_("Unable to return range value because domain is None, re https://github.com/archesproject/arches/pull/9783/files"))
+                self.logger.warning(_("Unable to return range value because domain is None, re https://github.com/archesproject/arches/pull/9783/files"))
                 return
 
             # FIXME:  Why is this not in datatype.to_rdf()
diff --git a/arches/app/utils/decorators.py b/arches/app/utils/decorators.py
index 008f57e09ac..22ee2c3e3d2 100644
--- a/arches/app/utils/decorators.py
+++ b/arches/app/utils/decorators.py
@@ -50,7 +50,7 @@ def new_func(*args, **kwargs):
             lineno=func.__code__.co_firstlineno + 1,
         )
         warnings.simplefilter("default", DeprecationWarning)  # reset filter
-        logger.warn(
+        logger.warning(
             "%s - DeprecationWarning: Call to deprecated function %s. %s:%s"
             % (datetime.datetime.now(), func.__name__, func.__code__.co_filename, func.__code__.co_firstlineno + 1)
         )
diff --git a/arches/app/utils/forms.py b/arches/app/utils/forms.py
index 63c10d5c52a..03f89813266 100644
--- a/arches/app/utils/forms.py
+++ b/arches/app/utils/forms.py
@@ -42,7 +42,7 @@ def __init__(self, *args, **kwargs):
                 self.fields["captcha"] = ReCaptchaField(attrs)
             except Exception as e:
                 logger = logging.getLogger(__name__)
-                logger.warn(e)
+                logger.warning(e)
 
     first_name = forms.CharField()
     last_name = forms.CharField()
diff --git a/arches/app/views/manifest_manager.py b/arches/app/views/manifest_manager.py
index 5d031d1f93e..3a323c129c3 100644
--- a/arches/app/views/manifest_manager.py
+++ b/arches/app/views/manifest_manager.py
@@ -216,7 +216,7 @@ def change_canvas_label(manifest, canvas_id, label):
                     canvas = create_canvas(image_json, file_url, os.path.splitext(f.name)[0], image_id)
                     canvases.append(canvas)
                 else:
-                    logger.warn("filetype unacceptable: " + f.name)
+                    logger.warning("filetype unacceptable: " + f.name)
 
             pres_dict = create_manifest(name=name, canvases=canvases)
             manifest = models.IIIFManifest.objects.create(label=name, description=desc, manifest=pres_dict)
@@ -257,7 +257,7 @@ def change_canvas_label(manifest, canvas_id, label):
                         canvas = create_canvas(image_json, file_url, os.path.splitext(f.name)[0], image_id)
                         canvases.append(canvas)
                     else:
-                        logger.warn("filetype unacceptable: " + f.name)
+                        logger.warning("filetype unacceptable: " + f.name)
                 add_canvases(manifest, canvases)
             except:
                 logger.warning("You have to select a manifest to add images")
@@ -273,7 +273,7 @@ def fetch(self, url):
             resp = requests.get(url)
             return resp.json()
         except:
-            logger.warn("Manifest not created. Check if Cantaloupe running")
+            logger.warning("Manifest not created. Check if Cantaloupe running")
             return None
 
     def on_import(self, tile):
diff --git a/arches/management/commands/packages.py b/arches/management/commands/packages.py
index d41c7217c0e..35a4945e9a5 100644
--- a/arches/management/commands/packages.py
+++ b/arches/management/commands/packages.py
@@ -597,8 +597,8 @@ def load_resource_to_resource_constraints(package_dir):
                             resource2resourceid=uuid.UUID(relationship["resource2resourceid"]),
                         )
                 except json.decoder.JSONDecodeError as e:
-                    logger.warn("Invalid syntax in package_config.json. Please inspect and then re-run command.")
-                    logger.warn(e)
+                    logger.warning("Invalid syntax in package_config.json. Please inspect and then re-run command.")
+                    logger.warning(e)
                     sys.exit()
 
         @transaction.atomic

From 608b014d1f34f1d20c270539f1bd4bef8335e741 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 3 Aug 2023 11:37:42 -0400
Subject: [PATCH 16/24] Upgrade Django to 4.1.10

Update django-related dependencies to versions
supporting Django 4.1.
---
 arches/install/requirements.txt | 12 ++++++------
 setup.py                        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
index 98d833e997d..3b7594f212a 100644
--- a/arches/install/requirements.txt
+++ b/arches/install/requirements.txt
@@ -1,4 +1,4 @@
-Django==4.0.10
+Django==4.1.10
 psycopg2==2.9.6
 urllib3<2
 elasticsearch>=8.3.1,<9.0.0
@@ -6,14 +6,14 @@ rdflib==4.2.2
 django-guardian==2.4.0
 python-memcached==1.59
 celery==5.2.7
-django-celery-results==2.4.0
+django-celery-results==2.5.1
 mapbox-vector-tile==1.2.0
 SPARQLWrapper==1.8.5
 django-recaptcha==3.0.0
 edtf==4.0.1
 arches-django-revproxy==0.10.0
-django-cors-headers==3.12.0
-django-oauth-toolkit==1.6.3
+django-cors-headers==4.2.0
+django-oauth-toolkit==1.7.0
 polib==1.1.1
 PyLD[requests]==1.0.5
 pyprind==2.11.3
@@ -26,9 +26,9 @@ python-slugify==7.0.0
 pillow>=7.0.0
 arcgis2geojson==2.0.0
 openpyxl==3.0.7
-django_compressor==3.1
+django_compressor==4.2
 django-libsass==0.9
-django-webpack-loader==1.6.0
+django-webpack-loader==1.8.0
 filetype==1.0.13
 defusedxml==0.7.1
 requests-oauthlib==1.3.1
diff --git a/setup.py b/setup.py
index 865a9382380..b58652dc559 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ def run(self):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
-        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     ],
     # What does your project relate to?

From 0bd3a3a43600b6378dce4d52e6a7b4673612dcee Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 3 Aug 2023 11:56:54 -0400
Subject: [PATCH 17/24] Upgrade Django to 4.2.4

Update django-related dependencies to versions
supporting Django 4.2.
---
 arches/install/requirements.txt | 6 +++---
 setup.py                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
index 3b7594f212a..f068222f7b3 100644
--- a/arches/install/requirements.txt
+++ b/arches/install/requirements.txt
@@ -1,4 +1,4 @@
-Django==4.1.10
+Django==4.2.4
 psycopg2==2.9.6
 urllib3<2
 elasticsearch>=8.3.1,<9.0.0
@@ -26,9 +26,9 @@ python-slugify==7.0.0
 pillow>=7.0.0
 arcgis2geojson==2.0.0
 openpyxl==3.0.7
-django_compressor==4.2
+django_compressor==4.4
 django-libsass==0.9
-django-webpack-loader==1.8.0
+django-webpack-loader==2.0.1
 filetype==1.0.13
 defusedxml==0.7.1
 requests-oauthlib==1.3.1
diff --git a/setup.py b/setup.py
index b58652dc559..e0d888b2008 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ def run(self):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
-        "Framework :: Django :: 4.1",
+        "Framework :: Django :: 4.2",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     ],
     # What does your project relate to?

From 8eec05ca9be0509f823ea3f669c0cf021739b641 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Thu, 3 Aug 2023 17:06:46 -0400
Subject: [PATCH 18/24] Undo short-circuiting in get_db_prep_save()

Refs https://github.com/django/django/pull/16297
---
 arches/app/models/fields/i18n.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arches/app/models/fields/i18n.py b/arches/app/models/fields/i18n.py
index 04689919035..64913cc0e8d 100644
--- a/arches/app/models/fields/i18n.py
+++ b/arches/app/models/fields/i18n.py
@@ -215,6 +215,11 @@ def get_prep_value(self, value):
 
         return I18n_String(value, attname=self.attname, use_nulls=self.use_nulls)
 
+    def get_db_prep_save(self, value, connection):
+        """Override to avoid the optimization from Django 4.2 that
+        immediately returns `value` if it is None."""
+        return self.get_db_prep_value(value, connection)
+
 
 class I18n_JSON(NothingNode):
     def __init__(self, value=None, lang=None, use_nulls=False, attname=None):
@@ -400,3 +405,8 @@ def get_prep_value(self, value):
         """
 
         return I18n_JSON(value, attname=self.attname)
+
+    def get_db_prep_save(self, value, connection):
+        """Override to avoid the optimization from Django 4.2 that
+        immediately returns `value` if it is None."""
+        return self.get_db_prep_value(value, connection)

From cdace467c6eacc273d26b8e22967a0cf54be8eec Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Wed, 16 Aug 2023 08:05:41 -0400
Subject: [PATCH 19/24] Add migration

---
 ...lter_graphmodel_functions_alter_icon_id.py | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 arches/app/models/migrations/9748_alter_graphmodel_functions_alter_icon_id.py

diff --git a/arches/app/models/migrations/9748_alter_graphmodel_functions_alter_icon_id.py b/arches/app/models/migrations/9748_alter_graphmodel_functions_alter_icon_id.py
new file mode 100644
index 00000000000..d44cf40bd6f
--- /dev/null
+++ b/arches/app/models/migrations/9748_alter_graphmodel_functions_alter_icon_id.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.4 on 2023-08-16 07:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('models', '9747_alter_maplayer_options'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='graphmodel',
+            name='functions',
+            field=models.ManyToManyField(through='models.FunctionXGraph', to='models.function'),
+        ),
+        migrations.AlterField(
+            model_name='icon',
+            name='id',
+            field=models.AutoField(primary_key=True, serialize=False),
+        ),
+    ]

From 5dcbacdbd87a3148263db74bbe05884b002a5ec8 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Wed, 16 Aug 2023 08:53:26 -0400
Subject: [PATCH 20/24] Add upgrade instructions

---
 releases/7.5.0.md | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/releases/7.5.0.md b/releases/7.5.0.md
index 6420132012d..265540cae78 100644
--- a/releases/7.5.0.md
+++ b/releases/7.5.0.md
@@ -11,10 +11,22 @@ Arches 7.5.0 release notes
 ```
 Python:
     Upgraded:
+        Django 3.2.20 > 4.2.4
+        django-celery-results 2.4.0 > 2.5.1
+        django-compressor 3.1 > 4.4
+        django-cors-headers 3.1.1 > 4.2.0
+        django-guardian 2.3.0 > 2.4.0
+        django-recaptcha 2.0.6 > 3.0.0
+        django-oauth-toolkit 1.2.0 > 1.7.0
+        django-webpack-loader 1.5.0 > 2.0.1
 
     Added:
 
     Removed:
+        (dev dependencies):
+            webtest
+            django-webtest
+            django-nose
 
 JavaScript:
     Upgraded:
@@ -36,20 +48,33 @@ None
     pip install --upgrade arches==7.5.0
     ```
 
+4. Uninstall mooted dev dependencies:
+    ```
+    pip uninstall webtest
+    pip uninstall django-webtest
+    pip uninstall django-nose
+    ```
+
 ### Upgrading an Arches project
 
+1. In urls.py, replace each `django.conf.urls.url()` call with `django.urls.re_path()` if it uses a regular expression, or `django.urls.path()` if it does not.
+
+2. Replace any calls to `django.utils.translation.ugettext()` with `django.utils.translation.gettext()`.
+
+3. In settings.py (or settings_local.py, etc.), remove `USE_L10N`.
 
-1. Within your project, with your Python 3 virtual environment activated:
+4. Within your project, with your Python 3 virtual environment activated:
     ```
+    python manage.py makemigrations  # commit the result
     python manage.py migrate
     ```
 
-2. Reindex your database:
+5. Reindex your database:
    ```
    python manage.py es reindex_database
    ```
 
-3. Update the JavaScript dependencies and devDependencies
+6. Update the JavaScript dependencies and devDependencies
     In the project's `package.json` file from `stable/7.4.0` to `stable/7.5.0`:
     ```    
     {
@@ -61,18 +86,18 @@ None
         }
     ```
 
-4. Start your application server in a separate terminal if it's not alreay running.
+7. Start your application server in a separate terminal if it's not already running.
 
-5. In the same terminal window where you ran `yarn` ( on the same level as `package.json` ), run `yarn start` or `yarn build_development`. This will generate your `media/build` directory.
+8. In the same terminal window where you ran `yarn` ( on the same level as `package.json` ), run `yarn start` or `yarn build_development`. This will generate your `media/build` directory.
    - If running your project in development:
      -  `yarn start` will build the frontend of the application and then start a webpack development server
       - `yarn build_development` will build a development bundle for the frontend assests of the application -- this should complete in less than 2 minutes
     - If running your project in production:
       - `yarn build_production` This builds a production bundle. **takes up to 2hrs depending on resources**
-      - Alternatively you can `cd ..` up a directory and run `python manage.py build_production`. This will create a production bundle of frontend assessts and also call `collectstatic`.
+      - Alternatively you can `cd ..` up a directory and run `python manage.py build_production`. This will create a production bundle of frontend assets and also call `collectstatic`.
   
 
-6. If you are running Arches on Apache, be sure to run:
+9. If you are running Arches on Apache, be sure to run:
 
     ```
     collectstatic

From f234f65e078663a49501380899f41cc980c2f562 Mon Sep 17 00:00:00 2001
From: Alexei Peters <apeters@fargeo.com>
Date: Fri, 18 Aug 2023 17:08:51 -0700
Subject: [PATCH 21/24] nit, re #9799

---
 arches/app/search/base_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/search/base_index.py b/arches/app/search/base_index.py
index f6a4a06165d..7b6b25c3843 100644
--- a/arches/app/search/base_index.py
+++ b/arches/app/search/base_index.py
@@ -32,7 +32,7 @@ def prepare_index(self):
         """
 
         if self.index_metadata is not None:
-            self.se.create_index(index=self.index_name, body=self.index_metadata)
+            self.se.create_index(index=self.index_name, **self.index_metadata)
         else:
             raise SearchIndexError("No index metadata defined.")
 

From ce54b6f80c98136402dfb91053d9e9fde5373dbb Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Fri, 18 Aug 2023 20:35:41 -0400
Subject: [PATCH 22/24] Review comments

---
 arches/app/datatypes/datatypes.py              | 1 -
 arches/app/search/elasticsearch_dsl_builder.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/arches/app/datatypes/datatypes.py b/arches/app/datatypes/datatypes.py
index b5a575d1a1b..cbc606e4ac5 100644
--- a/arches/app/datatypes/datatypes.py
+++ b/arches/app/datatypes/datatypes.py
@@ -48,7 +48,6 @@
 from django.core.files import File
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage, default_storage
-from django.utils.translation import gettext as _
 from django.contrib.gis.geos import GEOSGeometry
 from django.contrib.gis.geos import GeometryCollection
 from django.contrib.gis.geos import fromstr
diff --git a/arches/app/search/elasticsearch_dsl_builder.py b/arches/app/search/elasticsearch_dsl_builder.py
index 60ddbd8d693..365828c8a9f 100644
--- a/arches/app/search/elasticsearch_dsl_builder.py
+++ b/arches/app/search/elasticsearch_dsl_builder.py
@@ -101,7 +101,7 @@ def count(self, index="", **kwargs):
         return self.se.count(index=index, **self.dsl)
 
     def delete(self, index="", **kwargs):
-        return self.se.delete(index=index, body=self.dsl, **kwargs)
+        return self.se.delete(index=index, **self.dsl, **kwargs)
 
     def prepare(self, scroll=False):
         if self.scroll is None:

From 48c8c291b6483c18e29bb3f66872d663e0c844b7 Mon Sep 17 00:00:00 2001
From: Alexei Peters <apeters@fargeo.com>
Date: Fri, 18 Aug 2023 18:30:21 -0700
Subject: [PATCH 23/24] fix broken test, re #9799

---
 arches/app/search/elasticsearch_dsl_builder.py |  2 +-
 arches/app/search/search.py                    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arches/app/search/elasticsearch_dsl_builder.py b/arches/app/search/elasticsearch_dsl_builder.py
index 365828c8a9f..8cf03e6af59 100644
--- a/arches/app/search/elasticsearch_dsl_builder.py
+++ b/arches/app/search/elasticsearch_dsl_builder.py
@@ -101,7 +101,7 @@ def count(self, index="", **kwargs):
         return self.se.count(index=index, **self.dsl)
 
     def delete(self, index="", **kwargs):
-        return self.se.delete(index=index, **self.dsl, **kwargs)
+        return self.se.delete(index=index, query=self.dsl, **kwargs)
 
     def prepare(self, scroll=False):
         if self.scroll is None:
diff --git a/arches/app/search/search.py b/arches/app/search/search.py
index fef10ea23b0..0a7861cf423 100644
--- a/arches/app/search/search.py
+++ b/arches/app/search/search.py
@@ -72,12 +72,12 @@ def delete(self, **kwargs):
         """
 
         kwargs = self._add_prefix(**kwargs)
-        body = kwargs.pop("body", None)
-        if body is not None:
+        query = kwargs.pop("query", None)
+        if query is not None:
             try:
                 data = []
                 refresh = kwargs.pop("refresh", False)
-                for hit in helpers.scan(self.es, query=body, **kwargs):
+                for hit in helpers.scan(self.es, query=query, **kwargs):
                     hit["_op_type"] = "delete"
                     data.append(hit)
 
@@ -97,14 +97,14 @@ def delete(self, **kwargs):
                         pass
                 except:
                     self.logger.warning(
-                        "%s: WARNING: failed to delete document by query: %s \nException detail: %s\n" % (datetime.now(), body, detail)
+                        "%s: WARNING: failed to delete document by query: %s \nException detail: %s\n" % (datetime.now(), query, detail)
                     )
                     raise detail
         else:
             try:
                 return self.es.options(ignore_status=404).delete(**kwargs)
             except Exception as detail:
-                self.logger.warning("%s: WARNING: failed to delete document: %s \nException detail: %s\n" % (datetime.now(), body, detail))
+                self.logger.warning("%s: WARNING: failed to delete document: %s \nException detail: %s\n" % (datetime.now(), kwargs, detail))
                 raise detail
 
     def delete_index(self, **kwargs):

From f0ca8bb8d98478395433bc2d61ef0c07566b9a94 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Mon, 21 Aug 2023 10:34:18 -0400
Subject: [PATCH 24/24] nit re #9799

---
 arches/app/search/mappings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/search/mappings.py b/arches/app/search/mappings.py
index 263357f973b..5a2eb5dd529 100644
--- a/arches/app/search/mappings.py
+++ b/arches/app/search/mappings.py
@@ -292,7 +292,7 @@ def prepare_resource_relations_index(create=False):
 
     if create:
         se = SearchEngineFactory().create()
-        se.create_index(index=RESOURCE_RELATIONS_INDEX, body=index_settings)
+        se.create_index(index=RESOURCE_RELATIONS_INDEX, **index_settings)
 
     return index_settings