Skip to content

fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aignas merged 4 commits into from
Jan 23, 2025
Merged

fix: make coverage work with bootstrap=script #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bc2287
fix: make coverage work with bootstrap=script
rickeylev Jan 22, 2025
024218e
better debugging
rickeylev Jan 22, 2025
4792ad2
update changelog
rickeylev Jan 23, 2025
6630b60
Merge branch 'main' of https://github.com/bazelbuild/rules_python int…
rickeylev Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down
23 changes: 13 additions & 10 deletions python/private/py_executable.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
template = runtime.site_init_template,
output = site_init,
substitutions = {
"%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
"%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
"%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
"%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
if (ctx.configuration.coverage_enabled and
runtime and
runtime.coverage_tool):
return "{}/{}".format(
ctx.workspace_name,
runtime.coverage_tool.short_path,
)
else:
return ""

def _create_stage2_bootstrap(
ctx,
*,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
sibling = output_sibling,
)
runtime = runtime_details.effective_runtime
if (ctx.configuration.coverage_enabled and
runtime and
runtime.coverage_tool):
coverage_tool_runfiles_path = "{}/{}".format(
ctx.workspace_name,
runtime.coverage_tool.short_path,
)
else:
coverage_tool_runfiles_path = ""

template = runtime.stage2_bootstrap_template

ctx.actions.expand_template(
template = template,
output = output,
substitutions = {
"%coverage_tool%": coverage_tool_runfiles_path,
"%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
"%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
"%imports%": ":".join(imports.to_list()),
"%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down
5 changes: 3 additions & 2 deletions python/private/site_init_template.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
if cov_tool:
_print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
_print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
_print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

if cov_tool:
if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
coverage_setup = True
else:
_print_verbose_coverage(
"Coverage was enabled, but python coverage tool was not configured."
"Coverage was enabled, but the coverage tool was not found or valid. "
+ "To enable coverage, consult the docs at "
+ "https://rules-python.readthedocs.io/en/latest/coverage.html"
)
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")
8 changes: 6 additions & 2 deletions python/private/stage2_bootstrap_template.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
"""Print output if VERBOSE_COVERAGE is non-empty in the environment."""
if os.environ.get("VERBOSE_COVERAGE"):
print(*args, file=sys.stderr, flush=True)
if is_verbose_coverage():
print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
print_verbose_coverage("enabled:", enable)
if not enable:
yield
return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
unique_id = uuid.uuid4()

# We need for coveragepy to use relative paths. This can only be configured
# using an rc file.
rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
print_verbose_coverage("coveragerc file:", rcfile_name)
with open(rcfile_name, "w") as rcfile:
rcfile.write(
"""[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
finally:
cov.stop()
lcov_path = os.path.join(coverage_dir, "pylcov.dat")
print_verbose_coverage("generating lcov from:", lcov_path)
cov.lcov_report(
outfile=lcov_path,
# Ignore errors because sometimes instrumented files aren't
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: make coverage work with bootstrap=script by rickeylev · Pull Request #2574 · bazel-contrib/rules_python · GitHub
Skip to content
fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aignas
merged 4 commits into

from

Jan 23, 2025
 Merged


fix: make coverage work with bootstrap=script
#2574
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2bc2287

fix: make coverage work with bootstrap=script


rickeylev Jan 22, 2025
024218e

better debugging


rickeylev Jan 22, 2025
4792ad2

update changelog


rickeylev Jan 23, 2025
6630b60

Merge branch 'main' of https://github.com/bazelbuild/rules_python int…


rickeylev Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
 fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
 as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
 ([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down

23 changes: 13 additions & 10 deletions
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
 template = runtime.site_init_template,
 output = site_init,
 substitutions = {
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
 "%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
 return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 return "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 return ""

def _create_stage2_bootstrap(
 ctx,
 *,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
 sibling = output_sibling,
 )
 runtime = runtime_details.effective_runtime
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 coverage_tool_runfiles_path = "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 coverage_tool_runfiles_path = ""

 template = runtime.stage2_bootstrap_template

 ctx.actions.expand_template(
 template = template,
 output = output,
 substitutions = {
 "%coverage_tool%": coverage_tool_runfiles_path,
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%imports%": ":".join(imports.to_list()),
 "%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down

5 changes: 3 additions & 2 deletions
python/private/site_init_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
 if cov_tool:
 _print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
 elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
 _print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
 _print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

 if cov_tool:
 if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
 coverage_setup = True
 else:
 _print_verbose_coverage(
 "Coverage was enabled, but python coverage tool was not configured."
 "Coverage was enabled, but the coverage tool was not found or valid. "
 + "To enable coverage, consult the docs at "
 + "https://rules-python.readthedocs.io/en/latest/coverage.html"
 )
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")

8 changes: 6 additions & 2 deletions
python/private/stage2_bootstrap_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
 """Print output if VERBOSE_COVERAGE is non-empty in the environment."""
 if os.environ.get("VERBOSE_COVERAGE"):
 print(*args, file=sys.stderr, flush=True)
 if is_verbose_coverage():
 print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
 print_verbose_coverage("enabled:", enable)
 if not enable:
 yield
 return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
 unique_id = uuid.uuid4()

 # We need for coveragepy to use relative paths. This can only be configured
 # using an rc file.
 rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
 print_verbose_coverage("coveragerc file:", rcfile_name)
 with open(rcfile_name, "w") as rcfile:
 rcfile.write(
 """[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
 finally:
 cov.stop()
 lcov_path = os.path.join(coverage_dir, "pylcov.dat")
 print_verbose_coverage("generating lcov from:", lcov_path)
 cov.lcov_report(
 outfile=lcov_path,
 # Ignore errors because sometimes instrumented files aren't
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: make coverage work with bootstrap=script by rickeylev · Pull Request #2574 · bazel-contrib/rules_python · GitHub
Skip to content
fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aignas
merged 4 commits into

from

Jan 23, 2025
 Merged


fix: make coverage work with bootstrap=script
#2574
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2bc2287

fix: make coverage work with bootstrap=script


rickeylev Jan 22, 2025
024218e

better debugging


rickeylev Jan 22, 2025
4792ad2

update changelog


rickeylev Jan 23, 2025
6630b60

Merge branch 'main' of https://github.com/bazelbuild/rules_python int…


rickeylev Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
 fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
 as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
 ([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down

23 changes: 13 additions & 10 deletions
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
 template = runtime.site_init_template,
 output = site_init,
 substitutions = {
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
 "%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
 return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 return "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 return ""

def _create_stage2_bootstrap(
 ctx,
 *,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
 sibling = output_sibling,
 )
 runtime = runtime_details.effective_runtime
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 coverage_tool_runfiles_path = "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 coverage_tool_runfiles_path = ""

 template = runtime.stage2_bootstrap_template

 ctx.actions.expand_template(
 template = template,
 output = output,
 substitutions = {
 "%coverage_tool%": coverage_tool_runfiles_path,
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%imports%": ":".join(imports.to_list()),
 "%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down

5 changes: 3 additions & 2 deletions
python/private/site_init_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
 if cov_tool:
 _print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
 elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
 _print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
 _print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

 if cov_tool:
 if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
 coverage_setup = True
 else:
 _print_verbose_coverage(
 "Coverage was enabled, but python coverage tool was not configured."
 "Coverage was enabled, but the coverage tool was not found or valid. "
 + "To enable coverage, consult the docs at "
 + "https://rules-python.readthedocs.io/en/latest/coverage.html"
 )
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")

8 changes: 6 additions & 2 deletions
python/private/stage2_bootstrap_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
 """Print output if VERBOSE_COVERAGE is non-empty in the environment."""
 if os.environ.get("VERBOSE_COVERAGE"):
 print(*args, file=sys.stderr, flush=True)
 if is_verbose_coverage():
 print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
 print_verbose_coverage("enabled:", enable)
 if not enable:
 yield
 return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
 unique_id = uuid.uuid4()

 # We need for coveragepy to use relative paths. This can only be configured
 # using an rc file.
 rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
 print_verbose_coverage("coveragerc file:", rcfile_name)
 with open(rcfile_name, "w") as rcfile:
 rcfile.write(
 """[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
 finally:
 cov.stop()
 lcov_path = os.path.join(coverage_dir, "pylcov.dat")
 print_verbose_coverage("generating lcov from:", lcov_path)
 cov.lcov_report(
 outfile=lcov_path,
 # Ignore errors because sometimes instrumented files aren't
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: make coverage work with bootstrap=script by rickeylev · Pull Request #2574 · bazel-contrib/rules_python · GitHub
Skip to content
fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aignas
merged 4 commits into

from

Jan 23, 2025
 Merged


fix: make coverage work with bootstrap=script
#2574
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2bc2287

fix: make coverage work with bootstrap=script


rickeylev Jan 22, 2025
024218e

better debugging


rickeylev Jan 22, 2025
4792ad2

update changelog


rickeylev Jan 23, 2025
6630b60

Merge branch 'main' of https://github.com/bazelbuild/rules_python int…


rickeylev Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
 fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
 as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
 ([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down

23 changes: 13 additions & 10 deletions
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
 template = runtime.site_init_template,
 output = site_init,
 substitutions = {
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
 "%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
 return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 return "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 return ""

def _create_stage2_bootstrap(
 ctx,
 *,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
 sibling = output_sibling,
 )
 runtime = runtime_details.effective_runtime
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 coverage_tool_runfiles_path = "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 coverage_tool_runfiles_path = ""

 template = runtime.stage2_bootstrap_template

 ctx.actions.expand_template(
 template = template,
 output = output,
 substitutions = {
 "%coverage_tool%": coverage_tool_runfiles_path,
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%imports%": ":".join(imports.to_list()),
 "%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down

5 changes: 3 additions & 2 deletions
python/private/site_init_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
 if cov_tool:
 _print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
 elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
 _print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
 _print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

 if cov_tool:
 if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
 coverage_setup = True
 else:
 _print_verbose_coverage(
 "Coverage was enabled, but python coverage tool was not configured."
 "Coverage was enabled, but the coverage tool was not found or valid. "
 + "To enable coverage, consult the docs at "
 + "https://rules-python.readthedocs.io/en/latest/coverage.html"
 )
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")

8 changes: 6 additions & 2 deletions
python/private/stage2_bootstrap_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
 """Print output if VERBOSE_COVERAGE is non-empty in the environment."""
 if os.environ.get("VERBOSE_COVERAGE"):
 print(*args, file=sys.stderr, flush=True)
 if is_verbose_coverage():
 print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
 print_verbose_coverage("enabled:", enable)
 if not enable:
 yield
 return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
 unique_id = uuid.uuid4()

 # We need for coveragepy to use relative paths. This can only be configured
 # using an rc file.
 rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
 print_verbose_coverage("coveragerc file:", rcfile_name)
 with open(rcfile_name, "w") as rcfile:
 rcfile.write(
 """[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
 finally:
 cov.stop()
 lcov_path = os.path.join(coverage_dir, "pylcov.dat")
 print_verbose_coverage("generating lcov from:", lcov_path)
 cov.lcov_report(
 outfile=lcov_path,
 # Ignore errors because sometimes instrumented files aren't
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: make coverage work with bootstrap=script by rickeylev · Pull Request #2574 · bazel-contrib/rules_python · GitHub
Skip to content
fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aignas
merged 4 commits into

from

Jan 23, 2025
 Merged


fix: make coverage work with bootstrap=script
#2574
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2bc2287

fix: make coverage work with bootstrap=script


rickeylev Jan 22, 2025
024218e

better debugging


rickeylev Jan 22, 2025
4792ad2

update changelog


rickeylev Jan 23, 2025
6630b60

Merge branch 'main' of https://github.com/bazelbuild/rules_python int…


rickeylev Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
 fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
 as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
 ([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down

23 changes: 13 additions & 10 deletions
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
 template = runtime.site_init_template,
 output = site_init,
 substitutions = {
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
 "%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
 return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 return "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 return ""

def _create_stage2_bootstrap(
 ctx,
 *,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
 sibling = output_sibling,
 )
 runtime = runtime_details.effective_runtime
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 coverage_tool_runfiles_path = "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 coverage_tool_runfiles_path = ""

 template = runtime.stage2_bootstrap_template

 ctx.actions.expand_template(
 template = template,
 output = output,
 substitutions = {
 "%coverage_tool%": coverage_tool_runfiles_path,
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%imports%": ":".join(imports.to_list()),
 "%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down

5 changes: 3 additions & 2 deletions
python/private/site_init_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
 if cov_tool:
 _print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
 elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
 _print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
 _print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

 if cov_tool:
 if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
 coverage_setup = True
 else:
 _print_verbose_coverage(
 "Coverage was enabled, but python coverage tool was not configured."
 "Coverage was enabled, but the coverage tool was not found or valid. "
 + "To enable coverage, consult the docs at "
 + "https://rules-python.readthedocs.io/en/latest/coverage.html"
 )
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")

8 changes: 6 additions & 2 deletions
python/private/stage2_bootstrap_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
 """Print output if VERBOSE_COVERAGE is non-empty in the environment."""
 if os.environ.get("VERBOSE_COVERAGE"):
 print(*args, file=sys.stderr, flush=True)
 if is_verbose_coverage():
 print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
 print_verbose_coverage("enabled:", enable)
 if not enable:
 yield
 return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
 unique_id = uuid.uuid4()

 # We need for coveragepy to use relative paths. This can only be configured
 # using an rc file.
 rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
 print_verbose_coverage("coveragerc file:", rcfile_name)
 with open(rcfile_name, "w") as rcfile:
 rcfile.write(
 """[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
 finally:
 cov.stop()
 lcov_path = os.path.join(coverage_dir, "pylcov.dat")
 print_verbose_coverage("generating lcov from:", lcov_path)
 cov.lcov_report(
 outfile=lcov_path,
 # Ignore errors because sometimes instrumented files aren't
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: make coverage work with bootstrap=script by rickeylev · Pull Request #2574 · bazel-contrib/rules_python · GitHub
Skip to content
fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aignas
merged 4 commits into

from

Jan 23, 2025
 Merged


fix: make coverage work with bootstrap=script
#2574
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2bc2287

fix: make coverage work with bootstrap=script


rickeylev Jan 22, 2025
024218e

better debugging


rickeylev Jan 22, 2025
4792ad2

update changelog


rickeylev Jan 23, 2025
6630b60

Merge branch 'main' of https://github.com/bazelbuild/rules_python int…


rickeylev Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
 fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
 as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
 ([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down

23 changes: 13 additions & 10 deletions
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
 template = runtime.site_init_template,
 output = site_init,
 substitutions = {
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
 "%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
 return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 return "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 return ""

def _create_stage2_bootstrap(
 ctx,
 *,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
 sibling = output_sibling,
 )
 runtime = runtime_details.effective_runtime
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 coverage_tool_runfiles_path = "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 coverage_tool_runfiles_path = ""

 template = runtime.stage2_bootstrap_template

 ctx.actions.expand_template(
 template = template,
 output = output,
 substitutions = {
 "%coverage_tool%": coverage_tool_runfiles_path,
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%imports%": ":".join(imports.to_list()),
 "%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down

5 changes: 3 additions & 2 deletions
python/private/site_init_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
 if cov_tool:
 _print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
 elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
 _print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
 _print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

 if cov_tool:
 if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
 coverage_setup = True
 else:
 _print_verbose_coverage(
 "Coverage was enabled, but python coverage tool was not configured."
 "Coverage was enabled, but the coverage tool was not found or valid. "
 + "To enable coverage, consult the docs at "
 + "https://rules-python.readthedocs.io/en/latest/coverage.html"
 )
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")

8 changes: 6 additions & 2 deletions
python/private/stage2_bootstrap_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
 """Print output if VERBOSE_COVERAGE is non-empty in the environment."""
 if os.environ.get("VERBOSE_COVERAGE"):
 print(*args, file=sys.stderr, flush=True)
 if is_verbose_coverage():
 print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
 print_verbose_coverage("enabled:", enable)
 if not enable:
 yield
 return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
 unique_id = uuid.uuid4()

 # We need for coveragepy to use relative paths. This can only be configured
 # using an rc file.
 rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
 print_verbose_coverage("coveragerc file:", rcfile_name)
 with open(rcfile_name, "w") as rcfile:
 rcfile.write(
 """[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
 finally:
 cov.stop()
 lcov_path = os.path.join(coverage_dir, "pylcov.dat")
 print_verbose_coverage("generating lcov from:", lcov_path)
 cov.lcov_report(
 outfile=lcov_path,
 # Ignore errors because sometimes instrumented files aren't
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: make coverage work with bootstrap=script by rickeylev · Pull Request #2574 · bazel-contrib/rules_python · GitHub
Skip to content
fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aignas
merged 4 commits into

from

Jan 23, 2025
 Merged


fix: make coverage work with bootstrap=script
#2574
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2bc2287

fix: make coverage work with bootstrap=script


rickeylev Jan 22, 2025
024218e

better debugging


rickeylev Jan 22, 2025
4792ad2

update changelog


rickeylev Jan 23, 2025
6630b60

Merge branch 'main' of https://github.com/bazelbuild/rules_python int…


rickeylev Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
 fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
 as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
 ([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down

23 changes: 13 additions & 10 deletions
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
 template = runtime.site_init_template,
 output = site_init,
 substitutions = {
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
 "%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
 return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 return "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 return ""

def _create_stage2_bootstrap(
 ctx,
 *,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
 sibling = output_sibling,
 )
 runtime = runtime_details.effective_runtime
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 coverage_tool_runfiles_path = "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 coverage_tool_runfiles_path = ""

 template = runtime.stage2_bootstrap_template

 ctx.actions.expand_template(
 template = template,
 output = output,
 substitutions = {
 "%coverage_tool%": coverage_tool_runfiles_path,
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%imports%": ":".join(imports.to_list()),
 "%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down

5 changes: 3 additions & 2 deletions
python/private/site_init_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
 if cov_tool:
 _print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
 elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
 _print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
 _print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

 if cov_tool:
 if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
 coverage_setup = True
 else:
 _print_verbose_coverage(
 "Coverage was enabled, but python coverage tool was not configured."
 "Coverage was enabled, but the coverage tool was not found or valid. "
 + "To enable coverage, consult the docs at "
 + "https://rules-python.readthedocs.io/en/latest/coverage.html"
 )
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")

8 changes: 6 additions & 2 deletions
python/private/stage2_bootstrap_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
 """Print output if VERBOSE_COVERAGE is non-empty in the environment."""
 if os.environ.get("VERBOSE_COVERAGE"):
 print(*args, file=sys.stderr, flush=True)
 if is_verbose_coverage():
 print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
 print_verbose_coverage("enabled:", enable)
 if not enable:
 yield
 return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
 unique_id = uuid.uuid4()

 # We need for coveragepy to use relative paths. This can only be configured
 # using an rc file.
 rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
 print_verbose_coverage("coveragerc file:", rcfile_name)
 with open(rcfile_name, "w") as rcfile:
 rcfile.write(
 """[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
 finally:
 cov.stop()
 lcov_path = os.path.join(coverage_dir, "pylcov.dat")
 print_verbose_coverage("generating lcov from:", lcov_path)
 cov.lcov_report(
 outfile=lcov_path,
 # Ignore errors because sometimes instrumented files aren't
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix: make coverage work with bootstrap=script by rickeylev · Pull Request #2574 · bazel-contrib/rules_python · GitHub
Skip to content
fix: make coverage work with bootstrap=script#2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aignas
merged 4 commits into

from

Jan 23, 2025
 Merged


fix: make coverage work with bootstrap=script
#2574
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2bc2287

fix: make coverage work with bootstrap=script


rickeylev Jan 22, 2025
024218e

better debugging


rickeylev Jan 22, 2025
4792ad2

update changelog


rickeylev Jan 23, 2025
6630b60

Merge branch 'main' of https://github.com/bazelbuild/rules_python int…


rickeylev Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,8 @@ Unreleased changes template.
 fixes [#2554](https://github.com/bazelbuild/rules_python/issues/2554).
* (runfiles) Runfile manifest and repository mapping files are now interpreted
 as UTF-8 on all platforms.
* (coverage) Coverage with `--bootstrap_impl=script` is fixed
 ([#2572](https://github.com/bazelbuild/rules_python/issues/2572)).

{#v0-0-0-added}
### Added
Expand Down

23 changes: 13 additions & 10 deletions
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -561,6 +561,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
 template = runtime.site_init_template,
 output = site_init,
 substitutions = {
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),
 "%workspace_name%": ctx.workspace_name,
Expand All@@ -578,6 +579,17 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
def _map_each_identity(v):
 return v

def _get_coverage_tool_runfiles_path(ctx, runtime):
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 return "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 return ""

def _create_stage2_bootstrap(
 ctx,
 *,
Expand All@@ -593,23 +605,14 @@ def _create_stage2_bootstrap(
 sibling = output_sibling,
 )
 runtime = runtime_details.effective_runtime
 if (ctx.configuration.coverage_enabled and
 runtime and
 runtime.coverage_tool):
 coverage_tool_runfiles_path = "{}/{}".format(
 ctx.workspace_name,
 runtime.coverage_tool.short_path,
 )
 else:
 coverage_tool_runfiles_path = ""

 template = runtime.stage2_bootstrap_template

 ctx.actions.expand_template(
 template = template,
 output = output,
 substitutions = {
 "%coverage_tool%": coverage_tool_runfiles_path,
 "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
 "%import_all%": "True" if ctx.fragments.bazel_py.python_import_all_repositories else "False",
 "%imports%": ":".join(imports.to_list()),
 "%main%": "{}/{}".format(ctx.workspace_name, main_py.short_path),
Expand Down

5 changes: 3 additions & 2 deletions
python/private/site_init_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,7 +163,7 @@ def _maybe_add_path(path):
 if cov_tool:
 _print_verbose_coverage(f"Using toolchain coverage_tool {cov_tool}")
 elif cov_tool := os.environ.get("PYTHON_COVERAGE"):
 _print_verbose_coverage(f"PYTHON_COVERAGE: {cov_tool}")
 _print_verbose_coverage(f"Using env var coverage: PYTHON_COVERAGE={cov_tool}")

 if cov_tool:
 if os.path.isabs(cov_tool):
Expand All@@ -185,7 +185,7 @@ def _maybe_add_path(path):
 coverage_setup = True
 else:
 _print_verbose_coverage(
 "Coverage was enabled, but python coverage tool was not configured."
 "Coverage was enabled, but the coverage tool was not found or valid. "
 + "To enable coverage, consult the docs at "
 + "https://rules-python.readthedocs.io/en/latest/coverage.html"
 )
Expand All@@ -194,3 +194,4 @@ def _maybe_add_path(path):


COVERAGE_SETUP = _setup_sys_path()
_print_verbose("DONE")

8 changes: 6 additions & 2 deletions
python/private/stage2_bootstrap_template.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,8 @@ def print_verbose(*args, mapping=None, values=None):

def print_verbose_coverage(*args):
 """Print output if VERBOSE_COVERAGE is non-empty in the environment."""
 if os.environ.get("VERBOSE_COVERAGE"):
 print(*args, file=sys.stderr, flush=True)
 if is_verbose_coverage():
 print("bootstrap: stage 2: coverage:", *args, file=sys.stderr, flush=True)


def is_verbose_coverage():
Expand DownExpand Up@@ -271,6 +271,7 @@ def _run_py(main_filename, *, args, cwd=None):

@contextlib.contextmanager
def _maybe_collect_coverage(enable):
 print_verbose_coverage("enabled:", enable)
 if not enable:
 yield
 return
Expand All@@ -283,7 +284,9 @@ def _maybe_collect_coverage(enable):
 unique_id = uuid.uuid4()

 # We need for coveragepy to use relative paths. This can only be configured
 # using an rc file.
 rcfile_name = os.path.join(coverage_dir, ".coveragerc_{}".format(unique_id))
 print_verbose_coverage("coveragerc file:", rcfile_name)
 with open(rcfile_name, "w") as rcfile:
 rcfile.write(
 """[run]
Expand DownExpand Up@@ -318,6 +321,7 @@ def _maybe_collect_coverage(enable):
 finally:
 cov.stop()
 lcov_path = os.path.join(coverage_dir, "pylcov.dat")
 print_verbose_coverage("generating lcov from:", lcov_path)
 cov.lcov_report(
 outfile=lcov_path,
 # Ignore errors because sometimes instrumented files aren't
Expand Down