Skip to content

Commit

Permalink
Merge 4257630 into 1e39fb3
Browse files Browse the repository at this point in the history
  • Loading branch information
rockymeza committed Aug 1, 2014
2 parents 1e39fb3 + 4257630 commit 1eb859d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Expand Up @@ -16,4 +16,7 @@ install:
- pip install -q $DJANGO_PACKAGE --use-mirrors
- python setup.py install
- pip install mock
script: make test
- pip install coveralls
script: make coverage
after_success:
coveralls
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -9,7 +9,7 @@ test-builtin:
cd tests && DJANGO_SETTINGS_MODULE=$(SETTINGS) $(COVERAGE_COMMAND) ./manage.py test --traceback $(TESTS) --verbosity=2

coverage:
+make test COVERAGE_COMMAND='coverage run --source=betterforms --branch --parallel-mode'
+make test COVERAGE_COMMAND='coverage run --source=betterforms --omit="*tests*" --branch --parallel-mode'
cd tests && coverage combine && coverage html

docs:
Expand Down
3 changes: 2 additions & 1 deletion betterforms/collections_compat.py
@@ -1,3 +1,4 @@
from __future__ import print_function
# python < 2.7 compatibility for collections.Counter
# source: http://code.activestate.com/recipes/576611-counter-class/
from operator import itemgetter
Expand Down Expand Up @@ -189,4 +190,4 @@ def __and__(self, other):

if __name__ == '__main__':
import doctest
print doctest.testmod()
print(doctest.testmod())

0 comments on commit 1eb859d

Please sign in to comment.