From 2a378dae08c81bd1159a7ca4daa570609b5ddd45 Mon Sep 17 00:00:00 2001 From: Almog Laktivi Date: Wed, 22 Nov 2017 11:40:04 +0200 Subject: Change tox settings imports Change tox settings for settings to be copied while running docker Change-Id: Ie369f47f618c55ea096694ee10ac03579e552de8 Issue-ID: VVP-23 Signed-off-by: Almog Laktivi --- django/vvp/settings/tox_settings.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django/vvp/settings/tox_settings.py b/django/vvp/settings/tox_settings.py index 4a2cf6e..ff1aabd 100644 --- a/django/vvp/settings/tox_settings.py +++ b/django/vvp/settings/tox_settings.py @@ -22,7 +22,7 @@ Environment variables that must exist in production: import os from corsheaders.defaults import default_headers -from boto.s3.connection import OrdinaryCallingFormat +# from boto.s3.connection import OrdinaryCallingFormat import datetime # With this file at ice/settings/__init__.py, we need three applications of @@ -321,9 +321,9 @@ AWS_PRELOAD_METADATA = True # Set by custom subclass. # AWS_STORAGE_BUCKET_NAME = "em-static" -AWS_S3_CALLING_FORMAT = OrdinaryCallingFormat() -DEFAULT_FILE_STORAGE = 'vvp.settings.storage.S3MediaStorage' -STATICFILES_STORAGE = 'vvp.settings.storage.S3StaticStorage' +# AWS_S3_CALLING_FORMAT = OrdinaryCallingFormat() +# DEFAULT_FILE_STORAGE = 'vvp.settings.storage.S3MediaStorage' +# STATICFILES_STORAGE = 'vvp.settings.storage.S3StaticStorage' # These seem to have no effect even when we don't override with custom_domain? STATIC_ROOT = os.environ['STATIC_ROOT'] -- cgit 1.2.3-korg