fix(rules): make the srcs trully optional#2768

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 6 commits into from
Apr 13, 2025
Merged

fix(rules): make the srcs trully optional #2768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b1da00
fix(rules): make the srcs trully optional
aignas Apr 10, 2025
1c2cb86
keep it sorted and remove the to do
aignas Apr 10, 2025
0a9e1aa
Apply suggestions from self code review
aignas Apr 11, 2025
2b5808e
rename tests to better describe what they're testing
rickeylev Apr 13, 2025
ea3e194
set bootstrap system python on syspy test
rickeylev Apr 13, 2025
c19dd2d
Update CHANGELOG.md
rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
extension has been marked reproducible.
Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
`main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down
3 changes: 2 additions & 1 deletion python/private/py_executable.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
)
template = runtime.bootstrap_template
subs["%shebang%"] = runtime.stub_shebang
elif not ctx.files.srcs:
fail("mandatory 'srcs' files have not been provided")
else:
if (ctx.configuration.coverage_enabled and
runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
),
**kwargs
)
builder.attrs.get("srcs").set_mandatory(True)
return builder

def cc_configure_features(
Expand Down
72 changes: 48 additions & 24 deletions tests/base_rules/py_executable_base_tests.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
matching.str_matches("name must not end in*.py"),
)

def _test_main_module_bootstrap_system_python(name, config):
rt_util.helper_target(
config.rule,
name = name + "_subject",
main_module = "dummy",
)
analysis_test(
name = name,
impl = _test_main_module_bootstrap_system_python_impl,
target = name + "_subject",
config_settings = {
BOOTSTRAP_IMPL: "system_python",
"//command_line_option:platforms": [LINUX_X86_64],
},
expect_failure = True,
)

def _test_main_module_bootstrap_system_python_impl(env, target):
env.expect.that_target(target).failures().contains_predicate(
matching.str_matches("mandatory*srcs"),
)

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
rt_util.helper_target(
config.rule,
name = name + "_subject",
main_module = "dummy",
)
analysis_test(
name = name,
impl = _test_main_module_bootstrap_script_impl,
target = name + "_subject",
config_settings = {
BOOTSTRAP_IMPL: "script",
"//command_line_option:platforms": [LINUX_X86_64],
},
)

def _test_main_module_bootstrap_script_impl(env, target):
env.expect.that_target(target).default_outputs().contains(
"{package}/{test_name}_subject",
)

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
rt_util.helper_target(
config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down
1 change: 1 addition & 0 deletions tests/support/support.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(rules): make the srcs trully optional#2768

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 6 commits into

from

Apr 13, 2025
 Merged


fix(rules): make the srcs trully optional
#2768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8b1da00

fix(rules): make the srcs trully optional


aignas Apr 10, 2025
1c2cb86

keep it sorted and remove the to do


aignas Apr 10, 2025
0a9e1aa

Apply suggestions from self code review


aignas Apr 11, 2025
2b5808e

rename tests to better describe what they're testing


rickeylev Apr 13, 2025
ea3e194

set bootstrap system python on syspy test


rickeylev Apr 13, 2025
c19dd2d

Update CHANGELOG.md


rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
 extension has been marked reproducible.
 Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
 `main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down

3 changes: 2 additions & 1 deletion
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
 )
 template = runtime.bootstrap_template
 subs["%shebang%"] = runtime.stub_shebang
 elif not ctx.files.srcs:
 fail("mandatory 'srcs' files have not been provided")
 else:
 if (ctx.configuration.coverage_enabled and
 runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
 ),
 **kwargs
 )
 builder.attrs.get("srcs").set_mandatory(True)
 return builder

def cc_configure_features(
Expand Down

72 changes: 48 additions & 24 deletions
tests/base_rules/py_executable_base_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
 matching.str_matches("name must not end in*.py"),
 )

def _test_main_module_bootstrap_system_python(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_system_python_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "system_python",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 expect_failure = True,
 )

def _test_main_module_bootstrap_system_python_impl(env, target):
 env.expect.that_target(target).failures().contains_predicate(
 matching.str_matches("mandatory*srcs"),
 )

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_script_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "script",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 )

