Skip to content

Commit 800ddc3

Browse files
committed
Merge trunk into branch
2 parents e1826c5 + e34547c commit 800ddc3

File tree

171 files changed

+3062
-47981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+3062
-47981
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ before_script:
117117
script:
118118
- PATH=$VIRTUAL_ENV/bin:$PATH
119119
- export LD_LIBRARY_PATH=$VIRTUAL_ENV/lib:$LD_LIBRARY_PATH
120-
- py.test -v test/ --cov=roundup
120+
- py.test -v --maxfail=20 test/ --cov=roundup
121121

122122

123123
after_success:

3rdparty/README.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

3rdparty/bootstrap/LICENSE

Lines changed: 0 additions & 176 deletions
This file was deleted.

3rdparty/bootstrap/Makefile

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)