Skip to content

Commit

Permalink
Merge branch 'master' of github.com:GNUtn/eventoL-api
Browse files Browse the repository at this point in the history
  • Loading branch information
FedeG committed Dec 29, 2015
2 parents ca7d5cb + 9eb5a8a commit 508fe9f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
repo_token: OlT5Gc1zcolwjCyw5vy5RAwh7jZTBqvVJ
15 changes: 11 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@ env:
- DJANGO=1.9 DB=postgres
services:
- docker
cache: pip
before_install:
- netstat -putona
- docker run --name eventol-postgres -e POSTGRES_PASSWORD=secret -e POSTGRES_USER=eventol -e POSTGRES_DB=eventol -p 5432:5432 -d postgres
install: "pip install -r requirements.txt"
script: cd eventoL; python manage.py test
- docker run --name eventol-postgres -e POSTGRES_PASSWORD=secret -e POSTGRES_USER=eventol -e POSTGRES_DB=eventol -p 5000:5432 -d postgres
install:
- pip install -U pip wheel
- pip install coverage coveralls
- pip install -r requirements.txt
script:
- cd eventoL; coverage run --source='.' manage.py test
after_success:
- coverage report
- coveralls
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Status
-------
[![Requirements Status](https://requires.io/github/GNUtn/eventoL-api/requirements.svg?branch=master)](https://requires.io/github/GNUtn/eventoL-api/requirements/?branch=master)
[![Build Status](https://travis-ci.org/GNUtn/eventoL-api.svg)](https://travis-ci.org/GNUtn/eventoL-api)
[![Coverage Status](https://coveralls.io/repos/GNUtn/eventoL-api/badge.svg?branch=master&service=github)](https://coveralls.io/github/GNUtn/eventoL-api?branch=master)
[![Stories in Ready](https://badge.waffle.io/GNUtn/eventoL-api.svg?label=ready&title=Ready)](http://waffle.io/GNUtn/eventoL-api)

DER
Expand Down

0 comments on commit 508fe9f

Please sign in to comment.