Skip to content

Commit

Permalink
Remove changes done to the setting file
Browse files Browse the repository at this point in the history
  • Loading branch information
pythonGeek committed Dec 7, 2016
1 parent 2d6cd7a commit a18cef4
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
language: python
python:
- "2.7"
- "3.5"
- "3.4"
install:
- pip install -r requirements.txt
- pip install braintree coveralls mock mysqlclient
env:
- DB=sqlite
- DB=mgit ysql
- DB=mysql
- DB=postgres
addons:
postgresql: "9.4"
Expand Down
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

5 changes: 0 additions & 5 deletions hc/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

import os
import warnings
import dj_database_url

BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

Expand Down Expand Up @@ -150,10 +149,6 @@
PUSHBULLET_CLIENT_ID = None
PUSHBULLET_CLIENT_SECRET = None

db_from_env = dj_database_url.config(conn_max_age=500)
DATABASES['default'].update(db_from_env)

STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'

if os.path.exists(os.path.join(BASE_DIR, "hc/local_settings.py")):
from .local_settings import *
Expand Down
4 changes: 2 additions & 2 deletions hc/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import os

from django.core.wsgi import get_wsgi_application
from whitenoise.django import DjangoWhiteNoise


os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hc.settings")

application = get_wsgi_application()
application = DjangoWhiteNoise(application)

1 change: 0 additions & 1 deletion runtime.txt

This file was deleted.

0 comments on commit a18cef4

Please sign in to comment.