Skip to content

Commit

Permalink
Pin django-storages to 1.14.3
Browse files Browse the repository at this point in the history
[noissue]
  • Loading branch information
gerrod3 authored and ggainey committed May 10, 2024
1 parent 790b410 commit d773878
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions pulpcore/app/serializers/domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class SFTPSettingsSerializer(BaseSettingsClass):
# 'sftp_known_host_file': 'known_host_file', # This is dangerous to allow to be set
"sftp_storage_root": "root_path",
"media_url": "base_url",
"sftp_base_url": "base_url",
}

host = serializers.CharField(required=True)
Expand Down Expand Up @@ -180,6 +181,7 @@ class AmazonS3SettingsSerializer(BaseSettingsClass):
"aws_default_acl": "default_acl",
"aws_s3_use_threads": "use_threads",
"aws_s3_transfer_config": "transfer_config",
"aws_s3_client_config": "client_config",
}

access_key = serializers.CharField(required=True, write_only=True)
Expand Down Expand Up @@ -213,6 +215,8 @@ class AmazonS3SettingsSerializer(BaseSettingsClass):
default_acl = serializers.CharField(allow_null=True, default=None)
use_threads = serializers.BooleanField(default=True)
transfer_config = TransferConfigSerializer(allow_null=True, default=None)
# TODO: Add a botocore.Config serializer to allow specifying this field from json
client_config = serializers.HiddenField(default=None)

def validate_verify(self, value):
"""Verify can **only** be None or False. None=verify ssl."""
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
python_requires=">=3.9",
install_requires=requirements,
extras_require={
"sftp": ["django-storages[sftp]<=1.14.2"],
"s3": ["django-storages[boto3]~=1.14.2"],
"google": ["django-storages[google]>=1.13.2,<=1.14.2"],
"azure": ["django-storages[azure]>=1.12.2,<=1.14.2"],
"sftp": ["django-storages[sftp]==1.14.3"],
"s3": ["django-storages[boto3]==1.14.3"],
"google": ["django-storages[google]==1.14.3"],
"azure": ["django-storages[azure]==1.14.3"],
"prometheus": ["django-prometheus"],
},
include_package_data=True,
Expand Down

0 comments on commit d773878

Please sign in to comment.