Skip to content

Commit

Permalink
Merge 7e5f8d5 into 838a0c7
Browse files Browse the repository at this point in the history
  • Loading branch information
dreid committed Jul 11, 2013
2 parents 838a0c7 + 7e5f8d5 commit 1112d25
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[run]
branch = True
source = silverberg
omit = silverberg/test*,silverberg/cassandra*
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: python

python:
- 2.6
- 2.7
- pypy

install:
- pip install -r requirements.txt
- pip install coveralls

script:
- make lint coverage

after_success:
- coveralls
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ unit:
PYTHONPATH=".:${PYTHONPATH}" trial --random 0 ${UNITTESTS}

coverage:
PYTHONPATH=".:${PYTHONPATH}" coverage run --source=${CODEDIR} --branch `which trial` ${CODEDIR}/test; coverage html -d _trial_coverage --omit="${CODEDIR}/test/*"
PYTHONPATH=".:${PYTHONPATH}" coverage run `which trial` silverberg; coverage html -d _trial_coverage

thrift:
${THRIFT_COMPILER} -out silverberg/ --gen py:twisted interface/cassandra.thrift
Expand Down

0 comments on commit 1112d25

Please sign in to comment.