Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

Commit

Permalink
Deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
kmmbvnr committed Apr 3, 2015
1 parent 29df49a commit 29c470e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.tox
*.pyc
db*.sqlite3
db*.sqlite3
deploy
6 changes: 6 additions & 0 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,9 @@
from django.template.base import add_to_builtins
add_to_builtins('material.templatetags.material_form')
add_to_builtins('template_debug.templatetags.debug_tags')


try:
from deploy.local_settings import * # NOQA
except ImportError:
pass
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ deps = django==1.7.3
django-template-debug
django-debug-toolbar
django-autofixture
django-blog-zinnia
django-blog-zinnia
ipdb
uwsgi
psycopg2
commands = {posargs:./manage.py runserver 0.0.0.0:8000}
setenv =
PYTHONPATH={toxinidir}
Expand Down

0 comments on commit 29c470e

Please sign in to comment.