[ci] Try skipping 'coverage combine' with new pytest-cov

appveyor.yml

@@ -27,5 +27,4 @@ test_script:
   - "python -c \"import os, trio; print(os.path.dirname(trio.__file__))\""
   # -u makes sure we get prompt output
   - "python -u -m pytest -W error -ra --run-slow --faulthandler-timeout=60 ../trio -v -s --cov=trio --cov-config=../.coveragerc"
-  - "coverage combine"
   - "codecov"

ci/travis.sh

@@ -95,6 +95,5 @@ else
     INSTALLDIR=$(python -c "import os, trio; print(os.path.dirname(trio.__file__))")
     pytest -W error -ra --run-slow --faulthandler-timeout=60 ${INSTALLDIR} --cov="$INSTALLDIR" --cov-config=../.coveragerc --verbose
 
-    coverage combine
     bash <(curl -s https://codecov.io/bash)
 fi

test-requirements.txt

@@ -1,5 +1,5 @@
 pytest >= 3.3  # for catchlog fixture
-pytest-cov
+pytest-cov >= 2.6.0
 ipython        # for the IPython traceback integration tests
 pyOpenSSL      # for the ssl tests
 trustme        # for the ssl tests