Skip to content

Commit

Permalink
Merge pull request #10 from Polytechnique-org/vberger
Browse files Browse the repository at this point in the history
Add travis builds
  • Loading branch information
vberger committed Oct 9, 2015
2 parents e14c5be + eeb28fd commit 0fb911d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
language: python

python:
- "3.4"

install:
- pip install -r backend/requirements.txt

script:
- cd backend
- python manage.py test

branches:
only:
- master
4 changes: 2 additions & 2 deletions backend/backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
},
'platal1': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'x5dat',
'ENGINE': 'django.db.backends.' + CONFIG.get('plataldb.engine', 'sqlite3'),
'NAME': CONFIG.get('plataldb.name', 'x5dat'),
'USER': CONFIG.get('plataldb.user', 'web'),
'PASSWORD': CONFIG.get('plataldb.password'),
},
Expand Down

0 comments on commit 0fb911d

Please sign in to comment.