Merge branch 'public-s3-storage-support' into develop

jmurty · jmurty · commit 52e59b641a95 · 2017-10-20T09:48:56.000+11:00
diff --git a/icekit/utils/storage.py b/icekit/utils/storage.py
@@ -63,4 +63,10 @@ class S3DefaultStorage(
     pass
 
 
-default_storage = get_storage_class(settings.DEFAULT_FILE_STORAGE)()
+class S3PublicStorage(
+        # HashedMediaMixin,
+        S3MediaLocationMixin,
+        S3PublicMixin,
+        S3Boto3Storage):
+
+    pass
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
+djangorestframework<3.7  # Avoid JSONField errors with Django 1.8
+
 -e .[api,brightcove,dev,docs,django18,forms,project,search,test,events,collections]
 
 -e git+https://github.com/ixc/django-dynamic-fixture.git@caeb3427399edd3b0d589516993c7da55e0de560#egg=django-dynamic-fixture

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+djangorestframework<3.7 # Avoid JSONField errors with Django 1.8`
	`2`	`+`
`1`	`3`	`-e .[api,brightcove,dev,docs,django18,forms,project,search,test,events,collections]`
`2`	`4`
`3`	`5`	`-e git+https://github.com/ixc/django-dynamic-fixture.git@caeb3427399edd3b0d589516993c7da55e0de560#egg=django-dynamic-fixture`