Merge pull request #5385 from hypothesis/add-make-coverage

Add `make coverage` and `make codecov`

.coveragerc

@@ -1,13 +1,12 @@
 [run]
 branch = True
+parallel = True
+source =
+    h
+    tests/h
 omit =
-    # development
     h/debug.py
-
-    # migrations
     h/migrations/*
 
-[paths]
-source =
-   src/memex
-   .tox/*/lib/python*/site-packages/memex
+[report]
+show_missing = True

.travis.yml

@@ -14,8 +14,7 @@ matrix:
       before_script: createdb htest
       script: tox
       after_success:
-        tox -e py27-coverage
-        tox -e py27-codecov
+        make coverage codecov
 
     - env: ACTION=tox-py3
       language: python

Makefile

@@ -68,6 +68,14 @@ functests: build/manifest.json
 test-py3: node_modules/.uptodate
 	tox -e py36-tests
 
+.PHONY: coverage
+coverage:
+	tox -e py27-coverage
+
+.PHONY: codecov
+codecov:
+	tox -e py27-codecov
+
 .PHONY: lint
 lint:
 	tox -e py27-lint

tox.ini

@@ -48,13 +48,13 @@ commands =
     lint: flake8 h
     lint: flake8 tests
     lint: flake8 --select FI14 --exclude 'h/cli/*,tests/h/cli/*,h/util/uri.py,h/migrations/versions/*' h tests
-    tests: coverage run --parallel --source h,tests/h -m pytest -Werror {posargs:tests/h/}
+    tests: coverage run -m pytest -Werror {posargs:tests/h/}
     functests: pytest -Werror {posargs:tests/functional/}
     docs: sphinx-autobuild -BqT -b dirhtml -d {envtmpdir}/doctrees . {envtmpdir}/html
     checkdocs: sphinx-build -qTWn -b dirhtml -d {envtmpdir}/doctrees . {envtmpdir}/html
     {docstrings,checkdocstrings}: sphinx-apidoc -ePMF -a -H "Dooccsstrinngs!!" --ext-intersphinx --ext-todo --ext-viewcode -o {envtmpdir}/rst .
     docstrings: sphinx-autobuild -BqT -z h -z tests -b dirhtml {envtmpdir}/rst {envtmpdir}/dirhtml
     checkdocstrings: sphinx-build -qTn -b dirhtml {envtmpdir}/rst {envtmpdir}/dirhtml
-    coverage: coverage combine
+    coverage: -coverage combine
     coverage: coverage report
     codecov: codecov