Replacing pytest-cov by coverage (#1353)

diff --git a/requirements.txt b/requirements.txt
index ff046269238fcb62cb560be2937f81bf331f0d36..725811da98504465254d2568c365ea3b60cfb66d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,6 +15,7 @@ wheel
 # Tests & Linting
 autoflake
 black==20.8b1
+coverage==5.3
 cryptography
 flake8
 flake8-bugbear
@@ -24,7 +25,6 @@ mypy
 pytest==5.*
 pytest-asyncio
 pytest-trio
-pytest-cov
 trio
 trio-typing
 trustme

diff --git a/scripts/test b/scripts/test
index f9c9917233193a0da905a83467c7e825518e9a84..f7f32ad12bb044c3c2992089f52c9ccd0a3dfbbe 100755 (executable)
--- a/scripts/test
+++ b/scripts/test
@@ -11,7 +11,7 @@ if [ -z $GITHUB_ACTIONS ]; then
     scripts/check
 fi
 
-${PREFIX}pytest $@
+${PREFIX}coverage run -m pytest
 
 if [ -z $GITHUB_ACTIONS ]; then
     scripts/coverage

diff --git a/setup.cfg b/setup.cfg
index 0b8ef00bea74b6a90e3bcfa6355b5ce0628c5635..c860d819c0fc8d72fdc39ec01f0fffbc21ee30f6 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,10 @@ profile = black
 combine_as_imports = True
 
 [tool:pytest]
-addopts = --cov=httpx --cov=tests -rxXs
+addopts = -rxXs
 markers =
   copied_from(source, changes=None): mark test as copied from somewhere else, along with a description of changes made to accodomate e.g. our test setup
+
+[coverage:run]
+omit = venv/*
+include = httpx/*, tests/*