Permalink
Browse files

Fixes #103, i.e. the Travis env var bug

  • Loading branch information...
ndarville committed Mar 20, 2013
1 parent 8a98d1d commit 17bbbadb1ad99746f1b94003255e0d468723d659
Showing with 8 additions and 9 deletions.
  1. +5 −6 .travis.yml
  2. +3 −3 wsgi.py
View
@@ -8,12 +8,11 @@ python:
services: postgresql
env:
- DJANGO=1.4.5
before_install:
- export DJANGO_SETTINGS_MODULE=ponyforum.settings
- export PYTHONPATH=$HOME/builds/ndarville/pony-forum
- export PIP_USE_MIRRORS=true
global:
- DJANGO="1.4.5"
- DJANGO_SETTINGS_MODULE="ponyforum.settings"
- PYTHONPATH="/home/travis/build/ndarville/pony-forum"
- PIP_USE_MIRRORS=true
install:
- pip install -r requirements.txt
View
@@ -1,16 +1,16 @@
"""WSGI handler for dotCloud and default set-ups."""
import os
import sys
if 'DOTCLOUD_ENVIRONMENT' in os.environ:
import sys
import django.core.handlers.wsgi
os.environ['DJANGO_SETTINGS_MODULE'] = 'ponyforum.settings'
sys.path.append('/home/dotcloud/current/ponyforum')
application = django.core.handlers.wsgi.WSGIHandler()
else:
elif 'TRAVIS' in os.environ:
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ponyforum.settings")
application = get_wsgi_application()

0 comments on commit 17bbbad

Please sign in to comment.