def _test_main_module_bootstrap_script_impl(env, target):
 env.expect.that_target(target).default_outputs().contains(
 "{package}/{test_name}_subject",
 )

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
 rt_util.helper_target(
 config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down

1 change: 1 addition & 0 deletions
tests/support/support.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down

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

Skip to content
fix(rules): make the srcs trully optional#2768

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 6 commits into

from

Apr 13, 2025
 Merged


fix(rules): make the srcs trully optional
#2768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8b1da00

fix(rules): make the srcs trully optional


aignas Apr 10, 2025
1c2cb86

keep it sorted and remove the to do


aignas Apr 10, 2025
0a9e1aa

Apply suggestions from self code review


aignas Apr 11, 2025
2b5808e

rename tests to better describe what they're testing


rickeylev Apr 13, 2025
ea3e194

set bootstrap system python on syspy test


rickeylev Apr 13, 2025
c19dd2d

Update CHANGELOG.md


rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
 extension has been marked reproducible.
 Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
 `main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down

3 changes: 2 additions & 1 deletion
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
 )
 template = runtime.bootstrap_template
 subs["%shebang%"] = runtime.stub_shebang
 elif not ctx.files.srcs:
 fail("mandatory 'srcs' files have not been provided")
 else:
 if (ctx.configuration.coverage_enabled and
 runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
 ),
 **kwargs
 )
 builder.attrs.get("srcs").set_mandatory(True)
 return builder

def cc_configure_features(
Expand Down

72 changes: 48 additions & 24 deletions
tests/base_rules/py_executable_base_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
 matching.str_matches("name must not end in*.py"),
 )

def _test_main_module_bootstrap_system_python(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_system_python_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "system_python",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 expect_failure = True,
 )

def _test_main_module_bootstrap_system_python_impl(env, target):
 env.expect.that_target(target).failures().contains_predicate(
 matching.str_matches("mandatory*srcs"),
 )

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_script_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "script",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 )

def _test_main_module_bootstrap_script_impl(env, target):
 env.expect.that_target(target).default_outputs().contains(
 "{package}/{test_name}_subject",
 )

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
 rt_util.helper_target(
 config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down

1 change: 1 addition & 0 deletions
tests/support/support.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down

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

Skip to content
fix(rules): make the srcs trully optional#2768

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 6 commits into

from

Apr 13, 2025
 Merged


fix(rules): make the srcs trully optional
#2768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8b1da00

fix(rules): make the srcs trully optional


aignas Apr 10, 2025
1c2cb86

keep it sorted and remove the to do


aignas Apr 10, 2025
0a9e1aa

Apply suggestions from self code review


aignas Apr 11, 2025
2b5808e

rename tests to better describe what they're testing


rickeylev Apr 13, 2025
ea3e194

set bootstrap system python on syspy test


rickeylev Apr 13, 2025
c19dd2d

Update CHANGELOG.md


rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
 extension has been marked reproducible.
 Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
 `main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down

3 changes: 2 additions & 1 deletion
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
 )
 template = runtime.bootstrap_template
 subs["%shebang%"] = runtime.stub_shebang
 elif not ctx.files.srcs:
 fail("mandatory 'srcs' files have not been provided")
 else:
 if (ctx.configuration.coverage_enabled and
 runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
 ),
 **kwargs
 )
 builder.attrs.get("srcs").set_mandatory(True)
 return builder

def cc_configure_features(
Expand Down

72 changes: 48 additions & 24 deletions
tests/base_rules/py_executable_base_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
 matching.str_matches("name must not end in*.py"),
 )

def _test_main_module_bootstrap_system_python(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_system_python_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "system_python",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 expect_failure = True,
 )

def _test_main_module_bootstrap_system_python_impl(env, target):
 env.expect.that_target(target).failures().contains_predicate(
 matching.str_matches("mandatory*srcs"),
 )

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_script_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "script",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 )

