Merge pull request #2569 from onaio/update-app-dependencies

Security Remediations
onaio · Mar 19, 2024 · 112304e · 112304e
2 parents 7d39096 + 0d730f9
commit 112304e
Show file tree

Hide file tree

Showing 13 changed files with 335 additions and 290 deletions.
diff --git a/onadata/apps/api/viewsets/submission_review_viewset.py b/onadata/apps/api/viewsets/submission_review_viewset.py
@@ -36,7 +36,7 @@ class SubmissionReviewViewSet(AuthenticateHeaderMixin, CacheControlMixin,
     serializer_class = SubmissionReviewSerializer
     permission_classes = [SubmissionReviewPermissions]
     filter_backends = (DjangoFilterBackend, )
-    filter_fields = ('instance', 'created_by', 'status')
+    filterset_fields = ('instance', 'created_by', 'status')
 
     def destroy(self, request, *args, **kwargs):
         """

diff --git a/onadata/apps/api/viewsets/xform_list_viewset.py b/onadata/apps/api/viewsets/xform_list_viewset.py
@@ -52,7 +52,7 @@ class XFormListViewSet(ETagsMixin, BaseViewset, viewsets.ReadOnlyModelViewSet):
         TokenAuthentication,
     )
     content_negotiation_class = MediaFileContentNegotiation
-    filter_class = filters.FormIDFilter
+    filterset_class = filters.FormIDFilter
     filter_backends = (
         filters.XFormListObjectPermissionFilter,
         filters.XFormListXFormPKFilter,

diff --git a/onadata/apps/api/viewsets/xform_viewset.py b/onadata/apps/api/viewsets/xform_viewset.py
@@ -323,7 +323,7 @@ class XFormViewSet(
         filters.XFormOwnerFilter,
         DjangoFilterBackend,
     )
-    filter_fields = ("instances_with_osm",)
+    filterset_fields = ("instances_with_osm",)
 
     public_forms_endpoint = "public"
 

diff --git a/onadata/libs/test_utils/pyxform_test_case.py b/onadata/libs/test_utils/pyxform_test_case.py
@@ -45,7 +45,7 @@ class MatcherContext:
 
     debug: bool
     nsmap_xpath: "Dict[str, str]"
-    nsmap_subs: "NSMAPSubs"
+    nsmap_subs: "NSMAPSubs"  # noqa: F821
     content_str: str
 
 
@@ -545,7 +545,7 @@ def reorder_attributes(root):
 
 
 def xpath_clean_result_strings(
-    nsmap_subs: "NSMAPSubs", results: "Set[_Element]"
+    nsmap_subs: "NSMAPSubs", results: "Set[_Element]"  # noqa: F821
 ) -> "Set[str]":
     """
     Clean XPath results: stringify, remove namespace declarations, clean up whitespace.

diff --git a/requirements/azure.in b/requirements/azure.in
@@ -1,3 +1,3 @@
 django-storages[azure]
 cryptography>=39.0.1
-django >=3.2.23,<4
+django >=3.2.25,<4
diff --git a/requirements/azure.pip b/requirements/azure.pip
@@ -1,38 +1,40 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile --output-file=requirements/azure.pip requirements/azure.in
 #
 asgiref==3.7.2
     # via django
-azure-core==1.29.0
-    # via azure-storage-blob
-azure-storage-blob==12.17.0
+azure-core==1.30.1
+    # via
+    #   azure-storage-blob
+    #   django-storages
+azure-storage-blob==12.19.1
     # via django-storages
-certifi==2023.7.22
+certifi==2024.2.2
     # via requests
-cffi==1.15.1
+cffi==1.16.0
     # via cryptography
-charset-normalizer==3.2.0
+charset-normalizer==3.3.2
     # via requests
-cryptography==41.0.3
+cryptography==42.0.5
     # via
     #   -r requirements/azure.in
     #   azure-storage-blob
-django==3.2.23
+django==3.2.25
     # via
     #   -r requirements/azure.in
     #   django-storages
-django-storages[azure]==1.13.2
+django-storages[azure]==1.14.2
     # via -r requirements/azure.in
-idna==3.4
+idna==3.6
     # via requests
 isodate==0.6.1
     # via azure-storage-blob
 pycparser==2.21
     # via cffi
-pytz==2023.3
+pytz==2024.1
     # via django
 requests==2.31.0
     # via azure-core
@@ -42,10 +44,10 @@ six==1.16.0
     #   isodate
 sqlparse==0.4.4
     # via django
-typing-extensions==4.7.1
+typing-extensions==4.10.0
     # via
     #   asgiref
     #   azure-core
     #   azure-storage-blob
-urllib3==2.0.4
+urllib3==2.2.1
     # via requests