Merge pull request #908 from ImageMarkup/upgrade-django-storage

Upgrade django-storages

isic/core/storages/s3.py

@@ -1,20 +1,12 @@
 from datetime import UTC, datetime, timedelta
 from urllib.parse import urlencode
 
-from botocore.config import Config
 from django.utils.encoding import filepath_to_uri
 from storages.backends.s3 import S3Storage
 from storages.utils import clean_name
 
 
 class CacheableCloudFrontStorage(S3Storage):
-    def __init__(self, **settings):
-        super().__init__(**settings)
-
-        self.config = self.config.merge(
-            Config(connect_timeout=5, read_timeout=10, retries={"max_attempts": 5})
-        )
-
     @staticmethod
     def next_expiration_time(now=None):
         # returns a time > 6 days but <= 7.

isic/settings.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 from pathlib import Path
 
+from botocore.config import Config
 from composed_configuration import (
     ComposedConfiguration,
     ConfigMixin,
@@ -244,6 +245,8 @@ class HerokuProductionConfiguration(IsicMixin, HerokuProductionBaseConfiguration
 
     AWS_S3_OBJECT_PARAMETERS = {"ContentDisposition": "attachment"}
 
+    AWS_S3_CLIENT_CONFIG = Config(connect_timeout=5, read_timeout=10, retries={"max_attempts": 5})
+
     AWS_S3_FILE_BUFFER_SIZE = 50 * 1024 * 1024  # 50MB
 
     SENTRY_TRACES_SAMPLE_RATE = 0.01  # sample 1% of requests for performance monitoring

setup.py

@@ -57,7 +57,7 @@
         "django-oauth-toolkit<2.0.0",
         "django-object-actions",
         "django-spurl",
-        "django-storages==1.14.2",
+        "django-storages>1.14.2",
         "django-widget-tweaks",
         "google-analytics-data",
         "hashids",