Merge pull request #927 from kobotoolbox/django-4.2.15

Update Django to 4.2.15
kobotoolbox · Aug 8, 2024 · 7dc25a1 · 7dc25a1
2 parents 79ac8e0 + 2a2b718
commit 7dc25a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 36 deletions.
diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile dependencies/pip/dev_requirements.in
@@ -32,15 +32,6 @@ azure-storage-blob==12.19.1
     # via django-storages
 backcall==0.2.0
     # via ipython
-backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
-    # via
-    #   -r dependencies/pip/requirements.in
-    #   celery
-    #   django
-    #   django-celery-beat
-    #   django-timezone-field
-    #   kombu
-    #   psycopg
 billiard==4.2.0
     # via celery
 boto3==1.34.62
@@ -90,7 +81,7 @@ defusedxml==0.7.1
     #   pyxform
 dict2xml==1.7.5
     # via -r dependencies/pip/requirements.in
-django==4.2.11
+django==4.2.15
     # via
     #   -r dependencies/pip/requirements.in
     #   django-celery-beat
@@ -185,8 +176,6 @@ httmock==1.4.0
     # via -r dependencies/pip/dev_requirements.in
 idna==3.6
     # via requests
-importlib-metadata==7.0.2
-    # via markdown
 iniconfig==2.0.0
     # via pytest
 ipdb==0.13.13
@@ -341,13 +330,10 @@ typing-extensions==4.10.0
     #   asgiref
     #   azure-core
     #   azure-storage-blob
-    #   ipython
     #   jwcrypto
-    #   kombu
     #   psycopg
 tzdata==2024.1
     # via
-    #   backports-zoneinfo
     #   celery
     #   django-celery-beat
     #   pandas
@@ -371,6 +357,4 @@ xlrd==2.0.1
     # via pyxform
 xlwt==1.3.0
     # via -r dependencies/pip/requirements.in
-zipp==3.18.0
-    # via importlib-metadata
 backports-zoneinfo==0.2.1; python_version < '3.9'
diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile dependencies/pip/requirements.in
@@ -28,15 +28,6 @@ azure-core==1.30.1
     #   django-storages
 azure-storage-blob==12.19.1
     # via django-storages
-backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
-    # via
-    #   -r dependencies/pip/requirements.in
-    #   celery
-    #   django
-    #   django-celery-beat
-    #   django-timezone-field
-    #   kombu
-    #   psycopg
 billiard==4.2.0
     # via celery
 boto3==1.34.62
@@ -82,7 +73,7 @@ defusedxml==0.7.1
     #   pyxform
 dict2xml==1.7.5
     # via -r dependencies/pip/requirements.in
-django==4.2.11
+django==4.2.15
     # via
     #   -r dependencies/pip/requirements.in
     #   django-celery-beat
@@ -171,8 +162,6 @@ gdata-python3==3.0.1
     # via -r dependencies/pip/requirements.in
 idna==3.6
     # via requests
-importlib-metadata==7.0.2
-    # via markdown
 isodate==0.6.1
     # via azure-storage-blob
 jmespath==1.0.1
@@ -264,11 +253,9 @@ typing-extensions==4.10.0
     #   azure-core
     #   azure-storage-blob
     #   jwcrypto
-    #   kombu
     #   psycopg
 tzdata==2024.1
     # via
-    #   backports-zoneinfo
     #   celery
     #   django-celery-beat
     #   pandas
@@ -292,6 +279,4 @@ xlrd==2.0.1
     # via pyxform
 xlwt==1.3.0
     # via -r dependencies/pip/requirements.in
-zipp==3.18.0
-    # via importlib-metadata
 backports-zoneinfo==0.2.1; python_version < '3.9'
diff --git a/onadata/libs/utils/image_tools.py b/onadata/libs/utils/image_tools.py
@@ -73,7 +73,7 @@ def resize(filename):
     if is_local:
         path = default_storage.path(filename)
         image = Image.open(path)
-        original_path = path
+        original_path = filename
     else:
         path = default_storage.url(filename)
         original_path = filename