From 39c1f4f9be915226eb583b1196bbfcb057d19782 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Sep 2015 21:14:07 +0200
Subject: [PATCH 1/7] coverage: Remove nosetests workaround

---
 .coveragerc | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index e77617cb..00000000
--- a/.coveragerc
+++ /dev/null
@@ -1,5 +0,0 @@
-[report]
-omit =
-    */pyshared/*
-    */python?.?/*
-    */site-packages/nose/*

From f1315488a27f080f4e8ff581745faa42785dc07e Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Sep 2015 21:14:21 +0200
Subject: [PATCH 2/7] travis: Use working coveralls client

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5f01f223..09497db6 100644
--- 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 --pre coveralls; coveralls; fi"
 
 branches:
   except:

From 42ffa72e00bd631c24eb27e06cb5d7019551a0e1 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Sep 2015 21:14:29 +0200
Subject: [PATCH 3/7] tox: Remove xunit files previously used by Jenkins

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index e29a40f2..ecc358ac 100644
--- 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}

From 74e29601351b5ea6c00e01ca7b54b038ccadeec8 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Sep 2015 21:17:06 +0200
Subject: [PATCH 4/7] package: Remove .coveragerc from manifest

---
 MANIFEST.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 5a99b8b8..b2b7f37c 100644
--- 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

From 6bfb250f2ae2ca4550c9719786f7bb25035e54d6 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Sep 2015 21:55:49 +0200
Subject: [PATCH 5/7] tox: Test if coverage data is readable if not using
 pytest-xdist

---
 tox.ini | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tox.ini b/tox.ini
index ecc358ac..511642b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,19 +3,17 @@ envlist = py27, py27-tornado23, py27-tornado31, docs, flake8
 
 [testenv]
 sitepackages = true
-commands =
-    py.test \
-        --basetemp={envtmpdir} \
-        --cov=mopidy --cov-report=term-missing \
-        -n 4 \
-        {posargs}
 deps =
     mock
     pytest
     pytest-capturelog
     pytest-cov
-    pytest-xdist
     responses
+commands =
+    py.test \
+        --basetemp={envtmpdir} \
+        --cov=mopidy --cov-report=term-missing \
+        {posargs}
 
 [testenv:py27-tornado23]
 commands = py.test tests/http

From 354f7f87f126d6ea9a36929050f702510826c1eb Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Sep 2015 23:02:47 +0200
Subject: [PATCH 6/7] Revert "tox: Test if coverage data is readable if not
 using pytest-xdist"

This reverts commit 6bfb250f2ae2ca4550c9719786f7bb25035e54d6.
---
 tox.ini | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index 511642b2..ecc358ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,17 +3,19 @@ envlist = py27, py27-tornado23, py27-tornado31, docs, flake8
 
 [testenv]
 sitepackages = true
+commands =
+    py.test \
+        --basetemp={envtmpdir} \
+        --cov=mopidy --cov-report=term-missing \
+        -n 4 \
+        {posargs}
 deps =
     mock
     pytest
     pytest-capturelog
     pytest-cov
+    pytest-xdist
     responses
-commands =
-    py.test \
-        --basetemp={envtmpdir} \
-        --cov=mopidy --cov-report=term-missing \
-        {posargs}
 
 [testenv:py27-tornado23]
 commands = py.test tests/http

From 499c1d518a83acbf481dc62f62e607146e02c22d Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Sep 2015 23:04:50 +0200
Subject: [PATCH 7/7] travis: Use beta coveralls, but stable coverage

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 09497db6..eb8aadfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ script:
   - "tox -e $TOX_ENV"
 
 after_success:
-  - "if [ $TOX_ENV == 'py27' ]; then pip install --pre coveralls; coveralls; fi"
+  - "if [ $TOX_ENV == 'py27' ]; then pip install coveralls==1.0b1; coveralls; fi"
 
 branches:
   except: