Merge #421 'fix codecov, remove scrutinizer'

.coveragerc

@@ -1,6 +1,7 @@
 [run]
 source = .
 branch = true
+parallel = 1
 
 [report]
 show_missing = true

.travis.yml

@@ -2,7 +2,7 @@ dist: xenial
 language: python
 env:
   global:
-    - PYTEST_ADDOPTS=-vv
+    - PYTEST_ADDOPTS="-vv --cov-append"
   matrix:
     - CI_TARGET=tests
 matrix:
@@ -11,28 +11,28 @@ matrix:
       dist: trusty
       sudo: false
     - python: 3.6
-      env: CI_TARGET=checkqa TOXENV=checkqa
+      env: CI_TARGET=checkqa TOXENV=checkqa,docs
 python:
-  # If the build matrix gets bigger, also update the number of runs
-  # at the bottom of .scrutinizer.yml.
   - 2.7
   - 3.4
   - 3.5
   - 3.6
   - 3.7
-before_install:
+install:
   - if [ $CI_TARGET = tests ]; then
       eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64";
-      pip install -q scrutinizer-ocular tox-travis;
+      pip install -q tox-travis;
     else
       pip install -q tox;
     fi
 script:
   - tox
 after_script:
   - if [ $CI_TARGET = tests ]; then
+      set -x;
+      coverage combine;
       coverage report -m;
       coverage xml;
       bash <(curl --retry 5 --silent --fail https://codecov.io/bash) -f coverage.xml;
-      ocular;
+      set +x;
     fi

README.md

@@ -2,8 +2,7 @@
 
 [![Build Status](https://travis-ci.org/neovim/pynvim.svg?branch=master)](https://travis-ci.org/neovim/pynvim)
 [![Documentation Status](https://readthedocs.org/projects/pynvim/badge/?version=latest)](http://pynvim.readthedocs.io/en/latest/?badge=latest)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/neovim/pynvim/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/neovim/pynvim/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/neovim/pynvim/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/neovim/pynvim/?branch=master)
+[![Code coverage](https://codecov.io/gh/neovim/pynvim/branch/master/graph/badge.svg)](https://codecov.io/gh/neovim/pynvim)
 
 Pynvim implements support for python plugins in Nvim. It also works as a library for
 connecting to and scripting Nvim processes through its msgpack-rpc API.

tox.ini

@@ -1,7 +1,6 @@
 [tox]
 envlist =
   py{27,34,35,36,37,38}-{asyncio,pyuv}-cov,pypy-cov
-  py36-docs
   checkqa
 
 [testenv]
@@ -11,10 +10,9 @@ deps =
   cov: pytest-cov
   pyuv: pyuv
 setenv =
-  cov: PYTEST_ADDOPTS=--cov=. --cov-append {env:PYTEST_ADDOPTS:}
+  cov: PYTEST_ADDOPTS=--cov=. {env:PYTEST_ADDOPTS:}
 passenv = PYTEST_ADDOPTS
 commands =
-  cov: coverage erase
   python -m pytest {posargs}
 
 [testenv:checkqa]