Merge pull request #1946 from dandi/bf-django-storage

In 1.14.3 it became client_config and .config was announced deprecated
dandi · May 24, 2024 · 288b854 · 288b854
2 parents 488fd02 + 0b34695
commit 288b854
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dandiapi/api/storage.py b/dandiapi/api/storage.py
@@ -155,7 +155,7 @@ class TimeoutS3Storage(S3Storage):
     def __init__(self, **settings):
         super().__init__(**settings)
 
-        self.config = self.config.merge(
+        self.client_config = self.client_config.merge(
             Config(connect_timeout=5, read_timeout=5, retries={'max_attempts': 2})
         )
 

diff --git a/setup.py b/setup.py
@@ -67,7 +67,7 @@
         # Production-only
         'django-composed-configuration[prod]>=0.23.0',
         'django-s3-file-field[s3]>=1.0.0',
-        'django-storages[s3]>=1.14.2',
+        'django-storages[s3]>=1.14.3',
         'gunicorn',
         # Development-only, but required
         'django-minio-storage',