Merge branch 'release-1.1' into develop

2015-09-07 23:24:40 +02:00 · 2015-09-07 23:24:40 +02:00 · ac487da5e0
commit ac487da5e0
parent c4f3275824 499c1d518a
4 changed files with 1 additions and 8 deletions
--- a/.coveragerc
+++ b/.coveragerc
@ -1,5 +0,0 @@
-[report]
-omit =
-    */pyshared/*
-    */python?.?/*
-    */site-packages/nose/*
--- a/.travis.yml
+++ b/.travis.yml
@ -27,7 +27,7 @@ script:
  - "tox -e $TOX_ENV"

 after_success:
-  - "if [ $TOX_ENV == 'py27' ]; then pip install coveralls; coveralls; fi"
+  - "if [ $TOX_ENV == 'py27' ]; then pip install coveralls==1.0b1; coveralls; fi"

 branches:
  except:
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,7 +1,6 @@
 include *.py
 include *.rst
 include *.txt
-include .coveragerc
 include .mailmap
 include .travis.yml
 include AUTHORS
--- a/tox.ini
+++ b/tox.ini
@ -6,7 +6,6 @@ sitepackages = true
 commands =
    py.test \
        --basetemp={envtmpdir} \
-        --junit-xml=xunit-{envname}.xml \
        --cov=mopidy --cov-report=term-missing \
        -n 4 \
        {posargs}