def _test_main_module_bootstrap_script_impl(env, target):
 env.expect.that_target(target).default_outputs().contains(
 "{package}/{test_name}_subject",
 )

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
 rt_util.helper_target(
 config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down

1 change: 1 addition & 0 deletions
tests/support/support.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down

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

Skip to content
fix(rules): make the srcs trully optional#2768

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 6 commits into

from

Apr 13, 2025
 Merged


fix(rules): make the srcs trully optional
#2768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8b1da00

fix(rules): make the srcs trully optional


aignas Apr 10, 2025
1c2cb86

keep it sorted and remove the to do


aignas Apr 10, 2025
0a9e1aa

Apply suggestions from self code review


aignas Apr 11, 2025
2b5808e

rename tests to better describe what they're testing


rickeylev Apr 13, 2025
ea3e194

set bootstrap system python on syspy test


rickeylev Apr 13, 2025
c19dd2d

Update CHANGELOG.md


rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
 extension has been marked reproducible.
 Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
 `main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down

3 changes: 2 additions & 1 deletion
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
 )
 template = runtime.bootstrap_template
 subs["%shebang%"] = runtime.stub_shebang
 elif not ctx.files.srcs:
 fail("mandatory 'srcs' files have not been provided")
 else:
 if (ctx.configuration.coverage_enabled and
 runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
 ),
 **kwargs
 )
 builder.attrs.get("srcs").set_mandatory(True)
 return builder

def cc_configure_features(
Expand Down

72 changes: 48 additions & 24 deletions
tests/base_rules/py_executable_base_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
 matching.str_matches("name must not end in*.py"),
 )

def _test_main_module_bootstrap_system_python(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_system_python_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "system_python",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 expect_failure = True,
 )

def _test_main_module_bootstrap_system_python_impl(env, target):
 env.expect.that_target(target).failures().contains_predicate(
 matching.str_matches("mandatory*srcs"),
 )

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_script_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "script",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 )

def _test_main_module_bootstrap_script_impl(env, target):
 env.expect.that_target(target).default_outputs().contains(
 "{package}/{test_name}_subject",
 )

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
 rt_util.helper_target(
 config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down

1 change: 1 addition & 0 deletions
tests/support/support.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(rules): make the srcs trully optional#2768

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 6 commits into

from

Apr 13, 2025
 Merged


fix(rules): make the srcs trully optional
#2768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8b1da00

fix(rules): make the srcs trully optional


aignas Apr 10, 2025
1c2cb86

keep it sorted and remove the to do


aignas Apr 10, 2025
0a9e1aa

Apply suggestions from self code review


aignas Apr 11, 2025
2b5808e

rename tests to better describe what they're testing


rickeylev Apr 13, 2025
ea3e194

set bootstrap system python on syspy test


rickeylev Apr 13, 2025
c19dd2d

Update CHANGELOG.md


rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
 extension has been marked reproducible.
 Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
 `main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down

3 changes: 2 additions & 1 deletion
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
 )
 template = runtime.bootstrap_template
 subs["%shebang%"] = runtime.stub_shebang
 elif not ctx.files.srcs:
 fail("mandatory 'srcs' files have not been provided")
 else:
 if (ctx.configuration.coverage_enabled and
 runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
 ),
 **kwargs
 )
 builder.attrs.get("srcs").set_mandatory(True)
 return builder

def cc_configure_features(
Expand Down

72 changes: 48 additions & 24 deletions
tests/base_rules/py_executable_base_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
 matching.str_matches("name must not end in*.py"),
 )

def _test_main_module_bootstrap_system_python(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_system_python_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "system_python",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 expect_failure = True,
 )

def _test_main_module_bootstrap_system_python_impl(env, target):
 env.expect.that_target(target).failures().contains_predicate(
 matching.str_matches("mandatory*srcs"),
 )

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_script_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "script",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 )

