aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-07-29 08:39:35 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-07-29 08:39:35 -0500
commit6bb22e4b60d00085482afcf16f29679673dc6c97 (patch)
tree5512c200c494271ad1ff0a2bdc08f9e8dcadf706
parent3319c95bf861f806a1b237c99661b30379389063 (diff)
parenteb1c41cf0b038f8df1309e1b6d3e116197c72e0d (diff)
downloadcryptography-6bb22e4b60d00085482afcf16f29679673dc6c97.tar.gz
cryptography-6bb22e4b60d00085482afcf16f29679673dc6c97.tar.bz2
cryptography-6bb22e4b60d00085482afcf16f29679673dc6c97.zip
Merge pull request #1289 from alex/simplify-coverage
Move coverage configuration to the config file
-rw-r--r--.coveragerc3
-rw-r--r--tox.ini2
2 files changed, 4 insertions, 1 deletions
diff --git a/.coveragerc b/.coveragerc
index 03fc621e..58a1992d 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,8 @@
[run]
branch = True
+source =
+ cryptography/
+ tests/
[report]
exclude_lines =
diff --git a/tox.ini b/tox.ini
index ef5e46d7..98cd8a68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps =
pytest
./vectors
commands =
- coverage run --source=cryptography/,tests/ -m pytest --capture=no --strict {posargs}
+ coverage run -m pytest --capture=no --strict {posargs}
coverage report -m
[testenv:docs]