Skip to content

Commit b6a8565

Browse files
[Dependencies] Migrate to Django 5.2 (#670)
* dependecies: upgrade django framework to version 5.2 * storage: use new MinioException * import: use logging * remove deprecated setting USE_L10N See https://docs.djangoproject.com/en/5.2/releases/5.0/#features-removed-in-5-0
1 parent 716fc31 commit b6a8565

6 files changed

Lines changed: 660 additions & 513 deletions

File tree

Pipfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ name = "pypi"
77
androguard = "==4.1.1"
88
beautifulsoup4 = "~=4.10"
99
celery = "~=5.2.3"
10-
django = "==3.2.25"
11-
django-celery-beat = "~=2.2.1"
12-
django-environ = "~=0.9.0"
13-
django-eventlog = "==1.1"
14-
django-minio-storage = "~=0.3.10"
15-
djangorestframework = "~=3.13.1"
10+
django = "==5.2.5"
11+
django-celery-beat = "~=2.8.1"
12+
django-environ = "~=0.12.0"
13+
django-eventlog = "==2.2"
14+
django-minio-storage = "~=0.5.8"
15+
djangorestframework = "~=3.16.1"
1616
exodus-core = "==1.3.13"
1717
google-play-scraper = "~=1.2.2"
1818
gunicorn = "~=23.0"

Pipfile.lock

Lines changed: 635 additions & 484 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exodus/exodus/core/static_analysis.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from django.conf import settings
1616
from google_play_scraper import app as google_app
17-
from minio.error import (ResponseError)
17+
from minio.error import MinioException
1818

1919
from exodus_core.analysis.static_analysis import StaticAnalysis as CoreSA
2020
from exodus.core.storage import RemoteStorageHelper
@@ -53,8 +53,8 @@ def get_icon_and_phash(self, storage, icon_name, source):
5353

5454
try:
5555
storage.put_file(f.name, icon_name)
56-
except ResponseError as err:
57-
logging.info(err)
56+
except MinioException:
57+
logging.exception(f"An error occured while putting the file '{f.name}' in storage")
5858
return None
5959

6060
icon_phash = self.get_phash(f.name)
@@ -181,8 +181,8 @@ def download_fdroid_apk(storage, handle, tmp_dir, apk_name, apk_tmp):
181181
try:
182182
storage.put_file(apk_tmp, apk_name)
183183
return True
184-
except ResponseError as err:
185-
logging.error(err)
184+
except MinioException:
185+
logging.exception(f"An error occured while storing new apk '{apk_name}'")
186186
return False
187187
else:
188188
return False
@@ -224,8 +224,8 @@ def download_google_apk(storage, handle, tmp_dir, apk_name, apk_tmp):
224224
try:
225225
storage.put_file(apk_tmp, apk_name)
226226
return True
227-
except ResponseError as err:
228-
logging.error(err)
227+
except MinioException:
228+
logging.error(f"An error occured while storing new apk '{apk_name}'")
229229
return False
230230

231231
return False

exodus/exodus/core/storage.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from IPython.core.magics import logging
1+
import logging
22
from django.conf import settings
33
from minio import Minio
4-
from minio.error import (ResponseError, BucketAlreadyOwnedByYou, BucketAlreadyExists)
4+
from minio.error import MinioException
55

66

77
class RemoteStorageHelper():
@@ -15,9 +15,8 @@ def __init__(self, prefix=''):
1515
# Create Minio storage if needed
1616
try:
1717
self.minio_client.make_bucket(settings.MINIO_STORAGE_MEDIA_BUCKET_NAME, location="")
18-
except BucketAlreadyOwnedByYou:
19-
pass
20-
except BucketAlreadyExists:
18+
except MinioException:
19+
logging.error(f"An error occured while creating new bucket '{settings.MINIO_STORAGE_MEDIA_BUCKET_NAME}'")
2120
pass
2221

2322
def get_prefix(self):
@@ -38,8 +37,8 @@ def clear_prefix(self, prefix=None):
3837
)
3938
for obj in objects:
4039
self.minio_client.remove_object(settings.MINIO_STORAGE_MEDIA_BUCKET_NAME, obj.object_name)
41-
except ResponseError as err:
42-
logging.info(err)
40+
except MinioException:
41+
logging.exception(f"An error occured with MinIO while clearing prefix '{ prefix }'")
4342

4443
def put_file(self, local_path, remote_name):
4544
"""
@@ -76,8 +75,8 @@ def download_and_put(self, url, remote_name):
7675
fp.write(f.read())
7776
try:
7877
self.minio_client.fput_object(settings.MINIO_STORAGE_MEDIA_BUCKET_NAME, remote_name, fp.name)
79-
except ResponseError as err:
80-
logging.info(err)
78+
except MinioException:
79+
logging.exception(f"An error occured while storing {fp.name} to {remote_name}")
8180
return ''
8281
return remote_name
8382
except Exception as e:

exodus/exodus/settings/base.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@
133133

134134
USE_I18N = True
135135

136-
USE_L10N = True
137-
138136
USE_TZ = True
139137

140138
# File storage

exodus/reports/models.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
from __future__ import unicode_literals
33

44
import json
5+
import logging
56

67
from django.conf import settings
78
from django.db import models
89
from django.db.models.signals import post_delete
910
from django.dispatch import receiver
1011
from minio import Minio
11-
from minio.error import (ResponseError, NoSuchBucket)
12+
from minio.error import MinioException
1213

1314
from django.utils import translation
1415
from trackers.models import Tracker
@@ -229,7 +230,5 @@ def remove_report_files(sender, instance, using, **kwargs):
229230
recursive=True)
230231
for obj in objects:
231232
minio_client.remove_object(settings.MINIO_STORAGE_MEDIA_BUCKET_NAME, obj.object_name)
232-
except ResponseError as err:
233-
print(err)
234-
except NoSuchBucket as err:
235-
print(err)
233+
except MinioException:
234+
logging.exception("An error occured while removing report files")

0 commit comments

Comments
 (0)