[PATCH] Coverage fixup for #82

Author: reactive-firewall

.codecov.yml

@@ -39,6 +39,10 @@ coverage:
 github_checks:
   annotations: true
 flags:
+  pythonrepo:
+    paths:
+      - "pythonrepo/"
   tests:
     paths:
-      - tests
+      - "tests/"
+      - "!pythonrepo/"

.coveragerc

@@ -2,10 +2,11 @@
 concurrency = multiprocessing
 parallel = True
 sigterm = True
-branch = True
+# enable if you want to consider branches in coverage
+# branch = True
 
 [report]
-include = pythonrepo/*,tests/*
+include = pythonrepo/*
 # Regexes for lines to exclude from consideration
 exclude_lines =
     # Have to re-enable the standard pragma
@@ -45,3 +46,11 @@ partial_branches =
     if __name__ in u'__main__':
     if __name__ in u"__main__":
     if __name__ in '__main__':
+    if __sys_path__ not in sys.path:
+    # don't complain about sys.modules
+    sys.modules
+    not in sys.modules:
+    if context.__name__ is None:
+    if 'os' not in sys.modules:
+    if 'os.path' not in sys.modules:
+    if 'argparse' not in sys.modules:

Makefile

@@ -287,7 +287,7 @@ just-test: cleanup
 test: test-reqs just-test
 	$(QUIET)$(DO_FAIL) ;
 	$(QUIET)$(COVERAGE) combine 2>$(ERROR_LOG_PATH) || : ;
-	$(QUIET)$(COVERAGE) report -m --include=* 2>$(ERROR_LOG_PATH) || : ;
+	$(QUIET)$(COVERAGE) report -m --include=pythonrepo/* 2>$(ERROR_LOG_PATH) || : ;
 	$(QUIET)$(CC_TOOL) $(CC_TOOL_ARGS) 2>$(ERROR_LOG_PATH) || : ;
 	$(QUIET)$(ECHO) "$@: Done."
 
@@ -384,6 +384,7 @@ cleanup-src-dir: cleanup-dev-backups cleanup-mac-dir-store
 cleanup: cleanup-tests cleanup-pythonrepo cleanup-pythonrepo-eggs cleanup-src-dir
 	$(QUIET)$(RM) ./.coverage 2>$(ERROR_LOG_PATH) || true
 	$(QUIET)$(RM) ./coverage*.xml 2>$(ERROR_LOG_PATH) || true
+	$(QUIET)$(RM) ./.coverage.* 2>$(ERROR_LOG_PATH) || true
 	$(QUIET)$(RM) ./sitecustomize.py 2>$(ERROR_LOG_PATH) || true
 	$(QUIET)$(RMDIR) ./test-reports/ 2>$(ERROR_LOG_PATH) || true
 	$(QUIET)$(WAIT) ;