Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

In 1.14.3 it became client_config and .config was announced deprecated #1946

Merged
merged 1 commit into from
May 24, 2024
Merged

In 1.14.3 it became client_config and .config was announced deprecated #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dandiapi/api/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to note for future reference - I think in this case, a better approach would have been to pin this to the older version, i.e.
'django-storages[s3]==1.14.2',. In cases where we're unsure about a dependancy upgrade, we usually do that and add a TODO comment to look into it in the future.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, i had it in mind too and agree it would have been safer, but given that we have already lots of things to be developed,

❯ git grep TODO | wc -l
69

and looking at the django-storages code decided that it was safe enough.

'gunicorn',
# Development-only, but required
'django-minio-storage',
Expand Down