Skip to content

Commit

Permalink
Merge 1959145 into 2beec4e
Browse files Browse the repository at this point in the history
  • Loading branch information
FlowFX committed Jul 27, 2017
2 parents 2beec4e + 1959145 commit e25560e
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 27 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
language: python
cache: pip
python:
- 3.6
# Install dependencies
install: "pip install -r requirements/testing.txt"
# Run tests
script:
- echo "{}" > secrets.json
# - pytest -k sys -x
- pytest -k unit -x --cov -n auto
after_success:
Expand Down
7 changes: 7 additions & 0 deletions config/settings/development.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from .common import *


# Debug settings
DEBUG = True
INSTALLED_APPS += ['debug_toolbar',]
MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware',]
15 changes: 0 additions & 15 deletions config/settings/local.py

This file was deleted.

22 changes: 11 additions & 11 deletions config/settings/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MEDIA_ROOT = os.path.abspath('/var/www/media/reggae-cdmx.com/')


# # Database
# Database
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
Expand All @@ -36,16 +36,16 @@
}

# Caching
# CACHES = {
# 'default': { # Redislabs
# 'BACKEND': 'django_redis.cache.RedisCache',
# 'LOCATION': get_secret('REDIS_LOCATION'),
# 'OPTIONS': {
# 'CLIENT_CLASS': 'django_redis.client.DefaultClient',
# 'PASSWORD': get_secret('REDIS_PASSWORD'),
# }
# }
# }
CACHES = {
'default': { # Redislabs
'BACKEND': 'django_redis.cache.RedisCache',
'LOCATION': get_secret('REDIS_LOCATION'),
'OPTIONS': {
'CLIENT_CLASS': 'django_redis.client.DefaultClient',
'PASSWORD': get_secret('REDIS_PASSWORD'),
}
}
}


# Error tracking
Expand Down
4 changes: 4 additions & 0 deletions config/settings/testing.py
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
from .common import *


# Use in-memory file storage
DEFAULT_FILE_STORAGE = 'inmemorystorage.InMemoryStorage'
2 changes: 1 addition & 1 deletion manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys

if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.development")
try:
from django.core.management import execute_from_command_line
except ImportError:
Expand Down

0 comments on commit e25560e

Please sign in to comment.