def _test_main_module_bootstrap_script_impl(env, target):
 env.expect.that_target(target).default_outputs().contains(
 "{package}/{test_name}_subject",
 )

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
 rt_util.helper_target(
 config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down

1 change: 1 addition & 0 deletions
tests/support/support.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(rules): make the srcs trully optional#2768

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 6 commits into

from

Apr 13, 2025
 Merged


fix(rules): make the srcs trully optional
#2768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8b1da00

fix(rules): make the srcs trully optional


aignas Apr 10, 2025
1c2cb86

keep it sorted and remove the to do


aignas Apr 10, 2025
0a9e1aa

Apply suggestions from self code review


aignas Apr 11, 2025
2b5808e

rename tests to better describe what they're testing


rickeylev Apr 13, 2025
ea3e194

set bootstrap system python on syspy test


rickeylev Apr 13, 2025
c19dd2d

Update CHANGELOG.md


rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
 extension has been marked reproducible.
 Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
 `main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down

3 changes: 2 additions & 1 deletion
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
 )
 template = runtime.bootstrap_template
 subs["%shebang%"] = runtime.stub_shebang
 elif not ctx.files.srcs:
 fail("mandatory 'srcs' files have not been provided")
 else:
 if (ctx.configuration.coverage_enabled and
 runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
 ),
 **kwargs
 )
 builder.attrs.get("srcs").set_mandatory(True)
 return builder

def cc_configure_features(
Expand Down

72 changes: 48 additions & 24 deletions
tests/base_rules/py_executable_base_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
 matching.str_matches("name must not end in*.py"),
 )

def _test_main_module_bootstrap_system_python(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_system_python_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "system_python",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 expect_failure = True,
 )

def _test_main_module_bootstrap_system_python_impl(env, target):
 env.expect.that_target(target).failures().contains_predicate(
 matching.str_matches("mandatory*srcs"),
 )

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_script_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "script",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 )

def _test_main_module_bootstrap_script_impl(env, target):
 env.expect.that_target(target).default_outputs().contains(
 "{package}/{test_name}_subject",
 )

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
 rt_util.helper_target(
 config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down

1 change: 1 addition & 0 deletions
tests/support/support.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down

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

Skip to content
fix(rules): make the srcs trully optional#2768

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 6 commits into

from

Apr 13, 2025
 Merged


fix(rules): make the srcs trully optional
#2768
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8b1da00

fix(rules): make the srcs trully optional


aignas Apr 10, 2025
1c2cb86

keep it sorted and remove the to do


aignas Apr 10, 2025
0a9e1aa

Apply suggestions from self code review


aignas Apr 11, 2025
2b5808e

rename tests to better describe what they're testing


rickeylev Apr 13, 2025
ea3e194

set bootstrap system python on syspy test


rickeylev Apr 13, 2025
c19dd2d

Update CHANGELOG.md


rickeylev Apr 13, 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@@ -76,6 +76,8 @@ Unreleased changes template.
* (pypi) The PyPI extension will no longer write the lock file entries as the
 extension has been marked reproducible.
 Fixes [#2434](https://github.com/bazel-contrib/rules_python/issues/2434).
* (rules) {attr}`py_binary.srcs` and {attr}`py_test.srcs` is no longer mandatory when
 `main_module` is specified (for `--bootstrap_impl=script`)

[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317

Expand Down

3 changes: 2 additions & 1 deletion
python/private/py_executable.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,8 @@ def _create_stage1_bootstrap(
 )
 template = runtime.bootstrap_template
 subs["%shebang%"] = runtime.stub_shebang
 elif not ctx.files.srcs:
 fail("mandatory 'srcs' files have not been provided")
 else:
 if (ctx.configuration.coverage_enabled and
 runtime and
Expand DownExpand Up@@ -1888,7 +1890,6 @@ def create_executable_rule_builder(implementation, **kwargs):
 ),
 **kwargs
 )
 builder.attrs.get("srcs").set_mandatory(True)
 return builder

def cc_configure_features(
Expand Down

72 changes: 48 additions & 24 deletions
tests/base_rules/py_executable_base_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER") # buildifier: disable
load("//tests/base_rules:base_tests.bzl", "create_base_tests")
load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
load("//tests/support:support.bzl", "BOOTSTRAP_IMPL", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")

_tests = []

Expand DownExpand Up@@ -342,6 +342,53 @@ def _test_name_cannot_end_in_py_impl(env, target):
 matching.str_matches("name must not end in*.py"),
 )

def _test_main_module_bootstrap_system_python(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_system_python_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "system_python",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 expect_failure = True,
 )

def _test_main_module_bootstrap_system_python_impl(env, target):
 env.expect.that_target(target).failures().contains_predicate(
 matching.str_matches("mandatory*srcs"),
 )

_tests.append(_test_main_module_bootstrap_system_python)

def _test_main_module_bootstrap_script(name, config):
 rt_util.helper_target(
 config.rule,
 name = name + "_subject",
 main_module = "dummy",
 )
 analysis_test(
 name = name,
 impl = _test_main_module_bootstrap_script_impl,
 target = name + "_subject",
 config_settings = {
 BOOTSTRAP_IMPL: "script",
 "//command_line_option:platforms": [LINUX_X86_64],
 },
 )

def _test_main_module_bootstrap_script_impl(env, target):
 env.expect.that_target(target).default_outputs().contains(
 "{package}/{test_name}_subject",
 )

_tests.append(_test_main_module_bootstrap_script)

def _test_py_runtime_info_provided(name, config):
 rt_util.helper_target(
 config.rule,
Expand All@@ -365,29 +412,6 @@ def _test_py_runtime_info_provided_impl(env, target):

_tests.append(_test_py_runtime_info_provided)

# Can't test this -- mandatory validation happens before analysis test
# can intercept it
# TODO(#1069): Once re-implemented in Starlark, modify rule logic to make this
# testable.
# def _test_srcs_is_mandatory(name, config):
# rt_util.helper_target(
# config.rule,
# name = name + "_subject",
# )
# analysis_test(
# name = name,
# impl = _test_srcs_is_mandatory,
# target = name + "_subject",
# expect_failure = True,
# )
#
# _tests.append(_test_srcs_is_mandatory)
#
# def _test_srcs_is_mandatory_impl(env, target):
# env.expect.that_target(target).failures().contains_predicate(
# matching.str_matches("mandatory*srcs"),
# )

# =====
# You were gonna add a test at the end, weren't you?
# Nope. Please keep them sorted; put it in its alphabetical location.
Expand Down

1 change: 1 addition & 0 deletions
tests/support/support.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ CROSSTOOL_TOP = Label("//tests/support/cc_toolchains:cc_toolchain_suite")
# str() around Label() is necessary because rules_testing's config_settings
# doesn't accept yet Label objects.
ADD_SRCS_TO_RUNFILES = str(Label("//python/config_settings:add_srcs_to_runfiles"))
BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl"))
EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain"))
PRECOMPILE = str(Label("//python/config_settings:precompile"))
PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention"))
Expand Down