- « prev
- ^ index
- » next
+ « prev
+ ^ index
+ » next
coverage.py v{{__version__}},
created at {{ time_stamp }}
diff --git a/coverage/htmlfiles/style.css b/coverage/htmlfiles/style.css
index aec9cbef2..3cdaf05a3 100644
--- a/coverage/htmlfiles/style.css
+++ b/coverage/htmlfiles/style.css
@@ -22,7 +22,7 @@ td { vertical-align: top; }
table tr.hidden { display: none !important; }
-p#no_rows { display: none; font-size: 1.2em; }
+p#no_rows { display: none; font-size: 1.15em; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; }
a.nav { text-decoration: none; color: inherit; }
@@ -40,6 +40,18 @@ header .content { padding: 1rem 3.5rem; }
header h2 { margin-top: .5em; font-size: 1em; }
+header h2 a.button { font-family: inherit; font-size: inherit; border: 1px solid; border-radius: .2em; background: #eee; color: inherit; text-decoration: none; padding: .1em .5em; margin: 1px calc(.1em + 1px); cursor: pointer; border-color: #ccc; }
+
+@media (prefers-color-scheme: dark) { header h2 a.button { background: #333; } }
+
+@media (prefers-color-scheme: dark) { header h2 a.button { border-color: #444; } }
+
+header h2 a.button.current { border: 2px solid; background: #fff; border-color: #999; cursor: default; }
+
+@media (prefers-color-scheme: dark) { header h2 a.button.current { background: #1e1e1e; } }
+
+@media (prefers-color-scheme: dark) { header h2 a.button.current { border-color: #777; } }
+
header p.text { margin: .5em 0 -.5em; color: #666; font-style: italic; }
@media (prefers-color-scheme: dark) { header p.text { color: #aaa; } }
@@ -68,19 +80,29 @@ footer .content { padding: 0; color: #666; font-style: italic; }
h1 { font-size: 1.25em; display: inline-block; }
-#filter_container { float: right; margin: 0 2em 0 0; }
+#filter_container { float: right; margin: 0 2em 0 0; line-height: 1.66em; }
+
+#filter_container #filter { width: 10em; padding: 0.2em 0.5em; border: 2px solid #ccc; background: #fff; color: #000; }
-#filter_container input { width: 10em; padding: 0.2em 0.5em; border: 2px solid #ccc; background: #fff; color: #000; }
+@media (prefers-color-scheme: dark) { #filter_container #filter { border-color: #444; } }
-@media (prefers-color-scheme: dark) { #filter_container input { border-color: #444; } }
+@media (prefers-color-scheme: dark) { #filter_container #filter { background: #1e1e1e; } }
-@media (prefers-color-scheme: dark) { #filter_container input { background: #1e1e1e; } }
+@media (prefers-color-scheme: dark) { #filter_container #filter { color: #eee; } }
-@media (prefers-color-scheme: dark) { #filter_container input { color: #eee; } }
+#filter_container #filter:focus { border-color: #007acc; }
-#filter_container input:focus { border-color: #007acc; }
+#filter_container :disabled ~ label { color: #ccc; }
-header button { font-family: inherit; font-size: inherit; border: 1px solid; border-radius: .2em; color: inherit; padding: .1em .5em; margin: 1px calc(.1em + 1px); cursor: pointer; border-color: #ccc; }
+@media (prefers-color-scheme: dark) { #filter_container :disabled ~ label { color: #444; } }
+
+#filter_container label { font-size: .875em; color: #666; }
+
+@media (prefers-color-scheme: dark) { #filter_container label { color: #aaa; } }
+
+header button { font-family: inherit; font-size: inherit; border: 1px solid; border-radius: .2em; background: #eee; color: inherit; text-decoration: none; padding: .1em .5em; margin: 1px calc(.1em + 1px); cursor: pointer; border-color: #ccc; }
+
+@media (prefers-color-scheme: dark) { header button { background: #333; } }
@media (prefers-color-scheme: dark) { header button { border-color: #444; } }
@@ -266,13 +288,13 @@ kbd { border: 1px solid black; border-color: #888 #333 #333 #888; padding: .1em
#index table.index { margin-left: -.5em; }
-#index td, #index th { text-align: right; width: 5em; padding: .25em .5em; border-bottom: 1px solid #eee; }
+#index td, #index th { text-align: right; padding: .25em .5em; border-bottom: 1px solid #eee; }
@media (prefers-color-scheme: dark) { #index td, #index th { border-color: #333; } }
-#index td.name, #index th.name { text-align: left; width: auto; }
+#index td.name, #index th.name { text-align: left; width: auto; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; min-width: 15em; }
-#index th { font-style: italic; color: #333; cursor: pointer; }
+#index th { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-style: italic; color: #333; cursor: pointer; }
@media (prefers-color-scheme: dark) { #index th { color: #ddd; } }
@@ -280,23 +302,29 @@ kbd { border: 1px solid black; border-color: #888 #333 #333 #888; padding: .1em
@media (prefers-color-scheme: dark) { #index th:hover { background: #333; } }
+#index th .arrows { color: #666; font-size: 85%; font-family: sans-serif; font-style: normal; pointer-events: none; }
+
#index th[aria-sort="ascending"], #index th[aria-sort="descending"] { white-space: nowrap; background: #eee; padding-left: .5em; }
@media (prefers-color-scheme: dark) { #index th[aria-sort="ascending"], #index th[aria-sort="descending"] { background: #333; } }
-#index th[aria-sort="ascending"]::after { font-family: sans-serif; content: " ↑"; }
+#index th[aria-sort="ascending"] .arrows::after { content: " ▲"; }
+
+#index th[aria-sort="descending"] .arrows::after { content: " ▼"; }
-#index th[aria-sort="descending"]::after { font-family: sans-serif; content: " ↓"; }
+#index td.name { font-size: 1.15em; }
#index td.name a { text-decoration: none; color: inherit; }
+#index td.name .no-noun { font-style: italic; }
+
#index tr.total td, #index tr.total_dynamic td { font-weight: bold; border-top: 1px solid #ccc; border-bottom: none; }
-#index tr.file:hover { background: #eee; }
+#index tr.region:hover { background: #eee; }
-@media (prefers-color-scheme: dark) { #index tr.file:hover { background: #333; } }
+@media (prefers-color-scheme: dark) { #index tr.region:hover { background: #333; } }
-#index tr.file:hover td.name { text-decoration: underline; color: inherit; }
+#index tr.region:hover td.name { text-decoration: underline; color: inherit; }
#scroll_marker { position: fixed; z-index: 3; right: 0; top: 0; width: 16px; height: 100%; background: #fff; border-left: 1px solid #eee; will-change: transform; }
diff --git a/coverage/htmlfiles/style.scss b/coverage/htmlfiles/style.scss
index 7e2e0bce4..9bf1a7cc6 100644
--- a/coverage/htmlfiles/style.scss
+++ b/coverage/htmlfiles/style.scss
@@ -96,6 +96,22 @@ $dark-context-bg-color: #056;
}
}
+@mixin button-shape {
+ font-family: inherit;
+ font-size: inherit;
+ border: 1px solid;
+ border-radius: .2em;
+ background: $light-gray2;
+ @include background-dark($dark-gray2);
+ color: inherit;
+ text-decoration: none;
+ padding: .1em .5em;
+ margin: 1px calc(.1em + 1px);
+ cursor: pointer;
+ border-color: $light-gray3;
+ @include border-color-dark($dark-gray3);
+}
+
// Page-wide styles
html, body, h1, h2, h3, p, table, td, th {
margin: 0;
@@ -143,7 +159,8 @@ table tr.hidden {
p#no_rows {
display: none;
- font-size: 1.2em;
+ font-size: 1.15em;
+ font-family: $font-normal;
}
a.nav {
@@ -176,6 +193,18 @@ header {
h2 {
margin-top: .5em;
font-size: 1em;
+
+ a.button {
+ @include button-shape;
+ &.current {
+ border: 2px solid;
+ background: $light-bg;
+ @include background-dark($dark-bg);
+ border-color: $light-gray4;
+ @include border-color-dark($dark-gray4);
+ cursor: default;
+ }
+ }
}
p.text {
@@ -244,8 +273,9 @@ h1 {
#filter_container {
float: right;
margin: 0 2em 0 0;
+ line-height: 1.66em;
- input {
+ #filter {
width: 10em;
padding: 0.2em 0.5em;
border: 2px solid $light-gray3;
@@ -258,19 +288,21 @@ h1 {
border-color: $focus-color;
}
}
+
+ :disabled ~ label{
+ color: $light-gray3;
+ @include color-dark($dark-gray3);
+ }
+
+ label {
+ font-size: .875em;
+ color: $light-gray5;
+ @include color-dark($dark-gray5);
+ }
}
header button {
- font-family: inherit;
- font-size: inherit;
- border: 1px solid;
- border-radius: .2em;
- color: inherit;
- padding: .1em .5em;
- margin: 1px calc(.1em + 1px);
- cursor: pointer;
- border-color: $light-gray3;
- @include border-color-dark($dark-gray3);
+ @include button-shape;
@include focus-border;
&.run {
@@ -637,16 +669,18 @@ $border-indicator-width: .2em;
}
td, th {
text-align: right;
- width: 5em;
padding: .25em .5em;
border-bottom: 1px solid $light-gray2;
@include border-color-dark($dark-gray2);
&.name {
text-align: left;
width: auto;
+ font-family: $font-normal;
+ min-width: 15em;
}
}
th {
+ font-family: $font-normal;
font-style: italic;
color: $light-gray6;
@include color-dark($dark-gray6);
@@ -655,24 +689,35 @@ $border-indicator-width: .2em;
background: $light-gray2;
@include background-dark($dark-gray2);
}
+ .arrows {
+ color: #666;
+ font-size: 85%;
+ font-family: sans-serif;
+ font-style: normal;
+ pointer-events: none;
+ }
&[aria-sort="ascending"], &[aria-sort="descending"] {
white-space: nowrap;
background: $light-gray2;
@include background-dark($dark-gray2);
padding-left: .5em;
}
- &[aria-sort="ascending"]::after {
- font-family: sans-serif;
- content: " ↑";
+ &[aria-sort="ascending"] .arrows::after {
+ content: " ▲";
}
- &[aria-sort="descending"]::after {
- font-family: sans-serif;
- content: " ↓";
+ &[aria-sort="descending"] .arrows::after {
+ content: " ▼";
}
}
- td.name a {
- text-decoration: none;
- color: inherit;
+ td.name {
+ font-size: 1.15em;
+ a {
+ text-decoration: none;
+ color: inherit;
+ }
+ & .no-noun {
+ font-style: italic;
+ }
}
tr.total td,
@@ -681,7 +726,7 @@ $border-indicator-width: .2em;
border-top: 1px solid #ccc;
border-bottom: none;
}
- tr.file:hover {
+ tr.region:hover {
background: $light-gray2;
@include background-dark($dark-gray2);
td.name {
diff --git a/coverage/jsonreport.py b/coverage/jsonreport.py
index 4d4dec7d8..9e515c202 100644
--- a/coverage/jsonreport.py
+++ b/coverage/jsonreport.py
@@ -108,7 +108,7 @@ def report_one_file(self, coverage_data: CoverageData, analysis: Analysis) -> di
"excluded_lines": sorted(analysis.excluded),
}
if self.config.json_show_contexts:
- reported_file["contexts"] = analysis.data.contexts_by_lineno(analysis.filename)
+ reported_file["contexts"] = coverage_data.contexts_by_lineno(analysis.filename)
if coverage_data.has_arcs():
summary.update({
"num_branches": nums.n_branches,
diff --git a/coverage/lcovreport.py b/coverage/lcovreport.py
index e54bae8c8..0108f5ae0 100644
--- a/coverage/lcovreport.py
+++ b/coverage/lcovreport.py
@@ -120,7 +120,7 @@ def get_lcov(self, fr: FileReporter, analysis: Analysis, outfile: IO[str]) -> No
outfile.write(f"BRDA:{line_number},{block_number},{branch_number},1\n")
# Summary of the branch coverage.
- if analysis.has_arcs():
+ if analysis.has_arcs:
branch_stats = analysis.branch_stats()
brf = sum(t for t, k in branch_stats.values())
brh = brf - sum(t - k for t, k in branch_stats.values())
diff --git a/coverage/misc.py b/coverage/misc.py
index 2b27efc99..d5d96fb13 100644
--- a/coverage/misc.py
+++ b/coverage/misc.py
@@ -21,10 +21,9 @@
from types import ModuleType
from typing import (
- Any, Callable, IO, Iterable, Iterator, Mapping, NoReturn, Sequence, TypeVar,
+ Any, IO, Iterable, Iterator, Mapping, NoReturn, Sequence, TypeVar,
)
-from coverage import env
from coverage.exceptions import CoverageException
from coverage.types import TArc
@@ -116,29 +115,6 @@ def nice_pair(pair: TArc) -> str:
return "%d-%d" % (start, end)
-TSelf = TypeVar("TSelf")
-TRetVal = TypeVar("TRetVal")
-
-def expensive(fn: Callable[[TSelf], TRetVal]) -> Callable[[TSelf], TRetVal]:
- """A decorator to indicate that a method shouldn't be called more than once.
-
- Normally, this does nothing. During testing, this raises an exception if
- called more than once.
-
- """
- if env.TESTING:
- attr = "_once_" + fn.__name__
-
- def _wrapper(self: TSelf) -> TRetVal:
- if hasattr(self, attr):
- raise AssertionError(f"Shouldn't have called {fn.__name__} more than once")
- setattr(self, attr, True)
- return fn(self)
- return _wrapper
- else:
- return fn # pragma: not testing
-
-
def bool_or_none(b: Any) -> bool | None:
"""Return bool(b), but preserve None."""
if b is None:
diff --git a/coverage/parser.py b/coverage/parser.py
index 959174c36..45ea397bb 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -6,6 +6,7 @@
from __future__ import annotations
import ast
+import functools
import collections
import os
import re
@@ -100,6 +101,7 @@ def __init__(
self._all_arcs: set[TArc] | None = None
self._missing_arc_fragments: TArcFragments | None = None
+ @functools.lru_cache()
def lines_matching(self, *regexes: str) -> set[TLineNo]:
"""Find the lines matching one of a list of regexes.
@@ -232,6 +234,7 @@ def _raw_parse(self) -> None:
if env.PYBEHAVIOR.module_firstline_1 and self._multiline:
self._multiline[1] = min(self.raw_statements)
+ @functools.lru_cache(maxsize=1000)
def first_line(self, lineno: TLineNo) -> TLineNo:
"""Return the first line number of the statement including `lineno`."""
if lineno < 0:
@@ -312,6 +315,7 @@ def _analyze_ast(self) -> None:
self._missing_arc_fragments = aaa.missing_arc_fragments
+ @functools.lru_cache()
def exit_counts(self) -> dict[TLineNo, int]:
"""Get a count of exits from that each line.
diff --git a/coverage/phystokens.py b/coverage/phystokens.py
index 7d8b30c8a..626e9967e 100644
--- a/coverage/phystokens.py
+++ b/coverage/phystokens.py
@@ -6,6 +6,7 @@
from __future__ import annotations
import ast
+import functools
import io
import keyword
import re
@@ -170,35 +171,20 @@ def source_token_lines(source: str) -> TSourceTokenLines:
yield line
-class CachedTokenizer:
- """A one-element cache around tokenize.generate_tokens.
+@functools.lru_cache(maxsize=100)
+def generate_tokens(text: str) -> TokenInfos:
+ """A cached version of `tokenize.generate_tokens`.
When reporting, coverage.py tokenizes files twice, once to find the
structure of the file, and once to syntax-color it. Tokenizing is
expensive, and easily cached.
- This is a one-element cache so that our twice-in-a-row tokenizing doesn't
- actually tokenize twice.
-
+ Unfortunately, the HTML report code tokenizes all the files the first time
+ before then tokenizing them a second time, so we cache many. Ideally we'd
+ rearrange the code to tokenize each file twice before moving onto the next.
"""
- def __init__(self) -> None:
- self.last_text: str | None = None
- self.last_tokens: list[tokenize.TokenInfo] = []
-
- def generate_tokens(self, text: str) -> TokenInfos:
- """A stand-in for `tokenize.generate_tokens`."""
- if text != self.last_text:
- self.last_text = text
- readline = io.StringIO(text).readline
- try:
- self.last_tokens = list(tokenize.generate_tokens(readline))
- except:
- self.last_text = None
- raise
- return self.last_tokens
-
-# Create our generate_tokens cache as a callable replacement function.
-generate_tokens = CachedTokenizer().generate_tokens
+ readline = io.StringIO(text).readline
+ return list(tokenize.generate_tokens(readline))
def source_encoding(source: bytes) -> str:
diff --git a/coverage/plugin.py b/coverage/plugin.py
index 761406688..788b300ba 100644
--- a/coverage/plugin.py
+++ b/coverage/plugin.py
@@ -114,6 +114,7 @@ def coverage_init(reg, options):
from __future__ import annotations
+import dataclasses
import functools
from types import FrameType
@@ -344,6 +345,35 @@ def line_number_range(self, frame: FrameType) -> tuple[TLineNo, TLineNo]:
return lineno, lineno
+@dataclasses.dataclass
+class CodeRegion:
+ """Data for a region of code found by :meth:`FileReporter.code_regions`."""
+
+ #: The kind of region, like `"function"` or `"class"`. Must be one of the
+ #: singular values returned by :meth:`FileReporter.code_region_kinds`.
+ kind: str
+
+ #: The name of the region. For example, a function or class name.
+ name: str
+
+ #: The line in the source file to link to when navigating to the region.
+ #: Can be a line not mentioned in `lines`.
+ start: int
+
+ #: The lines in the region. Should be lines that could be executed in the
+ #: region. For example, a class region includes all of the lines in the
+ #: methods of the class, but not the lines defining class attributes, since
+ #: they are executed on import, not as part of exercising the class. The
+ #: set can include non-executable lines like blanks and comments.
+ lines: set[int]
+
+ def __lt__(self, other: CodeRegion) -> bool:
+ """To support sorting to make test-writing easier."""
+ if self.name == other.name:
+ return min(self.lines) < min(other.lines)
+ return self.name < other.name
+
+
@functools.total_ordering
class FileReporter(CoveragePluginBase):
"""Support needed for files during the analysis and reporting phases.
@@ -543,6 +573,31 @@ def source_token_lines(self) -> TSourceTokenLines:
for line in self.source().splitlines():
yield [("txt", line)]
+ def code_regions(self) -> Iterable[CodeRegion]:
+ """Identify regions in the source file for finer reporting than by file.
+
+ Returns an iterable of :class:`CodeRegion` objects. The kinds reported
+ should be in the possibilities returned by :meth:`code_region_kinds`.
+
+ """
+ return []
+
+ def code_region_kinds(self) -> Iterable[tuple[str, str]]:
+ """Return the kinds of code regions this plugin can find.
+
+ The returned pairs are the singular and plural forms of the kinds::
+
+ [
+ ("function", "functions"),
+ ("class", "classes"),
+ ]
+
+ This will usually be hard-coded, but could also differ by the specific
+ source file involved.
+
+ """
+ return []
+
def __eq__(self, other: Any) -> bool:
return isinstance(other, FileReporter) and self.filename == other.filename
diff --git a/coverage/python.py b/coverage/python.py
index 0a522d6b9..089c27ea6 100644
--- a/coverage/python.py
+++ b/coverage/python.py
@@ -14,10 +14,11 @@
from coverage import env
from coverage.exceptions import CoverageException, NoSource
from coverage.files import canonical_filename, relative_filename, zip_location
-from coverage.misc import expensive, isolate_module, join_regex
+from coverage.misc import isolate_module, join_regex
from coverage.parser import PythonParser
from coverage.phystokens import source_token_lines, source_encoding
-from coverage.plugin import FileReporter
+from coverage.plugin import CodeRegion, FileReporter
+from coverage.regions import code_regions
from coverage.types import TArc, TLineNo, TMorf, TSourceTokenLines
if TYPE_CHECKING:
@@ -202,7 +203,6 @@ def translate_lines(self, lines: Iterable[TLineNo]) -> set[TLineNo]:
def translate_arcs(self, arcs: Iterable[TArc]) -> set[TArc]:
return self.parser.translate_arcs(arcs)
- @expensive
def no_branch_lines(self) -> set[TLineNo]:
assert self.coverage is not None
no_branch = self.parser.lines_matching(
@@ -211,11 +211,9 @@ def no_branch_lines(self) -> set[TLineNo]:
)
return no_branch
- @expensive
def arcs(self) -> set[TArc]:
return self.parser.arcs()
- @expensive
def exit_counts(self) -> dict[TLineNo, int]:
return self.parser.exit_counts()
@@ -254,3 +252,12 @@ def should_be_python(self) -> bool:
def source_token_lines(self) -> TSourceTokenLines:
return source_token_lines(self.source())
+
+ def code_regions(self) -> Iterable[CodeRegion]:
+ return code_regions(self.source())
+
+ def code_region_kinds(self) -> Iterable[tuple[str, str]]:
+ return [
+ ("function", "functions"),
+ ("class", "classes"),
+ ]
diff --git a/coverage/regions.py b/coverage/regions.py
new file mode 100644
index 000000000..ad319b0e2
--- /dev/null
+++ b/coverage/regions.py
@@ -0,0 +1,114 @@
+# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
+# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
+
+"""Find functions and classes in Python code."""
+
+from __future__ import annotations
+
+import ast
+import dataclasses
+
+from typing import cast
+
+from coverage.plugin import CodeRegion
+
+
+@dataclasses.dataclass
+class Context:
+ """The nested named context of a function or class."""
+ name: str
+ kind: str
+ lines: set[int]
+
+
+class RegionFinder(ast.NodeVisitor):
+ """An ast visitor that will find and track regions of code.
+
+ Functions and classes are tracked by name. Results are in the .regions
+ attribute.
+
+ """
+ def __init__(self) -> None:
+ self.regions: list[CodeRegion] = []
+ self.context: list[Context] = []
+
+ def parse_source(self, source: str) -> None:
+ """Parse `source` and walk the ast to populate the .regions attribute."""
+ self.visit(ast.parse(source))
+
+ def fq_node_name(self) -> str:
+ """Get the current fully qualified name we're processing."""
+ return ".".join(c.name for c in self.context)
+
+ def visit_FunctionDef(self, node: ast.FunctionDef) -> None:
+ """Called for `def` or `async def`."""
+ lines = set(range(node.body[0].lineno, cast(int, node.body[-1].end_lineno) + 1))
+ if self.context and self.context[-1].kind == "class":
+ # Function bodies are part of their enclosing class.
+ self.context[-1].lines |= lines
+ # Function bodies should be excluded from the nearest enclosing function.
+ for ancestor in reversed(self.context):
+ if ancestor.kind == "function":
+ ancestor.lines -= lines
+ break
+ self.context.append(Context(node.name, "function", lines))
+ self.regions.append(
+ CodeRegion(
+ kind="function",
+ name=self.fq_node_name(),
+ start=node.lineno,
+ lines=lines,
+ )
+ )
+ self.generic_visit(node)
+ self.context.pop()
+
+ visit_AsyncFunctionDef = visit_FunctionDef # type: ignore[assignment]
+
+ def visit_ClassDef(self, node: ast.ClassDef) -> None:
+ """Called for `class`."""
+ # The lines for a class are the lines in the methods of the class.
+ # We start empty, and count on visit_FunctionDef to add the lines it
+ # finds.
+ lines: set[int] = set()
+ self.context.append(Context(node.name, "class", lines))
+ self.regions.append(
+ CodeRegion(
+ kind="class",
+ name=self.fq_node_name(),
+ start=node.lineno,
+ lines=lines,
+ )
+ )
+ self.generic_visit(node)
+ self.context.pop()
+ # Class bodies should be excluded from the enclosing classes.
+ for ancestor in reversed(self.context):
+ if ancestor.kind == "class":
+ ancestor.lines -= lines
+
+
+def code_regions(source: str) -> list[CodeRegion]:
+ """Find function and class regions in source code.
+
+ Analyzes the code in `source`, and returns a list of :class:`CodeRegion`
+ objects describing functions and classes as regions of the code::
+
+ [
+ CodeRegion(kind="function", name="func1", start=8, lines={10, 11, 12}),
+ CodeRegion(kind="function", name="MyClass.method", start=30, lines={34, 35, 36}),
+ CodeRegion(kind="class", name="MyClass", start=25, lines={34, 35, 36}),
+ ]
+
+ The line numbers will include comments and blank lines. Later processing
+ will need to ignore those lines as needed.
+
+ Nested functions and classes are excluded from their enclosing region. No
+ line should be reported as being part of more than one function, or more
+ than one class. Lines in methods are reported as being in a function and
+ in a class.
+
+ """
+ rf = RegionFinder()
+ rf.parse_source(source)
+ return rf.regions
diff --git a/coverage/report_core.py b/coverage/report_core.py
index f6bb1f373..db0e7b280 100644
--- a/coverage/report_core.py
+++ b/coverage/report_core.py
@@ -81,23 +81,23 @@ def get_analysis_to_report(
`Analysis` for the morf.
"""
- file_reporters = coverage._get_file_reporters(morfs)
+ fr_morfs = coverage._get_file_reporters(morfs)
config = coverage.config
if config.report_include:
matcher = GlobMatcher(prep_patterns(config.report_include), "report_include")
- file_reporters = [fr for fr in file_reporters if matcher.match(fr.filename)]
+ fr_morfs = [(fr, morf) for (fr, morf) in fr_morfs if matcher.match(fr.filename)]
if config.report_omit:
matcher = GlobMatcher(prep_patterns(config.report_omit), "report_omit")
- file_reporters = [fr for fr in file_reporters if not matcher.match(fr.filename)]
+ fr_morfs = [(fr, morf) for (fr, morf) in fr_morfs if not matcher.match(fr.filename)]
- if not file_reporters:
+ if not fr_morfs:
raise NoDataError("No data to report.")
- for fr in sorted(file_reporters):
+ for fr, morf in sorted(fr_morfs):
try:
- analysis = coverage._analyze(fr)
+ analysis = coverage._analyze(morf)
except NotPython:
# Only report errors for .py files, and only if we didn't
# explicitly suppress those errors.
diff --git a/coverage/results.py b/coverage/results.py
index 45cc4f198..755c42e3c 100644
--- a/coverage/results.py
+++ b/coverage/results.py
@@ -6,10 +6,11 @@
from __future__ import annotations
import collections
+import dataclasses
-from typing import Callable, Iterable, TYPE_CHECKING
+from collections.abc import Container
+from typing import Iterable, TYPE_CHECKING
-from coverage.debug import auto_repr
from coverage.exceptions import ConfigError
from coverage.misc import nice_pair
from coverage.types import TArc, TLineNo
@@ -19,45 +20,73 @@
from coverage.plugin import FileReporter
+def analysis_from_file_reporter(
+ data: CoverageData,
+ precision: int,
+ file_reporter: FileReporter,
+ filename: str,
+) -> Analysis:
+ """Create an Analysis from a FileReporter."""
+ has_arcs = data.has_arcs()
+ statements = file_reporter.lines()
+ excluded = file_reporter.excluded_lines()
+ executed = file_reporter.translate_lines(data.lines(filename) or [])
+
+ if has_arcs:
+ _arc_possibilities_set = file_reporter.arcs()
+ _arcs_executed_set = file_reporter.translate_arcs(data.arcs(filename) or [])
+ exit_counts = file_reporter.exit_counts()
+ no_branch = file_reporter.no_branch_lines()
+ else:
+ _arc_possibilities_set = set()
+ _arcs_executed_set = set()
+ exit_counts = {}
+ no_branch = set()
+
+ return Analysis(
+ precision=precision,
+ filename=filename,
+ has_arcs=has_arcs,
+ statements=statements,
+ excluded=excluded,
+ executed=executed,
+ _arc_possibilities_set=_arc_possibilities_set,
+ _arcs_executed_set=_arcs_executed_set,
+ exit_counts=exit_counts,
+ no_branch=no_branch,
+ )
+
+
+@dataclasses.dataclass
class Analysis:
"""The results of analyzing a FileReporter."""
- def __init__(
- self,
- data: CoverageData,
- precision: int,
- file_reporter: FileReporter,
- file_mapper: Callable[[str], str],
- ) -> None:
- self.data = data
- self.file_reporter = file_reporter
- self.filename = file_mapper(self.file_reporter.filename)
- self.statements = self.file_reporter.lines()
- self.excluded = self.file_reporter.excluded_lines()
-
- # Identify missing statements.
- executed: Iterable[TLineNo]
- executed = self.data.lines(self.filename) or []
- executed = self.file_reporter.translate_lines(executed)
- self.executed = executed
+ precision: int
+ filename: str
+ has_arcs: bool
+ statements: set[TLineNo]
+ excluded: set[TLineNo]
+ executed: set[TLineNo]
+ _arc_possibilities_set: set[TArc]
+ _arcs_executed_set: set[TArc]
+ exit_counts: dict[TLineNo, int]
+ no_branch: set[TLineNo]
+
+ def __post_init__(self) -> None:
+ self.arc_possibilities = sorted(self._arc_possibilities_set)
+ self.arcs_executed = sorted(self._arcs_executed_set)
self.missing = self.statements - self.executed
- if self.data.has_arcs():
- self._arc_possibilities = sorted(self.file_reporter.arcs())
- self.exit_counts = self.file_reporter.exit_counts()
- self.no_branch = self.file_reporter.no_branch_lines()
+ if self.has_arcs:
n_branches = self._total_branches()
mba = self.missing_branch_arcs()
n_partial_branches = sum(len(v) for k,v in mba.items() if k not in self.missing)
n_missing_branches = sum(len(v) for k,v in mba.items())
else:
- self._arc_possibilities = []
- self.exit_counts = {}
- self.no_branch = set()
n_branches = n_partial_branches = n_missing_branches = 0
self.numbers = Numbers(
- precision=precision,
+ precision=self.precision,
n_files=1,
n_statements=len(self.statements),
n_excluded=len(self.excluded),
@@ -67,6 +96,50 @@ def __init__(
n_missing_branches=n_missing_branches,
)
+ def narrow(self, lines: Container[TLineNo]) -> Analysis:
+ """Create a narrowed Analysis.
+
+ The current analysis is copied to make a new one that only considers
+ the lines in `lines`.
+ """
+
+ statements = {lno for lno in self.statements if lno in lines}
+ excluded = {lno for lno in self.excluded if lno in lines}
+ executed = {lno for lno in self.executed if lno in lines}
+
+ if self.has_arcs:
+ _arc_possibilities_set = {
+ (a, b) for a, b in self._arc_possibilities_set
+ if a in lines or b in lines
+ }
+ _arcs_executed_set = {
+ (a, b) for a, b in self._arcs_executed_set
+ if a in lines or b in lines
+ }
+ exit_counts = {
+ lno: num for lno, num in self.exit_counts.items()
+ if lno in lines
+ }
+ no_branch = {lno for lno in self.no_branch if lno in lines}
+ else:
+ _arc_possibilities_set = set()
+ _arcs_executed_set = set()
+ exit_counts = {}
+ no_branch = set()
+
+ return Analysis(
+ precision=self.precision,
+ filename=self.filename,
+ has_arcs=self.has_arcs,
+ statements=statements,
+ excluded=excluded,
+ executed=executed,
+ _arc_possibilities_set=_arc_possibilities_set,
+ _arcs_executed_set=_arcs_executed_set,
+ exit_counts=exit_counts,
+ no_branch=no_branch,
+ )
+
def missing_formatted(self, branches: bool = False) -> str:
"""The missing line numbers, formatted nicely.
@@ -75,35 +148,18 @@ def missing_formatted(self, branches: bool = False) -> str:
If `branches` is true, includes the missing branch arcs also.
"""
- if branches and self.has_arcs():
+ if branches and self.has_arcs:
arcs = self.missing_branch_arcs().items()
else:
arcs = None
return format_lines(self.statements, self.missing, arcs=arcs)
- def has_arcs(self) -> bool:
- """Were arcs measured in this result?"""
- return self.data.has_arcs()
-
- def arc_possibilities(self) -> list[TArc]:
- """Returns a sorted list of the arcs in the code."""
- return self._arc_possibilities
-
- def arcs_executed(self) -> list[TArc]:
- """Returns a sorted list of the arcs actually executed in the code."""
- executed: Iterable[TArc]
- executed = self.data.arcs(self.filename) or []
- executed = self.file_reporter.translate_arcs(executed)
- return sorted(executed)
-
def arcs_missing(self) -> list[TArc]:
"""Returns a sorted list of the un-executed arcs in the code."""
- possible = self.arc_possibilities()
- executed = self.arcs_executed()
missing = (
- p for p in possible
- if p not in executed
+ p for p in self.arc_possibilities
+ if p not in self.arcs_executed
and p[0] not in self.no_branch
and p[1] not in self.excluded
)
@@ -111,16 +167,14 @@ def arcs_missing(self) -> list[TArc]:
def arcs_unpredicted(self) -> list[TArc]:
"""Returns a sorted list of the executed arcs missing from the code."""
- possible = self.arc_possibilities()
- executed = self.arcs_executed()
# Exclude arcs here which connect a line to itself. They can occur
# in executed data in some cases. This is where they can cause
# trouble, and here is where it's the least burden to remove them.
# Also, generators can somehow cause arcs from "enter" to "exit", so
# make sure we have at least one positive value.
unpredicted = (
- e for e in executed
- if e not in possible
+ e for e in self.arcs_executed
+ if e not in self.arc_possibilities
and e[0] != e[1]
and (e[0] > 0 or e[1] > 0)
)
@@ -154,10 +208,9 @@ def executed_branch_arcs(self) -> dict[TLineNo, list[TLineNo]]:
Returns {l1:[l2a,l2b,...], ...}
"""
- executed = self.arcs_executed()
branch_lines = set(self._branch_lines())
eba = collections.defaultdict(list)
- for l1, l2 in executed:
+ for l1, l2 in self.arcs_executed:
if l1 in branch_lines:
eba[l1].append(l2)
return eba
@@ -178,6 +231,7 @@ def branch_stats(self) -> dict[TLineNo, tuple[int, int]]:
return stats
+@dataclasses.dataclass
class Numbers:
"""The numerical results of measuring coverage.
@@ -186,38 +240,14 @@ class Numbers:
"""
- def __init__(
- self,
- precision: int = 0,
- n_files: int = 0,
- n_statements: int = 0,
- n_excluded: int = 0,
- n_missing: int = 0,
- n_branches: int = 0,
- n_partial_branches: int = 0,
- n_missing_branches: int = 0,
- ) -> None:
- assert 0 <= precision < 10
- self._precision = precision
- self._near0 = 1.0 / 10**precision
- self._near100 = 100.0 - self._near0
- self.n_files = n_files
- self.n_statements = n_statements
- self.n_excluded = n_excluded
- self.n_missing = n_missing
- self.n_branches = n_branches
- self.n_partial_branches = n_partial_branches
- self.n_missing_branches = n_missing_branches
-
- __repr__ = auto_repr
-
- def init_args(self) -> list[int]:
- """Return a list for __init__(*args) to recreate this object."""
- return [
- self._precision,
- self.n_files, self.n_statements, self.n_excluded, self.n_missing,
- self.n_branches, self.n_partial_branches, self.n_missing_branches,
- ]
+ precision: int = 0
+ n_files: int = 0
+ n_statements: int = 0
+ n_excluded: int = 0
+ n_missing: int = 0
+ n_branches: int = 0
+ n_partial_branches: int = 0
+ n_missing_branches: int = 0
@property
def n_executed(self) -> int:
@@ -248,30 +278,7 @@ def pc_covered_str(self) -> str:
result in either "0" or "100".
"""
- return self.display_covered(self.pc_covered)
-
- def display_covered(self, pc: float) -> str:
- """Return a displayable total percentage, as a string.
-
- Note that "0" is only returned when the value is truly zero, and "100"
- is only returned when the value is truly 100. Rounding can never
- result in either "0" or "100".
-
- """
- if 0 < pc < self._near0:
- pc = self._near0
- elif self._near100 < pc < 100:
- pc = self._near100
- else:
- pc = round(pc, self._precision)
- return "%.*f" % (self._precision, pc)
-
- def pc_str_width(self) -> int:
- """How many characters wide can pc_covered_str be?"""
- width = 3 # "100"
- if self._precision > 0:
- width += 1 + self._precision
- return width
+ return display_covered(self.pc_covered, self.precision)
@property
def ratio_covered(self) -> tuple[int, int]:
@@ -281,19 +288,16 @@ def ratio_covered(self) -> tuple[int, int]:
return numerator, denominator
def __add__(self, other: Numbers) -> Numbers:
- nums = Numbers(precision=self._precision)
- nums.n_files = self.n_files + other.n_files
- nums.n_statements = self.n_statements + other.n_statements
- nums.n_excluded = self.n_excluded + other.n_excluded
- nums.n_missing = self.n_missing + other.n_missing
- nums.n_branches = self.n_branches + other.n_branches
- nums.n_partial_branches = (
- self.n_partial_branches + other.n_partial_branches
+ return Numbers(
+ self.precision,
+ self.n_files + other.n_files,
+ self.n_statements + other.n_statements,
+ self.n_excluded + other.n_excluded,
+ self.n_missing + other.n_missing,
+ self.n_branches + other.n_branches,
+ self.n_partial_branches + other.n_partial_branches,
+ self.n_missing_branches + other.n_missing_branches,
)
- nums.n_missing_branches = (
- self.n_missing_branches + other.n_missing_branches
- )
- return nums
def __radd__(self, other: int) -> Numbers:
# Implementing 0+Numbers allows us to sum() a list of Numbers.
@@ -301,6 +305,24 @@ def __radd__(self, other: int) -> Numbers:
return self
+def display_covered(pc: float, precision: int) -> str:
+ """Return a displayable total percentage, as a string.
+
+ Note that "0" is only returned when the value is truly zero, and "100"
+ is only returned when the value is truly 100. Rounding can never
+ result in either "0" or "100".
+
+ """
+ near0 = 1.0 / 10 ** precision
+ if 0 < pc < near0:
+ pc = near0
+ elif (100.0 - near0) < pc < 100:
+ pc = 100.0 - near0
+ else:
+ pc = round(pc, precision)
+ return "%.*f" % (precision, pc)
+
+
def _line_ranges(
statements: Iterable[TLineNo],
lines: Iterable[TLineNo],
diff --git a/coverage/types.py b/coverage/types.py
index d2e0bb965..0f31adfd3 100644
--- a/coverage/types.py
+++ b/coverage/types.py
@@ -161,6 +161,7 @@ def get_plugin_options(self, plugin: str) -> TConfigSectionOut:
TSourceTokenLines = Iterable[List[Tuple[str, str]]]
+
## Plugins
class TPlugin(Protocol):
diff --git a/coverage/version.py b/coverage/version.py
index 10f4115ef..06cddd019 100644
--- a/coverage/version.py
+++ b/coverage/version.py
@@ -8,7 +8,7 @@
# version_info: same semantics as sys.version_info.
# _dev: the .devN suffix if any.
-version_info = (7, 4, 4, "final", 0)
+version_info = (7, 5, 0, "final", 0)
_dev = 0
diff --git a/doc/api_plugin.rst b/doc/api_plugin.rst
index 00acecbca..749553e59 100644
--- a/doc/api_plugin.rst
+++ b/doc/api_plugin.rst
@@ -32,3 +32,10 @@ The FileReporter class
.. autoclass:: FileReporter
:members:
:member-order: bysource
+
+The CodeRegion class
+--------------------
+
+.. autoclass:: CodeRegion
+ :members:
+ :member-order: bysource
diff --git a/doc/conf.py b/doc/conf.py
index 5bdcca17b..e9f6d080c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -67,11 +67,11 @@
# @@@ editable
copyright = "2009–2024, Ned Batchelder" # pylint: disable=redefined-builtin
# The short X.Y.Z version.
-version = "7.4.4"
+version = "7.5.0"
# The full version, including alpha/beta/rc tags.
-release = "7.4.4"
+release = "7.5.0"
# The date of release, in "monthname day, year" format.
-release_date = "March 14, 2024"
+release_date = "April 23, 2024"
# @@@ end
rst_epilog = f"""
diff --git a/doc/config.rst b/doc/config.rst
index 4485145c0..48bd74ee3 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -37,11 +37,10 @@ A different location for the configuration file can be specified with the
``--rcfile=FILE`` command line option or with the ``COVERAGE_RCFILE``
environment variable.
-Coverage.py will read settings from other usual configuration files if no other
-configuration file is used. It will automatically read from "setup.cfg" or
-"tox.ini" if they exist. In this case, the section names have "coverage:"
-prefixed, so the ``[run]`` options described below will be found in the
-``[coverage:run]`` section of the file.
+If ``.coveragerc`` doesn't exist and another file hasn't been specified, then
+coverage.py will look for settings in other common configuration files, in this
+order: setup.cfg, tox.ini, or pyproject.toml. The first file found with
+coverage.py settings will be used and other files won't be consulted.
Coverage.py will read from "pyproject.toml" if TOML support is available,
either because you are running on Python 3.11 or later, or because you
@@ -68,6 +67,10 @@ values on multiple lines.
Boolean values can be specified as ``on``, ``off``, ``true``, ``false``, ``1``,
or ``0`` and are case-insensitive.
+In setup.cfg or tox.ini, the section names have "coverage:" prefixed, so the
+``[run]`` options described below will be found in the ``[coverage:run]``
+section of the file.
+
TOML Syntax
...........
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 359d49fc1..2f3d3e2fb 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -66,14 +66,19 @@ these steps:
Running the tests
-----------------
+.. To get the test output:
+ # Resize terminal width to 95
+ % make sterile
+
+.. with COVERAGE_ONE_CORE=
+
The tests are written mostly as standard unittest-style tests, and are run with
pytest running under `tox`_::
$ python3 -m tox -e py38
- ROOT: tox-gh won't override envlist because tox is not running in GitHub Actions
- py38: wheel-0.40.0-py3-none-any.whl already present in /Users/nedbatchelder/Library/Application Support/virtualenv/wheel/3.8/embed/3/wheel.json
- py38: pip-23.1.2-py3-none-any.whl already present in /Users/nedbatchelder/Library/Application Support/virtualenv/wheel/3.8/embed/3/pip.json
- py38: setuptools-67.8.0-py3-none-any.whl already present in /Users/nedbatchelder/Library/Application Support/virtualenv/wheel/3.8/embed/3/setuptools.json
+ py38: wheel-0.43.0-py3-none-any.whl already present in /Users/ned/Library/Application Support/virtualenv/wheel/3.8/embed/3/wheel.json
+ py38: pip-24.0-py3-none-any.whl already present in /Users/ned/Library/Application Support/virtualenv/wheel/3.8/embed/3/pip.json
+ py38: setuptools-69.2.0-py3-none-any.whl already present in /Users/ned/Library/Application Support/virtualenv/wheel/3.8/embed/3/setuptools.json
py38: install_deps> python -m pip install -U -r requirements/pip.pip -r requirements/pytest.pip -r requirements/light-threads.pip
.pkg: install_requires> python -I -m pip install setuptools
.pkg: _optional_hooks> python /usr/local/virtualenvs/coverage/lib/python3.8/site-packages/pyproject_api/_backend.py True setuptools.build_meta
@@ -81,56 +86,60 @@ pytest running under `tox`_::
.pkg: install_requires_for_build_editable> python -I -m pip install wheel
.pkg: build_editable> python /usr/local/virtualenvs/coverage/lib/python3.8/site-packages/pyproject_api/_backend.py True setuptools.build_meta
py38: install_package_deps> python -m pip install -U 'tomli; python_full_version <= "3.11.0a6"'
- py38: install_package> python -m pip install -U --force-reinstall --no-deps .tox/.tmp/package/1/coverage-7.2.8a0.dev1-0.editable-cp38-cp38-macosx_13_0_x86_64.whl
+ py38: install_package> python -m pip install -U --force-reinstall --no-deps .tox/.tmp/package/1/coverage-7.4.5a0.dev1-0.editable-cp38-cp38-macosx_14_0_arm64.whl
py38: commands[0]> python igor.py zip_mods
py38: commands[1]> python setup.py --quiet build_ext --inplace
+ ld: warning: duplicate -rpath '/usr/local/pyenv/pyenv/versions/3.8.18/lib' ignored
+ ld: warning: duplicate -rpath '/opt/homebrew/lib' ignored
py38: commands[2]> python -m pip install -q -e .
- py38: commands[3]> python igor.py test_with_tracer c
- === CPython 3.8.17 with C tracer (.tox/py38/bin/python) ===
+ py38: commands[3]> python igor.py test_with_core ctrace
+ === CPython 3.8.18 with C tracer (.tox/py38/bin/python) ===
bringing up nodes...
- ............................................................................................ [ 6%]
- ...................................x.....x...............s..s..s.s.......................... [ 13%]
- ............................................................................................ [ 20%]
- ............................................................................................ [ 27%]
- ............................................................................................ [ 34%]
- ............................................................................................ [ 41%]
- ............................................................................................ [ 47%]
- ............................................................................................ [ 54%]
- ........................................................s...........s....................... [ 61%]
- ............................................................................................ [ 68%]
- ..........s...........................s...........s......................................... [ 75%]
- ..................s...................s..............................................s...... [ 82%]
- ...............................s............................................................ [ 88%]
- ............................................................................................ [ 95%]
- .............................s............................. [100%]
- 1332 passed, 14 skipped, 2 xfailed in 60.54s (0:01:00)
+ ....................................................................................... [ 6%]
+ .....................................................x...x............s......s.s....s.. [ 12%]
+ ....................................................................................... [ 18%]
+ ....................................................................................... [ 25%]
+ ....................................................................................... [ 31%]
+ ....................................................................................... [ 37%]
+ ....................................................................................... [ 44%]
+ ....................................................................................... [ 50%]
+ ....................................................................................... [ 56%]
+ ........................s...........s.................................................. [ 63%]
+ ...........................................................................s........... [ 69%]
+ .................................s............s.s.................s.................... [ 75%]
+ ...........................................s........................................s.. [ 81%]
+ ................................s...................................................... [ 88%]
+ ....................................................................................... [ 94%]
+ ............................................................s................... [100%]
+ 1368 passed, 15 skipped, 2 xfailed in 13.10s
py38: commands[4]> python igor.py remove_extension
- py38: commands[5]> python igor.py test_with_tracer py
- === CPython 3.8.17 with Python tracer (.tox/py38/bin/python) ===
+ py38: commands[5]> python igor.py test_with_core pytrace
+ === CPython 3.8.18 with Python tracer (.tox/py38/bin/python) ===
bringing up nodes...
- ............................................................................................ [ 6%]
- .............................x.............................................................. [ 13%]
- ..ss...................................x.....................................ss............. [ 20%]
- ..........s.....................................ss...................s.................sss.. [ 27%]
- .ss.....s................................................................................... [ 34%]
- ............................................................................................ [ 41%]
- ....................................................................s....................... [ 47%]
- .....................................................................s..s.ss................ [ 54%]
- ...ss.sss.......................................................s........s........sss....... [ 61%]
- .ss...............s.s..................s.................s.s................................ [ 68%]
- ...........................................................................................s [ 75%]
- ........................................................s.......................s........... [ 82%]
- ....................ss.s........................ssss........................................ [ 88%]
- ............................................................................................ [ 95%]
- ................................s...............ss......... [100%]
- 1297 passed, 49 skipped, 2 xfailed in 44.59s
- .pkg: _exit> python /usr/local/virtualenvs/coverage/lib/python3.8/site-packages/pyproject_api/_backend.py True setuptools.build_meta
- py38: OK (143.82=setup[23.23]+cmd[0.29,1.60,8.43,61.64,0.34,48.28] seconds)
- congratulations :) (144.93 seconds)
-
-Tox runs the complete test suite twice for each version of Python you have
-installed. The first run uses the C implementation of the trace function,
-the second uses the Python implementation.
+ ....................................................................................... [ 6%]
+ ....................x..x.............................................s.ss...s.......... [ 12%]
+ ..........................................................................s.ss.s..s.... [ 18%]
+ s........s........s..s...s............................................................. [ 25%]
+ ................s...................................................................... [ 31%]
+ ...................s......ss..........................ssss...........................s. [ 37%]
+ ....................................................................................... [ 43%]
+ ....................................................................................... [ 50%]
+ .................................................................s..................... [ 56%]
+ ........s..s.........sss.s............................................................. [ 62%]
+ ...................................................................ss.................. [ 69%]
+ ..............................................ss...........s.s......................... [ 75%]
+ ................................ssssss................................................. [ 81%]
+ ......s...ss........ss................................................................. [ 88%]
+ .............................................s......................................... [ 94%]
+ .......................................................................ss....... [100%]
+ 1333 passed, 50 skipped, 2 xfailed in 11.17s
+ py38: OK (37.60=setup[9.10]+cmd[0.11,0.49,2.83,13.59,0.11,11.39] seconds)
+ congratulations :) (37.91 seconds)
+
+Tox runs the complete test suite a few times for each version of Python you
+have installed. The first run uses the C implementation of the trace function,
+the second uses the Python implementation. If `sys.monitoring`_ is available,
+the suite will be run again with that core.
To limit tox to just a few versions of Python, use the ``-e`` switch::
@@ -143,40 +152,40 @@ just a few tests, you can use `pytest test selectors`_::
$ python3 -m tox -- tests/test_misc.py::HasherTest
$ python3 -m tox -- tests/test_misc.py::HasherTest::test_string_hashing
+.. with COVERAGE_ONE_CORE=1
+
These commands run the tests in one file, one class, and just one test,
respectively. The pytest ``-k`` option selects tests based on a word in their
name, which can be very convenient for ad-hoc test selection. Of course you
can combine tox and pytest options::
$ python3 -m tox -q -e py310 -- -n 0 -vv -k hash
- === CPython 3.10.12 with C tracer (.tox/py310/bin/python) ===
- ======================================= test session starts ========================================
- platform darwin -- Python 3.10.12, pytest-7.3.2, pluggy-1.0.0 -- /Users/nedbatchelder/coverage/trunk/.tox/py310/bin/python
+ ================================== test session starts ===================================
+ platform darwin -- Python 3.10.13, pytest-8.1.1, pluggy-1.4.0 -- /Users/ned/coverage/trunk/.tox/py310/bin/python
cachedir: .tox/py310/.pytest_cache
- hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase('/Users/nedbatchelder/coverage/trunk/.hypothesis/examples')
- rootdir: /Users/nedbatchelder/coverage/trunk
+ hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase(PosixPath('/Users/ned/coverage/trunk/.hypothesis/examples'))
+ rootdir: /Users/ned/coverage/trunk
configfile: pyproject.toml
- plugins: hypothesis-6.78.3, flaky-3.7.0, xdist-3.3.1
- collected 1348 items / 1338 deselected / 10 selected
+ plugins: flaky-3.8.1, xdist-3.5.0, hypothesis-6.99.6
+ collected 1385 items / 1375 deselected / 10 selected
run-last-failure: no previously failed tests, not deselecting items.
- tests/test_data.py::CoverageDataTest::test_add_to_hash_with_lines PASSED [ 10%]
- tests/test_data.py::CoverageDataTest::test_add_to_hash_with_arcs PASSED [ 20%]
- tests/test_data.py::CoverageDataTest::test_add_to_lines_hash_with_missing_file PASSED [ 30%]
- tests/test_data.py::CoverageDataTest::test_add_to_arcs_hash_with_missing_file PASSED [ 40%]
- tests/test_execfile.py::RunPycFileTest::test_running_hashed_pyc PASSED [ 50%]
- tests/test_misc.py::HasherTest::test_string_hashing PASSED [ 60%]
- tests/test_misc.py::HasherTest::test_bytes_hashing PASSED [ 70%]
- tests/test_misc.py::HasherTest::test_unicode_hashing PASSED [ 80%]
- tests/test_misc.py::HasherTest::test_dict_hashing PASSED [ 90%]
- tests/test_misc.py::HasherTest::test_dict_collision PASSED [100%]
+ tests/test_data.py::CoverageDataTest::test_add_to_hash_with_lines PASSED [ 10%]
+ tests/test_data.py::CoverageDataTest::test_add_to_hash_with_arcs PASSED [ 20%]
+ tests/test_data.py::CoverageDataTest::test_add_to_lines_hash_with_missing_file PASSED [ 30%]
+ tests/test_data.py::CoverageDataTest::test_add_to_arcs_hash_with_missing_file PASSED [ 40%]
+ tests/test_execfile.py::RunPycFileTest::test_running_hashed_pyc PASSED [ 50%]
+ tests/test_misc.py::HasherTest::test_string_hashing PASSED [ 60%]
+ tests/test_misc.py::HasherTest::test_bytes_hashing PASSED [ 70%]
+ tests/test_misc.py::HasherTest::test_unicode_hashing PASSED [ 80%]
+ tests/test_misc.py::HasherTest::test_dict_hashing PASSED [ 90%]
+ tests/test_misc.py::HasherTest::test_dict_collision PASSED [100%]
- =============================== 10 passed, 1338 deselected in 2.24s ================================
- Skipping tests with Python tracer: Only one tracer: no Python tracer for CPython
- py310: OK (17.99 seconds)
- congratulations :) (19.09 seconds)
+ ========================== 10 passed, 1375 deselected in 0.60s ===========================
+ Skipping tests with Python tracer: Only one core: not running pytrace
+ py310: OK (6.41 seconds)
+ congratulations :) (6.72 seconds)
-TODO: Update this for CORE instead of TRACER
You can also affect the test runs with environment variables:
@@ -190,7 +199,7 @@ You can also affect the test runs with environment variables:
- ``ctrace`` is a sys.settrace function implemented in C.
- ``pytrace`` is a sys.settrace function implemented in Python.
- - ``sysmon`` is a sys.monitoring implementation.
+ - ``sysmon`` is a `sys.monitoring`_ implementation.
- ``COVERAGE_AST_DUMP=1`` will dump the AST tree as it is being used during
code parsing.
@@ -201,8 +210,6 @@ as a simple terminal interface to see and set them.
Of course, run all the tests on every version of Python you have before
submitting a change.
-.. _pytest test selectors: https://doc.pytest.org/en/stable/usage.html#specifying-which-tests-to-run
-
Lint, etc
---------
@@ -287,3 +294,5 @@ fixes. If you need help writing tests, please ask.
.. _tox: https://tox.readthedocs.io/
.. _black: https://pypi.org/project/black/
.. _set_env.py: https://nedbatchelder.com/blog/201907/set_envpy.html
+.. _pytest test selectors: https://doc.pytest.org/en/stable/usage.html#specifying-which-tests-to-run
+.. _sys.monitoring: https://docs.python.org/3/library/sys.monitoring.html
diff --git a/doc/index.rst b/doc/index.rst
index 9ebcde8c5..4a49ed360 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -18,7 +18,7 @@ supported on:
.. PYVERSIONS
-* Python 3.8 through 3.12, and 3.13.0a3 and up.
+* Python 3.8 through 3.12, and 3.13.0a6 and up.
* PyPy3 versions 3.8 through 3.10.
.. ifconfig:: prerelease
diff --git a/doc/sample_html/class_index.html b/doc/sample_html/class_index.html
new file mode 100644
index 000000000..a2ce83656
--- /dev/null
+++ b/doc/sample_html/class_index.html
@@ -0,0 +1,553 @@
+
+
+
+
+
Cog coverage
+
+
+
+
+
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/doc/sample_html/coverage_html.js b/doc/sample_html/coverage_html.js
index 593488286..a28c1bef8 100644
--- a/doc/sample_html/coverage_html.js
+++ b/doc/sample_html/coverage_html.js
@@ -36,11 +36,12 @@ function on_click(sel, fn) {
function getCellValue(row, column = 0) {
const cell = row.cells[column] // nosemgrep: eslint.detect-object-injection
if (cell.childElementCount == 1) {
- const child = cell.firstElementChild
- if (child instanceof HTMLTimeElement && child.dateTime) {
- return child.dateTime
- } else if (child instanceof HTMLDataElement && child.value) {
- return child.value
+ var child = cell.firstElementChild;
+ if (child.tagName === "A") {
+ child = child.firstElementChild;
+ }
+ if (child instanceof HTMLDataElement && child.value) {
+ return child.value;
}
}
return cell.innerText || cell.textContent;
@@ -50,28 +51,37 @@ function rowComparator(rowA, rowB, column = 0) {
let valueA = getCellValue(rowA, column);
let valueB = getCellValue(rowB, column);
if (!isNaN(valueA) && !isNaN(valueB)) {
- return valueA - valueB
+ return valueA - valueB;
}
return valueA.localeCompare(valueB, undefined, {numeric: true});
}
function sortColumn(th) {
// Get the current sorting direction of the selected header,
- // clear state on other headers and then set the new sorting direction
+ // clear state on other headers and then set the new sorting direction.
const currentSortOrder = th.getAttribute("aria-sort");
[...th.parentElement.cells].forEach(header => header.setAttribute("aria-sort", "none"));
+ var direction;
if (currentSortOrder === "none") {
- th.setAttribute("aria-sort", th.dataset.defaultSortOrder || "ascending");
- } else {
- th.setAttribute("aria-sort", currentSortOrder === "ascending" ? "descending" : "ascending");
+ direction = th.dataset.defaultSortOrder || "ascending";
+ }
+ else if (currentSortOrder === "ascending") {
+ direction = "descending";
+ }
+ else {
+ direction = "ascending";
}
+ th.setAttribute("aria-sort", direction);
const column = [...th.parentElement.cells].indexOf(th)
- // Sort all rows and afterwards append them in order to move them in the DOM
+ // Sort all rows and afterwards append them in order to move them in the DOM.
Array.from(th.closest("table").querySelectorAll("tbody tr"))
- .sort((rowA, rowB) => rowComparator(rowA, rowB, column) * (th.getAttribute("aria-sort") === "ascending" ? 1 : -1))
- .forEach(tr => tr.parentElement.appendChild(tr) );
+ .sort((rowA, rowB) => rowComparator(rowA, rowB, column) * (direction === "ascending" ? 1 : -1))
+ .forEach(tr => tr.parentElement.appendChild(tr));
+
+ // Save the sort order for next time.
+ localStorage.setItem(coverage.INDEX_SORT_STORAGE, JSON.stringify({column, direction}));
}
// Find all the elements with data-shortcut attribute, and use them to assign a shortcut key.
@@ -96,15 +106,40 @@ coverage.wire_up_filter = function () {
const no_rows = document.getElementById("no_rows");
// Observe filter keyevents.
- document.getElementById("filter").addEventListener("input", debounce(event => {
+ const filter_handler = (event => {
// Keep running total of each metric, first index contains number of shown rows
const totals = new Array(table.rows[0].cells.length).fill(0);
// Accumulate the percentage as fraction
totals[totals.length - 1] = { "numer": 0, "denom": 0 }; // nosemgrep: eslint.detect-object-injection
+ var text = document.getElementById("filter").value;
+ const casefold = (text === text.toLowerCase());
+ const hide100 = document.getElementById("hide100").checked;
+
// Hide / show elements.
table_body_rows.forEach(row => {
- if (!row.cells[0].textContent.includes(event.target.value)) {
+ var show = false;
+ // Check the text filter.
+ for (let column = 0; column < totals.length; column++) {
+ cell = row.cells[column];
+ if (cell.classList.contains("name")) {
+ var celltext = cell.textContent;
+ if (casefold) {
+ celltext = celltext.toLowerCase();
+ }
+ if (celltext.includes(text)) {
+ show = true;
+ }
+ }
+ }
+
+ // Check the "hide covered" filter.
+ if (show && hide100) {
+ const [numer, denom] = row.cells[row.cells.length - 1].dataset.ratio.split(" ");
+ show = (numer !== denom);
+ }
+
+ if (!show) {
// hide
row.classList.add("hidden");
return;
@@ -114,15 +149,19 @@ coverage.wire_up_filter = function () {
row.classList.remove("hidden");
totals[0]++;
- for (let column = 1; column < totals.length; column++) {
+ for (let column = 0; column < totals.length; column++) {
// Accumulate dynamic totals
cell = row.cells[column] // nosemgrep: eslint.detect-object-injection
+ if (cell.classList.contains("name")) {
+ continue;
+ }
if (column === totals.length - 1) {
// Last column contains percentage
const [numer, denom] = cell.dataset.ratio.split(" ");
totals[column]["numer"] += parseInt(numer, 10); // nosemgrep: eslint.detect-object-injection
totals[column]["denom"] += parseInt(denom, 10); // nosemgrep: eslint.detect-object-injection
- } else {
+ }
+ else {
totals[column] += parseInt(cell.textContent, 10); // nosemgrep: eslint.detect-object-injection
}
}
@@ -142,9 +181,12 @@ coverage.wire_up_filter = function () {
const footer = table.tFoot.rows[0];
// Calculate new dynamic sum values based on visible rows.
- for (let column = 1; column < totals.length; column++) {
+ for (let column = 0; column < totals.length; column++) {
// Get footer cell element.
const cell = footer.cells[column]; // nosemgrep: eslint.detect-object-injection
+ if (cell.classList.contains("name")) {
+ continue;
+ }
// Set value into dynamic footer cell element.
if (column === totals.length - 1) {
@@ -158,48 +200,47 @@ coverage.wire_up_filter = function () {
cell.textContent = denom
? `${(numer * 100 / denom).toFixed(places)}%`
: `${(100).toFixed(places)}%`;
- } else {
+ }
+ else {
cell.textContent = totals[column]; // nosemgrep: eslint.detect-object-injection
}
}
- }));
+ });
+
+ document.getElementById("filter").addEventListener("input", debounce(filter_handler));
+ document.getElementById("hide100").addEventListener("input", debounce(filter_handler));
// Trigger change event on setup, to force filter on page refresh
// (filter value may still be present).
document.getElementById("filter").dispatchEvent(new Event("input"));
+ document.getElementById("hide100").dispatchEvent(new Event("input"));
};
-coverage.INDEX_SORT_STORAGE = "COVERAGE_INDEX_SORT_2";
-
-// Loaded on index.html
-coverage.index_ready = function () {
- coverage.assign_shortkeys();
- coverage.wire_up_filter();
+// Set up the click-to-sort columns.
+coverage.wire_up_sorting = function () {
document.querySelectorAll("[data-sortable] th[aria-sort]").forEach(
th => th.addEventListener("click", e => sortColumn(e.target))
);
// Look for a localStorage item containing previous sort settings:
+ var column = 0, direction = "ascending";
const stored_list = localStorage.getItem(coverage.INDEX_SORT_STORAGE);
-
if (stored_list) {
- const {column, direction} = JSON.parse(stored_list);
- const th = document.querySelector("[data-sortable]").tHead.rows[0].cells[column]; // nosemgrep: eslint.detect-object-injection
- th.setAttribute("aria-sort", direction === "ascending" ? "descending" : "ascending");
- th.click()
+ ({column, direction} = JSON.parse(stored_list));
}
- // Watch for page unload events so we can save the final sort settings:
- window.addEventListener("unload", function () {
- const th = document.querySelector('[data-sortable] th[aria-sort="ascending"], [data-sortable] [aria-sort="descending"]');
- if (!th) {
- return;
- }
- localStorage.setItem(coverage.INDEX_SORT_STORAGE, JSON.stringify({
- column: [...th.parentElement.cells].indexOf(th),
- direction: th.getAttribute("aria-sort"),
- }));
- });
+ const th = document.querySelector("[data-sortable]").tHead.rows[0].cells[column]; // nosemgrep: eslint.detect-object-injection
+ th.setAttribute("aria-sort", direction === "ascending" ? "descending" : "ascending");
+ th.click()
+};
+
+coverage.INDEX_SORT_STORAGE = "COVERAGE_INDEX_SORT_2";
+
+// Loaded on index.html
+coverage.index_ready = function () {
+ coverage.assign_shortkeys();
+ coverage.wire_up_filter();
+ coverage.wire_up_sorting();
on_click(".button_prev_file", coverage.to_prev_file);
on_click(".button_next_file", coverage.to_next_file);
@@ -217,7 +258,8 @@ coverage.pyfile_ready = function () {
if (frag.length > 2 && frag[1] === "t") {
document.querySelector(frag).closest(".n").classList.add("highlight");
coverage.set_sel(parseInt(frag.substr(2), 10));
- } else {
+ }
+ else {
coverage.set_sel(0);
}
@@ -441,7 +483,8 @@ coverage.to_next_chunk_nicely = function () {
if (line.parentElement !== document.getElementById("source")) {
// The element is not a source line but the header or similar
coverage.select_line_or_chunk(1);
- } else {
+ }
+ else {
// We extract the line number from the id
coverage.select_line_or_chunk(parseInt(line.id.substring(1), 10));
}
@@ -460,7 +503,8 @@ coverage.to_prev_chunk_nicely = function () {
if (line.parentElement !== document.getElementById("source")) {
// The element is not a source line but the header or similar
coverage.select_line_or_chunk(coverage.lines_len);
- } else {
+ }
+ else {
// We extract the line number from the id
coverage.select_line_or_chunk(parseInt(line.id.substring(1), 10));
}
@@ -562,7 +606,8 @@ coverage.build_scroll_markers = function () {
if (line_number === previous_line + 1) {
// If this solid missed block just make previous mark higher.
last_mark.style.height = `${line_top + line_height - last_top}px`;
- } else {
+ }
+ else {
// Add colored line in scroll_marker block.
last_mark = document.createElement("div");
last_mark.id = `m${line_number}`;
@@ -590,7 +635,8 @@ coverage.wire_up_sticky_header = function () {
function updateHeader() {
if (window.scrollY > header_bottom) {
header.classList.add("sticky");
- } else {
+ }
+ else {
header.classList.remove("sticky");
}
}
@@ -618,7 +664,8 @@ coverage.expand_contexts = function (e) {
document.addEventListener("DOMContentLoaded", () => {
if (document.body.classList.contains("indexfile")) {
coverage.index_ready();
- } else {
+ }
+ else {
coverage.pyfile_ready();
}
});
diff --git a/doc/sample_html/function_index.html b/doc/sample_html/function_index.html
new file mode 100644
index 000000000..c24314733
--- /dev/null
+++ b/doc/sample_html/function_index.html
@@ -0,0 +1,2393 @@
+
+
+
+
+
Cog coverage
+
+
+
+
+
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/doc/sample_html/index.html b/doc/sample_html/index.html
index 900d30f98..5a6c4fcc3 100644
--- a/doc/sample_html/index.html
+++ b/doc/sample_html/index.html
@@ -1,11 +1,11 @@
-
+
Cog coverage
-
+
@@ -16,13 +16,13 @@ Cog coverage:
@@ -55,18 +64,18 @@
Cog coverage:
- | Module |
- statements |
- missing |
- excluded |
- branches |
- partial |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ branches |
+ partial |
+ coverage |
-
- | cogapp/__init__.py |
+
+ | cogapp/__init__.py |
1 |
0 |
0 |
@@ -74,8 +83,8 @@ Cog coverage:
| 0 |
100.00% |
-
- | cogapp/__main__.py |
+
+ | cogapp/__main__.py |
3 |
3 |
0 |
@@ -83,8 +92,8 @@ Cog coverage:
| 0 |
0.00% |
-
- | cogapp/cogapp.py |
+
+ | cogapp/cogapp.py |
483 |
228 |
1 |
@@ -92,8 +101,8 @@ Cog coverage:
| 28 |
46.74% |
-
- | cogapp/makefiles.py |
+
+ | cogapp/makefiles.py |
22 |
18 |
0 |
@@ -101,8 +110,8 @@ Cog coverage:
| 0 |
11.11% |
-
- | cogapp/test_cogapp.py |
+
+ | cogapp/test_cogapp.py |
854 |
598 |
2 |
@@ -110,8 +119,8 @@ Cog coverage:
| 1 |
29.50% |
-
- | cogapp/test_makefiles.py |
+
+ | cogapp/test_makefiles.py |
68 |
51 |
0 |
@@ -119,8 +128,8 @@ Cog coverage:
| 0 |
22.97% |
-
- | cogapp/test_whiteutils.py |
+
+ | cogapp/test_whiteutils.py |
68 |
50 |
0 |
@@ -128,8 +137,8 @@ Cog coverage:
| 0 |
26.47% |
-
- | cogapp/utils.py |
+
+ | cogapp/utils.py |
37 |
8 |
0 |
@@ -137,8 +146,8 @@ Cog coverage:
| 2 |
76.74% |
-
- | cogapp/whiteutils.py |
+
+ | cogapp/whiteutils.py |
43 |
5 |
0 |
@@ -166,16 +175,16 @@ Cog coverage:
diff --git a/doc/sample_html/status.json b/doc/sample_html/status.json
index 80fdc4fad..cd72fa04c 100644
--- a/doc/sample_html/status.json
+++ b/doc/sample_html/status.json
@@ -1 +1 @@
-{"note":"This file is an internal implementation detail to speed up HTML report generation. Its format can change at any time. You might be looking for the JSON report: https://coverage.rtfd.io/cmd.html#cmd-json","format":2,"version":"7.4.4","globals":"93b51f0c694fe02b0939ee4dd75fe224","files":{"d_7b071bdc2a35fa80___init___py":{"hash":"669207c1fb29be3e8be6ce0639506cab","index":{"nums":[2,1,1,0,0,0,0,0],"html_filename":"d_7b071bdc2a35fa80___init___py.html","relative_filename":"cogapp/__init__.py"}},"d_7b071bdc2a35fa80___main___py":{"hash":"6d9d0d551879aa3e73791f40c5739845","index":{"nums":[2,1,3,0,3,0,0,0],"html_filename":"d_7b071bdc2a35fa80___main___py.html","relative_filename":"cogapp/__main__.py"}},"d_7b071bdc2a35fa80_cogapp_py":{"hash":"3b620625b0506d140beda5c04a03a961","index":{"nums":[2,1,483,1,228,208,28,140],"html_filename":"d_7b071bdc2a35fa80_cogapp_py.html","relative_filename":"cogapp/cogapp.py"}},"d_7b071bdc2a35fa80_makefiles_py":{"hash":"e73ea90ac9a2e7af9d1fdb188ea22dfe","index":{"nums":[2,1,22,0,18,14,0,14],"html_filename":"d_7b071bdc2a35fa80_makefiles_py.html","relative_filename":"cogapp/makefiles.py"}},"d_7b071bdc2a35fa80_test_cogapp_py":{"hash":"f7e93bafb25b733e134d8c75e2d3cc24","index":{"nums":[2,1,854,2,598,24,1,21],"html_filename":"d_7b071bdc2a35fa80_test_cogapp_py.html","relative_filename":"cogapp/test_cogapp.py"}},"d_7b071bdc2a35fa80_test_makefiles_py":{"hash":"b2e0cdd09c01a8b0e4bdae02e1cfa856","index":{"nums":[2,1,68,0,51,6,0,6],"html_filename":"d_7b071bdc2a35fa80_test_makefiles_py.html","relative_filename":"cogapp/test_makefiles.py"}},"d_7b071bdc2a35fa80_test_whiteutils_py":{"hash":"4511a89ca54b865d6397d6b7d315c35c","index":{"nums":[2,1,68,0,50,0,0,0],"html_filename":"d_7b071bdc2a35fa80_test_whiteutils_py.html","relative_filename":"cogapp/test_whiteutils.py"}},"d_7b071bdc2a35fa80_utils_py":{"hash":"f8df213bfbf38327877cdb9699b0ec41","index":{"nums":[2,1,37,0,8,6,2,2],"html_filename":"d_7b071bdc2a35fa80_utils_py.html","relative_filename":"cogapp/utils.py"}},"d_7b071bdc2a35fa80_whiteutils_py":{"hash":"c68cfd051fc76896fdb23127cf2ca0ea","index":{"nums":[2,1,43,0,5,34,4,4],"html_filename":"d_7b071bdc2a35fa80_whiteutils_py.html","relative_filename":"cogapp/whiteutils.py"}}}}
\ No newline at end of file
+{"note":"This file is an internal implementation detail to speed up HTML report generation. Its format can change at any time. You might be looking for the JSON report: https://coverage.rtfd.io/cmd.html#cmd-json","format":5,"version":"7.5.0","globals":"6209e941d022650f2b874068b895003a","files":{"z_7b071bdc2a35fa80___init___py":{"hash":"669207c1fb29be3e8be6ce0639506cab","index":{"url":"z_7b071bdc2a35fa80___init___py.html","file":"cogapp/__init__.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":1,"n_excluded":0,"n_missing":0,"n_branches":0,"n_partial_branches":0,"n_missing_branches":0}}},"z_7b071bdc2a35fa80___main___py":{"hash":"6d9d0d551879aa3e73791f40c5739845","index":{"url":"z_7b071bdc2a35fa80___main___py.html","file":"cogapp/__main__.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":3,"n_excluded":0,"n_missing":3,"n_branches":0,"n_partial_branches":0,"n_missing_branches":0}}},"z_7b071bdc2a35fa80_cogapp_py":{"hash":"3b620625b0506d140beda5c04a03a961","index":{"url":"z_7b071bdc2a35fa80_cogapp_py.html","file":"cogapp/cogapp.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":483,"n_excluded":1,"n_missing":228,"n_branches":208,"n_partial_branches":28,"n_missing_branches":140}}},"z_7b071bdc2a35fa80_makefiles_py":{"hash":"e73ea90ac9a2e7af9d1fdb188ea22dfe","index":{"url":"z_7b071bdc2a35fa80_makefiles_py.html","file":"cogapp/makefiles.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":22,"n_excluded":0,"n_missing":18,"n_branches":14,"n_partial_branches":0,"n_missing_branches":14}}},"z_7b071bdc2a35fa80_test_cogapp_py":{"hash":"f7e93bafb25b733e134d8c75e2d3cc24","index":{"url":"z_7b071bdc2a35fa80_test_cogapp_py.html","file":"cogapp/test_cogapp.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":854,"n_excluded":2,"n_missing":598,"n_branches":24,"n_partial_branches":1,"n_missing_branches":21}}},"z_7b071bdc2a35fa80_test_makefiles_py":{"hash":"b2e0cdd09c01a8b0e4bdae02e1cfa856","index":{"url":"z_7b071bdc2a35fa80_test_makefiles_py.html","file":"cogapp/test_makefiles.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":68,"n_excluded":0,"n_missing":51,"n_branches":6,"n_partial_branches":0,"n_missing_branches":6}}},"z_7b071bdc2a35fa80_test_whiteutils_py":{"hash":"4511a89ca54b865d6397d6b7d315c35c","index":{"url":"z_7b071bdc2a35fa80_test_whiteutils_py.html","file":"cogapp/test_whiteutils.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":68,"n_excluded":0,"n_missing":50,"n_branches":0,"n_partial_branches":0,"n_missing_branches":0}}},"z_7b071bdc2a35fa80_utils_py":{"hash":"f8df213bfbf38327877cdb9699b0ec41","index":{"url":"z_7b071bdc2a35fa80_utils_py.html","file":"cogapp/utils.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":37,"n_excluded":0,"n_missing":8,"n_branches":6,"n_partial_branches":2,"n_missing_branches":2}}},"z_7b071bdc2a35fa80_whiteutils_py":{"hash":"c68cfd051fc76896fdb23127cf2ca0ea","index":{"url":"z_7b071bdc2a35fa80_whiteutils_py.html","file":"cogapp/whiteutils.py","description":"","nums":{"precision":2,"n_files":1,"n_statements":43,"n_excluded":0,"n_missing":5,"n_branches":34,"n_partial_branches":4,"n_missing_branches":4}}}}}
\ No newline at end of file
diff --git a/doc/sample_html/style.css b/doc/sample_html/style.css
index aec9cbef2..3cdaf05a3 100644
--- a/doc/sample_html/style.css
+++ b/doc/sample_html/style.css
@@ -22,7 +22,7 @@ td { vertical-align: top; }
table tr.hidden { display: none !important; }
-p#no_rows { display: none; font-size: 1.2em; }
+p#no_rows { display: none; font-size: 1.15em; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; }
a.nav { text-decoration: none; color: inherit; }
@@ -40,6 +40,18 @@ header .content { padding: 1rem 3.5rem; }
header h2 { margin-top: .5em; font-size: 1em; }
+header h2 a.button { font-family: inherit; font-size: inherit; border: 1px solid; border-radius: .2em; background: #eee; color: inherit; text-decoration: none; padding: .1em .5em; margin: 1px calc(.1em + 1px); cursor: pointer; border-color: #ccc; }
+
+@media (prefers-color-scheme: dark) { header h2 a.button { background: #333; } }
+
+@media (prefers-color-scheme: dark) { header h2 a.button { border-color: #444; } }
+
+header h2 a.button.current { border: 2px solid; background: #fff; border-color: #999; cursor: default; }
+
+@media (prefers-color-scheme: dark) { header h2 a.button.current { background: #1e1e1e; } }
+
+@media (prefers-color-scheme: dark) { header h2 a.button.current { border-color: #777; } }
+
header p.text { margin: .5em 0 -.5em; color: #666; font-style: italic; }
@media (prefers-color-scheme: dark) { header p.text { color: #aaa; } }
@@ -68,19 +80,29 @@ footer .content { padding: 0; color: #666; font-style: italic; }
h1 { font-size: 1.25em; display: inline-block; }
-#filter_container { float: right; margin: 0 2em 0 0; }
+#filter_container { float: right; margin: 0 2em 0 0; line-height: 1.66em; }
+
+#filter_container #filter { width: 10em; padding: 0.2em 0.5em; border: 2px solid #ccc; background: #fff; color: #000; }
-#filter_container input { width: 10em; padding: 0.2em 0.5em; border: 2px solid #ccc; background: #fff; color: #000; }
+@media (prefers-color-scheme: dark) { #filter_container #filter { border-color: #444; } }
-@media (prefers-color-scheme: dark) { #filter_container input { border-color: #444; } }
+@media (prefers-color-scheme: dark) { #filter_container #filter { background: #1e1e1e; } }
-@media (prefers-color-scheme: dark) { #filter_container input { background: #1e1e1e; } }
+@media (prefers-color-scheme: dark) { #filter_container #filter { color: #eee; } }
-@media (prefers-color-scheme: dark) { #filter_container input { color: #eee; } }
+#filter_container #filter:focus { border-color: #007acc; }
-#filter_container input:focus { border-color: #007acc; }
+#filter_container :disabled ~ label { color: #ccc; }
-header button { font-family: inherit; font-size: inherit; border: 1px solid; border-radius: .2em; color: inherit; padding: .1em .5em; margin: 1px calc(.1em + 1px); cursor: pointer; border-color: #ccc; }
+@media (prefers-color-scheme: dark) { #filter_container :disabled ~ label { color: #444; } }
+
+#filter_container label { font-size: .875em; color: #666; }
+
+@media (prefers-color-scheme: dark) { #filter_container label { color: #aaa; } }
+
+header button { font-family: inherit; font-size: inherit; border: 1px solid; border-radius: .2em; background: #eee; color: inherit; text-decoration: none; padding: .1em .5em; margin: 1px calc(.1em + 1px); cursor: pointer; border-color: #ccc; }
+
+@media (prefers-color-scheme: dark) { header button { background: #333; } }
@media (prefers-color-scheme: dark) { header button { border-color: #444; } }
@@ -266,13 +288,13 @@ kbd { border: 1px solid black; border-color: #888 #333 #333 #888; padding: .1em
#index table.index { margin-left: -.5em; }
-#index td, #index th { text-align: right; width: 5em; padding: .25em .5em; border-bottom: 1px solid #eee; }
+#index td, #index th { text-align: right; padding: .25em .5em; border-bottom: 1px solid #eee; }
@media (prefers-color-scheme: dark) { #index td, #index th { border-color: #333; } }
-#index td.name, #index th.name { text-align: left; width: auto; }
+#index td.name, #index th.name { text-align: left; width: auto; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; min-width: 15em; }
-#index th { font-style: italic; color: #333; cursor: pointer; }
+#index th { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; font-style: italic; color: #333; cursor: pointer; }
@media (prefers-color-scheme: dark) { #index th { color: #ddd; } }
@@ -280,23 +302,29 @@ kbd { border: 1px solid black; border-color: #888 #333 #333 #888; padding: .1em
@media (prefers-color-scheme: dark) { #index th:hover { background: #333; } }
+#index th .arrows { color: #666; font-size: 85%; font-family: sans-serif; font-style: normal; pointer-events: none; }
+
#index th[aria-sort="ascending"], #index th[aria-sort="descending"] { white-space: nowrap; background: #eee; padding-left: .5em; }
@media (prefers-color-scheme: dark) { #index th[aria-sort="ascending"], #index th[aria-sort="descending"] { background: #333; } }
-#index th[aria-sort="ascending"]::after { font-family: sans-serif; content: " ↑"; }
+#index th[aria-sort="ascending"] .arrows::after { content: " ▲"; }
+
+#index th[aria-sort="descending"] .arrows::after { content: " ▼"; }
-#index th[aria-sort="descending"]::after { font-family: sans-serif; content: " ↓"; }
+#index td.name { font-size: 1.15em; }
#index td.name a { text-decoration: none; color: inherit; }
+#index td.name .no-noun { font-style: italic; }
+
#index tr.total td, #index tr.total_dynamic td { font-weight: bold; border-top: 1px solid #ccc; border-bottom: none; }
-#index tr.file:hover { background: #eee; }
+#index tr.region:hover { background: #eee; }
-@media (prefers-color-scheme: dark) { #index tr.file:hover { background: #333; } }
+@media (prefers-color-scheme: dark) { #index tr.region:hover { background: #333; } }
-#index tr.file:hover td.name { text-decoration: underline; color: inherit; }
+#index tr.region:hover td.name { text-decoration: underline; color: inherit; }
#scroll_marker { position: fixed; z-index: 3; right: 0; top: 0; width: 16px; height: 100%; background: #fff; border-left: 1px solid #eee; will-change: transform; }
diff --git a/doc/sample_html/d_7b071bdc2a35fa80___init___py.html b/doc/sample_html/z_7b071bdc2a35fa80___init___py.html
similarity index 87%
rename from doc/sample_html/d_7b071bdc2a35fa80___init___py.html
rename to doc/sample_html/z_7b071bdc2a35fa80___init___py.html
index 5e04da820..4a59bb133 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80___init___py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80___init___py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/__init__.py: 100.00%
-
+
@@ -93,12 +93,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80___main___py.html b/doc/sample_html/z_7b071bdc2a35fa80___main___py.html
similarity index 86%
rename from doc/sample_html/d_7b071bdc2a35fa80___main___py.html
rename to doc/sample_html/z_7b071bdc2a35fa80___main___py.html
index b1ecf249a..4b20354a2 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80___main___py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80___main___py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/__main__.py: 0.00%
-
+
@@ -93,12 +93,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80_cogapp_py.html b/doc/sample_html/z_7b071bdc2a35fa80_cogapp_py.html
similarity index 99%
rename from doc/sample_html/d_7b071bdc2a35fa80_cogapp_py.html
rename to doc/sample_html/z_7b071bdc2a35fa80_cogapp_py.html
index ef2bf64f0..fbef027b8 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80_cogapp_py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80_cogapp_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/cogapp.py: 46.74%
-
+
@@ -907,12 +907,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80_makefiles_py.html b/doc/sample_html/z_7b071bdc2a35fa80_makefiles_py.html
similarity index 94%
rename from doc/sample_html/d_7b071bdc2a35fa80_makefiles_py.html
rename to doc/sample_html/z_7b071bdc2a35fa80_makefiles_py.html
index 2515bd109..4efacbdf7 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80_makefiles_py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80_makefiles_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/makefiles.py: 11.11%
-
+
@@ -122,12 +122,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80_test_cogapp_py.html b/doc/sample_html/z_7b071bdc2a35fa80_test_cogapp_py.html
similarity index 99%
rename from doc/sample_html/d_7b071bdc2a35fa80_test_cogapp_py.html
rename to doc/sample_html/z_7b071bdc2a35fa80_test_cogapp_py.html
index 51bf9f244..b28701909 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80_test_cogapp_py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80_test_cogapp_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/test_cogapp.py: 29.50%
-
+
@@ -2742,12 +2742,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80_test_makefiles_py.html b/doc/sample_html/z_7b071bdc2a35fa80_test_makefiles_py.html
similarity index 97%
rename from doc/sample_html/d_7b071bdc2a35fa80_test_makefiles_py.html
rename to doc/sample_html/z_7b071bdc2a35fa80_test_makefiles_py.html
index 5cdc63122..f1a0d8d8a 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80_test_makefiles_py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80_test_makefiles_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/test_makefiles.py: 22.97%
-
+
@@ -201,12 +201,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80_test_whiteutils_py.html b/doc/sample_html/z_7b071bdc2a35fa80_test_whiteutils_py.html
similarity index 97%
rename from doc/sample_html/d_7b071bdc2a35fa80_test_whiteutils_py.html
rename to doc/sample_html/z_7b071bdc2a35fa80_test_whiteutils_py.html
index f2d07b840..94899ce53 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80_test_whiteutils_py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80_test_whiteutils_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/test_whiteutils.py: 26.47%
-
+
@@ -183,12 +183,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80_utils_py.html b/doc/sample_html/z_7b071bdc2a35fa80_utils_py.html
similarity index 96%
rename from doc/sample_html/d_7b071bdc2a35fa80_utils_py.html
rename to doc/sample_html/z_7b071bdc2a35fa80_utils_py.html
index fcd212415..36a49afc0 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80_utils_py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80_utils_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/utils.py: 76.74%
-
+
@@ -157,12 +157,12 @@
diff --git a/doc/sample_html/d_7b071bdc2a35fa80_whiteutils_py.html b/doc/sample_html/z_7b071bdc2a35fa80_whiteutils_py.html
similarity index 96%
rename from doc/sample_html/d_7b071bdc2a35fa80_whiteutils_py.html
rename to doc/sample_html/z_7b071bdc2a35fa80_whiteutils_py.html
index a2047f82c..d53030223 100644
--- a/doc/sample_html/d_7b071bdc2a35fa80_whiteutils_py.html
+++ b/doc/sample_html/z_7b071bdc2a35fa80_whiteutils_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for cogapp/whiteutils.py: 88.31%
-
+
@@ -153,12 +153,12 @@
diff --git a/pyproject.toml b/pyproject.toml
index 1752aa66c..7dc56333f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,8 +38,10 @@ no-docstring-rgx = "__.*__|test[A-Z_].*|setUp|_decorator|_wrapper|_.*__.*"
defining-attr-methods = [
"__init__",
"__new__",
+ "__post_init__",
"setUp",
"reset",
+ "_reset",
]
[tool.pylint.design]
@@ -142,7 +144,7 @@ balanced_clumps = [
# We aren't using ruff for real yet...
[tool.ruff]
-target-version = "py38" # Can't use [project]
+target-version = "py38" # Can't use [project]
line-length = 100
[tool.ruff.lint]
diff --git a/requirements/dev.pip b/requirements/dev.pip
index 46f4161c2..7c957f77c 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -8,7 +8,9 @@ astroid==3.1.0
# via pylint
attrs==23.2.0
# via hypothesis
-build==1.1.1
+backports-tarfile==1.1.0
+ # via jaraco-context
+build==1.2.1
# via check-manifest
cachetools==5.3.3
# via tox
@@ -33,13 +35,13 @@ distlib==0.3.8
# via virtualenv
docutils==0.20.1
# via readme-renderer
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
# via
# hypothesis
# pytest
-execnet==2.0.2
+execnet==2.1.1
# via pytest-xdist
-filelock==3.13.1
+filelock==3.13.4
# via
# tox
# virtualenv
@@ -47,26 +49,30 @@ flaky==3.8.1
# via -r requirements/pytest.in
greenlet==3.0.3
# via -r requirements/dev.in
-hypothesis==6.99.6
+hypothesis==6.100.1
# via -r requirements/pytest.in
-idna==3.6
+idna==3.7
# via requests
-importlib-metadata==7.0.2
+importlib-metadata==7.1.0
# via
# build
# keyring
# twine
-importlib-resources==6.3.0
+importlib-resources==6.4.0
# via keyring
iniconfig==2.0.0
# via pytest
isort==5.13.2
# via pylint
-jaraco-classes==3.3.1
+jaraco-classes==3.4.0
+ # via keyring
+jaraco-context==5.3.0
+ # via keyring
+jaraco-functools==4.0.1
# via keyring
jedi==0.19.1
# via pudb
-keyring==24.3.1
+keyring==25.1.0
# via twine
libsass==0.23.0
# via -r requirements/dev.in
@@ -77,8 +83,10 @@ mccabe==0.7.0
mdurl==0.1.2
# via markdown-it-py
more-itertools==10.2.0
- # via jaraco-classes
-nh3==0.2.15
+ # via
+ # jaraco-classes
+ # jaraco-functools
+nh3==0.2.17
# via readme-renderer
packaging==24.0
# via
@@ -87,7 +95,7 @@ packaging==24.0
# pyproject-api
# pytest
# tox
-parso==0.8.3
+parso==0.8.4
# via jedi
pkginfo==1.10.0
# via twine
@@ -96,7 +104,7 @@ platformdirs==4.2.0
# pylint
# tox
# virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
# via
# pytest
# tox
@@ -150,7 +158,7 @@ tomli==2.0.1
# tox
tomlkit==0.12.4
# via pylint
-tox==4.14.1
+tox==4.14.2
# via
# -r requirements/tox.in
# tox-gh
@@ -158,7 +166,7 @@ tox-gh==1.3.1
# via -r requirements/tox.in
twine==5.0.0
# via -r requirements/dev.in
-typing-extensions==4.10.0
+typing-extensions==4.11.0
# via
# astroid
# pylint
@@ -168,19 +176,19 @@ urllib3==2.2.1
# via
# requests
# twine
-urwid==2.6.9
+urwid==2.6.10
# via
# pudb
# urwid-readline
urwid-readline==0.14
# via pudb
-virtualenv==20.25.1
+virtualenv==20.25.3
# via
# -r requirements/pip.in
# tox
wcwidth==0.2.13
# via urwid
-zipp==3.18.0
+zipp==3.18.1
# via
# importlib-metadata
# importlib-resources
@@ -188,7 +196,7 @@ zipp==3.18.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
-setuptools==69.2.0
+setuptools==69.5.1
# via
# -r requirements/pip.in
# check-manifest
diff --git a/requirements/kit.pip b/requirements/kit.pip
index 4f9c187eb..b134d3ef2 100644
--- a/requirements/kit.pip
+++ b/requirements/kit.pip
@@ -10,7 +10,7 @@ bashlex==0.18
# via cibuildwheel
bracex==2.4
# via cibuildwheel
-build==1.1.1
+build==1.2.1
# via -r requirements/kit.in
certifi==2024.2.2
# via cibuildwheel
@@ -18,9 +18,9 @@ cibuildwheel==2.17.0
# via -r requirements/kit.in
colorama==0.4.6
# via -r requirements/kit.in
-filelock==3.13.1
+filelock==3.13.4
# via cibuildwheel
-importlib-metadata==7.0.2
+importlib-metadata==7.1.0
# via build
packaging==24.0
# via
@@ -38,13 +38,13 @@ tomli==2.0.1
# build
# cibuildwheel
# pyproject-hooks
-typing-extensions==4.10.0
+typing-extensions==4.11.0
# via cibuildwheel
wheel==0.43.0
# via -r requirements/kit.in
-zipp==3.18.0
+zipp==3.18.1
# via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
-setuptools==69.2.0
+setuptools==69.5.1
# via -r requirements/kit.in
diff --git a/requirements/light-threads.pip b/requirements/light-threads.pip
index a2a3f92dc..54492490c 100644
--- a/requirements/light-threads.pip
+++ b/requirements/light-threads.pip
@@ -8,7 +8,7 @@ cffi==1.16.0
# via -r requirements/light-threads.in
dnspython==2.6.1
# via eventlet
-eventlet==0.35.2
+eventlet==0.36.1
# via -r requirements/light-threads.in
gevent==24.2.1
# via -r requirements/light-threads.in
@@ -17,15 +17,15 @@ greenlet==3.0.3
# -r requirements/light-threads.in
# eventlet
# gevent
-pycparser==2.21
+pycparser==2.22
# via cffi
zope-event==5.0
# via gevent
-zope-interface==6.2
+zope-interface==6.3
# via gevent
# The following packages are considered to be unsafe in a requirements file:
-setuptools==69.2.0
+setuptools==69.5.1
# via
# zope-event
# zope-interface
diff --git a/requirements/mypy.pip b/requirements/mypy.pip
index 85d794482..4fc939231 100644
--- a/requirements/mypy.pip
+++ b/requirements/mypy.pip
@@ -8,15 +8,15 @@ attrs==23.2.0
# via hypothesis
colorama==0.4.6
# via -r requirements/pytest.in
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
# via
# hypothesis
# pytest
-execnet==2.0.2
+execnet==2.1.1
# via pytest-xdist
flaky==3.8.1
# via -r requirements/pytest.in
-hypothesis==6.99.6
+hypothesis==6.100.1
# via -r requirements/pytest.in
iniconfig==2.0.0
# via pytest
@@ -26,7 +26,7 @@ mypy-extensions==1.0.0
# via mypy
packaging==24.0
# via pytest
-pluggy==1.4.0
+pluggy==1.5.0
# via pytest
pygments==2.17.2
# via -r requirements/pytest.in
@@ -42,5 +42,5 @@ tomli==2.0.1
# via
# mypy
# pytest
-typing-extensions==4.10.0
+typing-extensions==4.11.0
# via mypy
diff --git a/requirements/pip-tools.pip b/requirements/pip-tools.pip
index 1b920320b..0d7fd4efc 100644
--- a/requirements/pip-tools.pip
+++ b/requirements/pip-tools.pip
@@ -4,11 +4,11 @@
#
# make upgrade
#
-build==1.1.1
+build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
-importlib-metadata==7.0.2
+importlib-metadata==7.1.0
# via build
packaging==24.0
# via build
@@ -25,11 +25,11 @@ tomli==2.0.1
# pyproject-hooks
wheel==0.43.0
# via pip-tools
-zipp==3.18.0
+zipp==3.18.1
# via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via pip-tools
-setuptools==69.2.0
+setuptools==69.5.1
# via pip-tools
diff --git a/requirements/pip.pip b/requirements/pip.pip
index 754f62a3f..396a0ee82 100644
--- a/requirements/pip.pip
+++ b/requirements/pip.pip
@@ -6,15 +6,15 @@
#
distlib==0.3.8
# via virtualenv
-filelock==3.13.1
+filelock==3.13.4
# via virtualenv
platformdirs==4.2.0
# via virtualenv
-virtualenv==20.25.1
+virtualenv==20.25.3
# via -r requirements/pip.in
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
-setuptools==69.2.0
+setuptools==69.5.1
# via -r requirements/pip.in
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
index 7850ef659..2c0465693 100644
--- a/requirements/pytest.pip
+++ b/requirements/pytest.pip
@@ -8,21 +8,21 @@ attrs==23.2.0
# via hypothesis
colorama==0.4.6
# via -r requirements/pytest.in
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
# via
# hypothesis
# pytest
-execnet==2.0.2
+execnet==2.1.1
# via pytest-xdist
flaky==3.8.1
# via -r requirements/pytest.in
-hypothesis==6.99.6
+hypothesis==6.100.1
# via -r requirements/pytest.in
iniconfig==2.0.0
# via pytest
packaging==24.0
# via pytest
-pluggy==1.4.0
+pluggy==1.5.0
# via pytest
pygments==2.17.2
# via -r requirements/pytest.in
diff --git a/requirements/tox.pip b/requirements/tox.pip
index b1098c25c..a9beb9d32 100644
--- a/requirements/tox.pip
+++ b/requirements/tox.pip
@@ -14,7 +14,7 @@ colorama==0.4.6
# tox
distlib==0.3.8
# via virtualenv
-filelock==3.13.1
+filelock==3.13.4
# via
# tox
# virtualenv
@@ -26,7 +26,7 @@ platformdirs==4.2.0
# via
# tox
# virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
# via tox
pyproject-api==1.6.1
# via tox
@@ -34,11 +34,11 @@ tomli==2.0.1
# via
# pyproject-api
# tox
-tox==4.14.1
+tox==4.14.2
# via
# -r requirements/tox.in
# tox-gh
tox-gh==1.3.1
# via -r requirements/tox.in
-virtualenv==20.25.1
+virtualenv==20.25.3
# via tox
diff --git a/tests/coveragetest.py b/tests/coveragetest.py
index 35734f30f..8d17860fb 100644
--- a/tests/coveragetest.py
+++ b/tests/coveragetest.py
@@ -239,12 +239,12 @@ def check_coverage(
if arcs is not None:
# print("Possible arcs:")
# print(" expected:", arcs)
- # print(" actual:", analysis.arc_possibilities())
+ # print(" actual:", analysis.arc_possibilities)
# print("Executed:")
- # print(" actual:", sorted(set(analysis.arcs_executed())))
+ # print(" actual:", sorted(set(analysis.arcs_executed)))
# TODO: this would be nicer with pytest-check, once we can run that.
msg = (
- self._check_arcs(arcs, analysis.arc_possibilities(), "Possible") +
+ self._check_arcs(arcs, analysis.arc_possibilities, "Possible") +
self._check_arcs(arcs_missing, analysis.arcs_missing(), "Missing") +
self._check_arcs(arcs_unpredicted, analysis.arcs_unpredicted(), "Unpredicted")
)
@@ -262,6 +262,7 @@ def check_coverage(
def make_data_file(
self,
basename: str | None = None,
+ *,
suffix: str | None = None,
lines: Mapping[str, Collection[TLineNo]] | None = None,
arcs: Mapping[str, Collection[TArc]] | None = None,
@@ -512,7 +513,7 @@ def get_missing_arc_description(self, cov: Coverage, start: TLineNo, end: TLineN
assert self.last_module_name is not None
filename = self.last_module_name + ".py"
fr = cov._get_file_reporter(filename)
- arcs_executed = cov._analyze(filename).arcs_executed()
+ arcs_executed = cov._analyze(filename).arcs_executed
return fr.missing_arc_description(start, end, arcs_executed)
diff --git a/tests/gold/annotate/anno_dir/d_80084bf2fba02475___init__.py,cover b/tests/gold/annotate/anno_dir/z_80084bf2fba02475___init__.py,cover
similarity index 100%
rename from tests/gold/annotate/anno_dir/d_80084bf2fba02475___init__.py,cover
rename to tests/gold/annotate/anno_dir/z_80084bf2fba02475___init__.py,cover
diff --git a/tests/gold/annotate/anno_dir/d_80084bf2fba02475_a.py,cover b/tests/gold/annotate/anno_dir/z_80084bf2fba02475_a.py,cover
similarity index 100%
rename from tests/gold/annotate/anno_dir/d_80084bf2fba02475_a.py,cover
rename to tests/gold/annotate/anno_dir/z_80084bf2fba02475_a.py,cover
diff --git a/tests/gold/annotate/anno_dir/d_b039179a8a4ce2c2___init__.py,cover b/tests/gold/annotate/anno_dir/z_b039179a8a4ce2c2___init__.py,cover
similarity index 100%
rename from tests/gold/annotate/anno_dir/d_b039179a8a4ce2c2___init__.py,cover
rename to tests/gold/annotate/anno_dir/z_b039179a8a4ce2c2___init__.py,cover
diff --git a/tests/gold/annotate/anno_dir/d_b039179a8a4ce2c2_b.py,cover b/tests/gold/annotate/anno_dir/z_b039179a8a4ce2c2_b.py,cover
similarity index 100%
rename from tests/gold/annotate/anno_dir/d_b039179a8a4ce2c2_b.py,cover
rename to tests/gold/annotate/anno_dir/z_b039179a8a4ce2c2_b.py,cover
diff --git a/tests/gold/html/a/a_py.html b/tests/gold/html/a/a_py.html
index 740327aec..fcb5ab42f 100644
--- a/tests/gold/html/a/a_py.html
+++ b/tests/gold/html/a/a_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for a.py: 67%
-
+
@@ -89,12 +89,12 @@
diff --git a/tests/gold/html/a/class_index.html b/tests/gold/html/a/class_index.html
new file mode 100644
index 000000000..ccf31848b
--- /dev/null
+++ b/tests/gold/html/a/class_index.html
@@ -0,0 +1,115 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | a.py |
+ (no class) |
+ 3 |
+ 1 |
+ 0 |
+ 67% |
+
+
+
+
+ | Total |
+ |
+ 3 |
+ 1 |
+ 0 |
+ 67% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/a/function_index.html b/tests/gold/html/a/function_index.html
new file mode 100644
index 000000000..401081a01
--- /dev/null
+++ b/tests/gold/html/a/function_index.html
@@ -0,0 +1,115 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ function |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | a.py |
+ (no function) |
+ 3 |
+ 1 |
+ 0 |
+ 67% |
+
+
+
+
+ | Total |
+ |
+ 3 |
+ 1 |
+ 0 |
+ 67% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/a/index.html b/tests/gold/html/a/index.html
index d7806cd65..d81014ef2 100644
--- a/tests/gold/html/a/index.html
+++ b/tests/gold/html/a/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,15 +62,15 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| a.py |
3 |
1 |
@@ -86,16 +95,16 @@ Coverage report:
diff --git a/tests/gold/html/b_branch/b_py.html b/tests/gold/html/b_branch/b_py.html
index 4b9229d1a..8d78784b7 100644
--- a/tests/gold/html/b_branch/b_py.html
+++ b/tests/gold/html/b_branch/b_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for b.py: 70%
-
+
@@ -113,12 +113,12 @@
diff --git a/tests/gold/html/b_branch/class_index.html b/tests/gold/html/b_branch/class_index.html
new file mode 100644
index 000000000..fc2ea6513
--- /dev/null
+++ b/tests/gold/html/b_branch/class_index.html
@@ -0,0 +1,123 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ branches |
+ partial |
+ coverage |
+
+
+
+
+ | b.py |
+ (no class) |
+ 6 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 6 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/b_branch/function_index.html b/tests/gold/html/b_branch/function_index.html
new file mode 100644
index 000000000..2d67b4b04
--- /dev/null
+++ b/tests/gold/html/b_branch/function_index.html
@@ -0,0 +1,153 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ function |
+ statements |
+ missing |
+ excluded |
+ branches |
+ partial |
+ coverage |
+
+
+
+
+ | b.py |
+ one |
+ 3 |
+ 1 |
+ 0 |
+ 2 |
+ 1 |
+ 60% |
+
+
+ | b.py |
+ two |
+ 2 |
+ 0 |
+ 0 |
+ 2 |
+ 1 |
+ 75% |
+
+
+ | b.py |
+ three |
+ 6 |
+ 2 |
+ 0 |
+ 2 |
+ 2 |
+ 50% |
+
+
+ | b.py |
+ (no function) |
+ 6 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 17 |
+ 3 |
+ 0 |
+ 6 |
+ 4 |
+ 70% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/b_branch/index.html b/tests/gold/html/b_branch/index.html
index 660a15244..cc559c184 100644
--- a/tests/gold/html/b_branch/index.html
+++ b/tests/gold/html/b_branch/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -55,17 +64,17 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- branches |
- partial |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ branches |
+ partial |
+ coverage |
-
+
| b.py |
17 |
3 |
@@ -94,16 +103,16 @@ Coverage report:
diff --git a/tests/gold/html/bom/bom_py.html b/tests/gold/html/bom/bom_py.html
index 187fd5235..0c15cc65c 100644
--- a/tests/gold/html/bom/bom_py.html
+++ b/tests/gold/html/bom/bom_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for bom.py: 100%
-
+
@@ -89,12 +89,12 @@
diff --git a/tests/gold/html/bom/class_index.html b/tests/gold/html/bom/class_index.html
new file mode 100644
index 000000000..de80cded8
--- /dev/null
+++ b/tests/gold/html/bom/class_index.html
@@ -0,0 +1,115 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | bom.py |
+ (no class) |
+ 3 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 3 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/bom/function_index.html b/tests/gold/html/bom/function_index.html
new file mode 100644
index 000000000..2e986c4e8
--- /dev/null
+++ b/tests/gold/html/bom/function_index.html
@@ -0,0 +1,115 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ function |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | bom.py |
+ (no function) |
+ 3 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 3 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/bom/index.html b/tests/gold/html/bom/index.html
index faca07f10..0a352c79d 100644
--- a/tests/gold/html/bom/index.html
+++ b/tests/gold/html/bom/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,15 +62,15 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| bom.py |
3 |
0 |
@@ -86,16 +95,16 @@ Coverage report:
diff --git a/tests/gold/html/contexts/class_index.html b/tests/gold/html/contexts/class_index.html
new file mode 100644
index 000000000..1e7915d43
--- /dev/null
+++ b/tests/gold/html/contexts/class_index.html
@@ -0,0 +1,115 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | two_tests.py |
+ (no class) |
+ 7 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 7 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/contexts/function_index.html b/tests/gold/html/contexts/function_index.html
new file mode 100644
index 000000000..22f3bb946
--- /dev/null
+++ b/tests/gold/html/contexts/function_index.html
@@ -0,0 +1,139 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/contexts/index.html b/tests/gold/html/contexts/index.html
index 05d6a457f..87a44c81f 100644
--- a/tests/gold/html/contexts/index.html
+++ b/tests/gold/html/contexts/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,15 +62,15 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| two_tests.py |
17 |
1 |
@@ -86,16 +95,16 @@ Coverage report:
diff --git a/tests/gold/html/contexts/two_tests_py.html b/tests/gold/html/contexts/two_tests_py.html
index aadc79767..eefc2cb47 100644
--- a/tests/gold/html/contexts/two_tests_py.html
+++ b/tests/gold/html/contexts/two_tests_py.html
@@ -1,5 +1,5 @@
-
+
Coverage for two_tests.py: 94%
@@ -12,7 +12,7 @@
"c": "two_tests.test_one"
}
-
+
1def helper(lineno):
- 2 x = 2 1acb
+ 2 x = 2 1acb
3
4def test_one():
- 5 a = 5 1c
- 6 helper(6) 1c
+ 5 a = 5 1c
+ 6 helper(6) 1c
7
8def test_two():
- 9 a = 9 1b
- 10 b = 10 1b
- 11 if a > 11: 1b
+ 9 a = 9 1b
+ 10 b = 10 1b
+ 11 if a > 11: 1b
12 b = 12
- 13 assert a == (13-4) 1b
- 14 assert b == (14-4) 1b
- 15 helper( 1b
+ 13 assert a == (13-4) 1b
+ 14 assert b == (14-4) 1b
+ 15 helper( 1b
16 16
17 )
18
@@ -113,12 +113,12 @@
diff --git a/tests/gold/html/isolatin1/class_index.html b/tests/gold/html/isolatin1/class_index.html
new file mode 100644
index 000000000..4d26befbf
--- /dev/null
+++ b/tests/gold/html/isolatin1/class_index.html
@@ -0,0 +1,115 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | isolatin1.py |
+ (no class) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/isolatin1/function_index.html b/tests/gold/html/isolatin1/function_index.html
new file mode 100644
index 000000000..f4f3c2617
--- /dev/null
+++ b/tests/gold/html/isolatin1/function_index.html
@@ -0,0 +1,115 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ function |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | isolatin1.py |
+ (no function) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/isolatin1/index.html b/tests/gold/html/isolatin1/index.html
index bb8bd6ce9..6e6575583 100644
--- a/tests/gold/html/isolatin1/index.html
+++ b/tests/gold/html/isolatin1/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,15 +62,15 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| isolatin1.py |
2 |
0 |
@@ -86,16 +95,16 @@ Coverage report:
diff --git a/tests/gold/html/isolatin1/isolatin1_py.html b/tests/gold/html/isolatin1/isolatin1_py.html
index 086133239..be73a5296 100644
--- a/tests/gold/html/isolatin1/isolatin1_py.html
+++ b/tests/gold/html/isolatin1/isolatin1_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for isolatin1.py: 100%
-
+
@@ -89,12 +89,12 @@
diff --git a/tests/gold/html/omit_1/class_index.html b/tests/gold/html/omit_1/class_index.html
new file mode 100644
index 000000000..456187154
--- /dev/null
+++ b/tests/gold/html/omit_1/class_index.html
@@ -0,0 +1,139 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_1/function_index.html b/tests/gold/html/omit_1/function_index.html
new file mode 100644
index 000000000..f969c64e7
--- /dev/null
+++ b/tests/gold/html/omit_1/function_index.html
@@ -0,0 +1,139 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_1/index.html b/tests/gold/html/omit_1/index.html
index 623ffea43..c54042cd7 100644
--- a/tests/gold/html/omit_1/index.html
+++ b/tests/gold/html/omit_1/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,36 +62,36 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| m1.py |
2 |
0 |
0 |
100% |
-
+
| m2.py |
2 |
0 |
0 |
100% |
-
+
| m3.py |
2 |
0 |
0 |
100% |
-
+
| main.py |
8 |
0 |
@@ -107,16 +116,16 @@ Coverage report:
diff --git a/tests/gold/html/omit_1/m1_py.html b/tests/gold/html/omit_1/m1_py.html
index fb31f286d..61c9daafa 100644
--- a/tests/gold/html/omit_1/m1_py.html
+++ b/tests/gold/html/omit_1/m1_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m1.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_1/m2_py.html b/tests/gold/html/omit_1/m2_py.html
index f3e1ac3e7..b223e28fe 100644
--- a/tests/gold/html/omit_1/m2_py.html
+++ b/tests/gold/html/omit_1/m2_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m2.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_1/m3_py.html b/tests/gold/html/omit_1/m3_py.html
index 43fa92dc2..144bd9d91 100644
--- a/tests/gold/html/omit_1/m3_py.html
+++ b/tests/gold/html/omit_1/m3_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m3.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_1/main_py.html b/tests/gold/html/omit_1/main_py.html
index 8323667df..2305a3d10 100644
--- a/tests/gold/html/omit_1/main_py.html
+++ b/tests/gold/html/omit_1/main_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for main.py: 100%
-
+
@@ -94,12 +94,12 @@
diff --git a/tests/gold/html/omit_2/class_index.html b/tests/gold/html/omit_2/class_index.html
new file mode 100644
index 000000000..b6b321fc2
--- /dev/null
+++ b/tests/gold/html/omit_2/class_index.html
@@ -0,0 +1,131 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | m2.py |
+ (no class) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | m3.py |
+ (no class) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | main.py |
+ (no class) |
+ 8 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 12 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_2/function_index.html b/tests/gold/html/omit_2/function_index.html
new file mode 100644
index 000000000..73a925743
--- /dev/null
+++ b/tests/gold/html/omit_2/function_index.html
@@ -0,0 +1,131 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_2/index.html b/tests/gold/html/omit_2/index.html
index 112215f4d..0e8dbaeb7 100644
--- a/tests/gold/html/omit_2/index.html
+++ b/tests/gold/html/omit_2/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,29 +62,29 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| m2.py |
2 |
0 |
0 |
100% |
-
+
| m3.py |
2 |
0 |
0 |
100% |
-
+
| main.py |
8 |
0 |
@@ -100,16 +109,16 @@ Coverage report:
diff --git a/tests/gold/html/omit_2/m2_py.html b/tests/gold/html/omit_2/m2_py.html
index cf7d0cb9b..5d4691152 100644
--- a/tests/gold/html/omit_2/m2_py.html
+++ b/tests/gold/html/omit_2/m2_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m2.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_2/m3_py.html b/tests/gold/html/omit_2/m3_py.html
index 43fa92dc2..144bd9d91 100644
--- a/tests/gold/html/omit_2/m3_py.html
+++ b/tests/gold/html/omit_2/m3_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m3.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_2/main_py.html b/tests/gold/html/omit_2/main_py.html
index 8323667df..2305a3d10 100644
--- a/tests/gold/html/omit_2/main_py.html
+++ b/tests/gold/html/omit_2/main_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for main.py: 100%
-
+
@@ -94,12 +94,12 @@
diff --git a/tests/gold/html/omit_3/class_index.html b/tests/gold/html/omit_3/class_index.html
new file mode 100644
index 000000000..2670b007c
--- /dev/null
+++ b/tests/gold/html/omit_3/class_index.html
@@ -0,0 +1,123 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | m3.py |
+ (no class) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | main.py |
+ (no class) |
+ 8 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 10 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_3/function_index.html b/tests/gold/html/omit_3/function_index.html
new file mode 100644
index 000000000..df17d58ac
--- /dev/null
+++ b/tests/gold/html/omit_3/function_index.html
@@ -0,0 +1,123 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ function |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | m3.py |
+ (no function) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | main.py |
+ (no function) |
+ 8 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 10 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_3/index.html b/tests/gold/html/omit_3/index.html
index 049f9e793..1290644cb 100644
--- a/tests/gold/html/omit_3/index.html
+++ b/tests/gold/html/omit_3/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,22 +62,22 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| m3.py |
2 |
0 |
0 |
100% |
-
+
| main.py |
8 |
0 |
@@ -93,16 +102,16 @@ Coverage report:
diff --git a/tests/gold/html/omit_3/m3_py.html b/tests/gold/html/omit_3/m3_py.html
index a9fb1b61d..b436f9c06 100644
--- a/tests/gold/html/omit_3/m3_py.html
+++ b/tests/gold/html/omit_3/m3_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m3.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_3/main_py.html b/tests/gold/html/omit_3/main_py.html
index 36ca955f8..2305a3d10 100644
--- a/tests/gold/html/omit_3/main_py.html
+++ b/tests/gold/html/omit_3/main_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for main.py: 100%
-
+
@@ -94,12 +94,12 @@
diff --git a/tests/gold/html/omit_4/class_index.html b/tests/gold/html/omit_4/class_index.html
new file mode 100644
index 000000000..bfd703ce6
--- /dev/null
+++ b/tests/gold/html/omit_4/class_index.html
@@ -0,0 +1,131 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | m1.py |
+ (no class) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | m3.py |
+ (no class) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | main.py |
+ (no class) |
+ 8 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 12 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_4/function_index.html b/tests/gold/html/omit_4/function_index.html
new file mode 100644
index 000000000..e77284634
--- /dev/null
+++ b/tests/gold/html/omit_4/function_index.html
@@ -0,0 +1,131 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_4/index.html b/tests/gold/html/omit_4/index.html
index eb38fcebc..1fc6a295e 100644
--- a/tests/gold/html/omit_4/index.html
+++ b/tests/gold/html/omit_4/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,29 +62,29 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| m1.py |
2 |
0 |
0 |
100% |
-
+
| m3.py |
2 |
0 |
0 |
100% |
-
+
| main.py |
8 |
0 |
@@ -100,16 +109,16 @@ Coverage report:
diff --git a/tests/gold/html/omit_4/m1_py.html b/tests/gold/html/omit_4/m1_py.html
index 661220702..fab4710ea 100644
--- a/tests/gold/html/omit_4/m1_py.html
+++ b/tests/gold/html/omit_4/m1_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m1.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_4/m3_py.html b/tests/gold/html/omit_4/m3_py.html
index adb4e0ab5..f067b59df 100644
--- a/tests/gold/html/omit_4/m3_py.html
+++ b/tests/gold/html/omit_4/m3_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m3.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_4/main_py.html b/tests/gold/html/omit_4/main_py.html
index 8323667df..2305a3d10 100644
--- a/tests/gold/html/omit_4/main_py.html
+++ b/tests/gold/html/omit_4/main_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for main.py: 100%
-
+
@@ -94,12 +94,12 @@
diff --git a/tests/gold/html/omit_5/class_index.html b/tests/gold/html/omit_5/class_index.html
new file mode 100644
index 000000000..bf7a6f8df
--- /dev/null
+++ b/tests/gold/html/omit_5/class_index.html
@@ -0,0 +1,123 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ class |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | m1.py |
+ (no class) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | main.py |
+ (no class) |
+ 8 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 10 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_5/function_index.html b/tests/gold/html/omit_5/function_index.html
new file mode 100644
index 000000000..ef49bec8e
--- /dev/null
+++ b/tests/gold/html/omit_5/function_index.html
@@ -0,0 +1,123 @@
+
+
+
+
+ Coverage report
+
+
+
+
+
+
+
+
+
+
+ | File |
+ function |
+ statements |
+ missing |
+ excluded |
+ coverage |
+
+
+
+
+ | m1.py |
+ (no function) |
+ 2 |
+ 0 |
+ 0 |
+ 100% |
+
+
+ | main.py |
+ (no function) |
+ 8 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ | Total |
+ |
+ 10 |
+ 0 |
+ 0 |
+ 100% |
+
+
+
+
+ No items found using the specified filter.
+
+
+
+
+
diff --git a/tests/gold/html/omit_5/index.html b/tests/gold/html/omit_5/index.html
index 7e9dacece..8a929a2ff 100644
--- a/tests/gold/html/omit_5/index.html
+++ b/tests/gold/html/omit_5/index.html
@@ -1,11 +1,11 @@
-
+
Coverage report
-
+
@@ -16,13 +16,13 @@ Coverage report:
@@ -53,22 +62,22 @@ Coverage report:
- | Module |
- statements |
- missing |
- excluded |
- coverage |
+ File |
+ statements |
+ missing |
+ excluded |
+ coverage |
-
+
| m1.py |
2 |
0 |
0 |
100% |
-
+
| main.py |
8 |
0 |
@@ -93,16 +102,16 @@ Coverage report:
diff --git a/tests/gold/html/omit_5/m1_py.html b/tests/gold/html/omit_5/m1_py.html
index a628f07e8..99d4e347e 100644
--- a/tests/gold/html/omit_5/m1_py.html
+++ b/tests/gold/html/omit_5/m1_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for m1.py: 100%
-
+
@@ -86,12 +86,12 @@
diff --git a/tests/gold/html/omit_5/main_py.html b/tests/gold/html/omit_5/main_py.html
index 84d7396fb..807d15144 100644
--- a/tests/gold/html/omit_5/main_py.html
+++ b/tests/gold/html/omit_5/main_py.html
@@ -1,11 +1,11 @@
-
+
Coverage for main.py: 100%
-
+
@@ -94,12 +94,12 @@
diff --git a/tests/gold/html/other/blah_blah_other_py.html b/tests/gold/html/other/blah_blah_other_py.html
index 08aa596dc..aa7590e6b 100644
--- a/tests/gold/html/other/blah_blah_other_py.html
+++ b/tests/gold/html/other/blah_blah_other_py.html
@@ -1,23 +1,23 @@
-
+
- Coverage for /private/var/folders/10/4sn2sk3j2mg5m116f08_367m0000gq/T/pytest-of-nedbatchelder/pytest-49/popen-gw0/t75/othersrc/other.py: 100%
+ Coverage for /private/var/folders/6j/khn0mcrj35d1k3yylpl8zl080000gn/T/pytest-of-ned/pytest-259/popen-gw0/t75/othersrc/other.py: 100%
-
+
- Coverage for /private/var/folders/10/4sn2sk3j2mg5m116f08_367m0000gq/T/pytest-of-nedbatchelder/pytest-49/popen-gw0/t75/othersrc/other.py:
+ Coverage for /private/var/folders/6j/khn0mcrj35d1k3yylpl8zl080000gn/T/pytest-of-ned/pytest-259/popen-gw0/t75/othersrc/other.py:
100%