fix: Using canonical name in requirements.bzl#1176

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
chrislovecnm merged 14 commits into from
May 17, 2023
Merged

fix: Using canonical name in requirements.bzl #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
11b7f40
Using canonical name
linzhp Apr 20, 2023
3acceff
fixing remainining usage of repo_name
linzhp Apr 20, 2023
8d04e17
add repo_name to pip_repository_bzlmod
linzhp Apr 20, 2023
bb83f6c
fix docs and style
linzhp Apr 20, 2023
70c7d47
adding tests
linzhp Apr 26, 2023
be8c6ac
buildifier
linzhp Apr 26, 2023
8b0ab48
manually fixed load order
linzhp Apr 26, 2023
1866bbc
buildifier 6.1.0
linzhp Apr 26, 2023
2428e70
Merge branch 'main' into canonical
linzhp Apr 30, 2023
8e3b8cf
Merge remote-tracking branch 'upstream/main' into canonical
linzhp May 3, 2023
2873178
Merge branch 'main' into canonical
linzhp May 7, 2023
d0b1a9f
use macro_tmpl
linzhp May 7, 2023
fa50dd7
buildifier
linzhp May 7, 2023
f0f9f51
Merge branch 'main' into canonical
linzhp May 17, 2023
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
6 changes: 4 additions & 2 deletions docs/pip_repository.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion examples/bzlmod/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
main = "test.py",
deps = [":lib"],
)

build_test(
name = "all_wheels",
targets = all_whl_requirements,
)

build_test(
name = "all_requirements",
targets = all_requirements,
)
3 changes: 3 additions & 0 deletions examples/bzlmod/MODULE.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
name = "pip",
# Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
incompatible_generate_aliases = False,
requirements_lock = "//:requirements_lock.txt",
requirements_windows = "//:requirements_windows.txt",
)
Expand Down
1 change: 1 addition & 0 deletions python/extensions/pip.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
# this does not create the install_deps() macro.
pip_repository_bzlmod(
name = attr.name,
repo_name = attr.name,
requirements_lock = attr.requirements_lock,
incompatible_generate_aliases = attr.incompatible_generate_aliases,
)
Expand Down
10 changes: 7 additions & 3 deletions python/pip_install/pip_repository.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

bzl_packages = sorted([name for name, _ in packages])

repo_name = rctx.attr.name.split("~")[-1]
repo_name = rctx.attr.repo_name

build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
rctx.file("BUILD.bazel", build_contents)
rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
"%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
for p in bzl_packages
]),
"%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
for p in bzl_packages
]),
"%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
default = False,
doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
),
"repo_name": attr.string(
mandatory = True,
Comment thread
linzhp marked this conversation as resolved.
doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
),
"requirements_darwin": attr.label(
allow_single_file = True,
doc = "Override the requirements_lock attribute when the host platform is Mac OS",
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: Using canonical name in requirements.bzl#1176

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

chrislovecnm
merged 14 commits into

from

May 17, 2023
 Merged


fix: Using canonical name in requirements.bzl
#1176
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
11b7f40

Using canonical name


linzhp Apr 20, 2023
3acceff

fixing remainining usage of repo_name


linzhp Apr 20, 2023
8d04e17

add repo_name to pip_repository_bzlmod


linzhp Apr 20, 2023
bb83f6c

fix docs and style


linzhp Apr 20, 2023
70c7d47

adding tests


linzhp Apr 26, 2023
be8c6ac

buildifier


linzhp Apr 26, 2023
8b0ab48

manually fixed load order


linzhp Apr 26, 2023
1866bbc

buildifier 6.1.0


linzhp Apr 26, 2023
2428e70

Merge branch 'main' into canonical


linzhp Apr 30, 2023
8e3b8cf

Merge remote-tracking branch 'upstream/main' into canonical


linzhp May 3, 2023
2873178

Merge branch 'main' into canonical


linzhp May 7, 2023
d0b1a9f

use macro_tmpl


linzhp May 7, 2023
fa50dd7

buildifier


linzhp May 7, 2023
f0f9f51

Merge branch 'main' into canonical


linzhp May 17, 2023

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


6 changes: 4 additions & 2 deletions
docs/pip_repository.md

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


13 changes: 12 additions & 1 deletion
examples/bzlmod/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
 main = "test.py",
 deps = [":lib"],
)

build_test(
 name = "all_wheels",
 targets = all_whl_requirements,
)

build_test(
 name = "all_requirements",
 targets = all_requirements,
)

3 changes: 3 additions & 0 deletions
examples/bzlmod/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
 name = "pip",
 # Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
 incompatible_generate_aliases = False,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
Expand Down

1 change: 1 addition & 0 deletions
python/extensions/pip.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
 # this does not create the install_deps() macro.
 pip_repository_bzlmod(
 name = attr.name,
 repo_name = attr.name,
 requirements_lock = attr.requirements_lock,
 incompatible_generate_aliases = attr.incompatible_generate_aliases,
 )
Expand Down

10 changes: 7 additions & 3 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

 bzl_packages = sorted([name for name, _ in packages])

 repo_name = rctx.attr.name.split("~")[-1]
 repo_name = rctx.attr.repo_name

 build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
 default = False,
 doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
 ),
 "repo_name": attr.string(
 mandatory = True,
Comment thread
linzhp marked this conversation as resolved.

 doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
 ),
 "requirements_darwin": attr.label(
 allow_single_file = True,
 doc = "Override the requirements_lock attribute when the host platform is Mac OS",
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: Using canonical name in requirements.bzl#1176

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

chrislovecnm
merged 14 commits into

from

May 17, 2023
 Merged


fix: Using canonical name in requirements.bzl
#1176
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
11b7f40

Using canonical name


linzhp Apr 20, 2023
3acceff

fixing remainining usage of repo_name


linzhp Apr 20, 2023
8d04e17

add repo_name to pip_repository_bzlmod


linzhp Apr 20, 2023
bb83f6c

fix docs and style


linzhp Apr 20, 2023
70c7d47

adding tests


linzhp Apr 26, 2023
be8c6ac

buildifier


linzhp Apr 26, 2023
8b0ab48

manually fixed load order


linzhp Apr 26, 2023
1866bbc

buildifier 6.1.0


linzhp Apr 26, 2023
2428e70

Merge branch 'main' into canonical


linzhp Apr 30, 2023
8e3b8cf

Merge remote-tracking branch 'upstream/main' into canonical


linzhp May 3, 2023
2873178

Merge branch 'main' into canonical


linzhp May 7, 2023
d0b1a9f

use macro_tmpl


linzhp May 7, 2023
fa50dd7

buildifier


linzhp May 7, 2023
f0f9f51

Merge branch 'main' into canonical


linzhp May 17, 2023

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


6 changes: 4 additions & 2 deletions
docs/pip_repository.md

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


13 changes: 12 additions & 1 deletion
examples/bzlmod/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
 main = "test.py",
 deps = [":lib"],
)

build_test(
 name = "all_wheels",
 targets = all_whl_requirements,
)

build_test(
 name = "all_requirements",
 targets = all_requirements,
)

3 changes: 3 additions & 0 deletions
examples/bzlmod/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
 name = "pip",
 # Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
 incompatible_generate_aliases = False,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
Expand Down

1 change: 1 addition & 0 deletions
python/extensions/pip.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
 # this does not create the install_deps() macro.
 pip_repository_bzlmod(
 name = attr.name,
 repo_name = attr.name,
 requirements_lock = attr.requirements_lock,
 incompatible_generate_aliases = attr.incompatible_generate_aliases,
 )
Expand Down

10 changes: 7 additions & 3 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

 bzl_packages = sorted([name for name, _ in packages])

 repo_name = rctx.attr.name.split("~")[-1]
 repo_name = rctx.attr.repo_name

 build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
 default = False,
 doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
 ),
 "repo_name": attr.string(
 mandatory = True,
Comment thread
linzhp marked this conversation as resolved.

 doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
 ),
 "requirements_darwin": attr.label(
 allow_single_file = True,
 doc = "Override the requirements_lock attribute when the host platform is Mac OS",
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: Using canonical name in requirements.bzl#1176

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

chrislovecnm
merged 14 commits into

from

May 17, 2023
 Merged


fix: Using canonical name in requirements.bzl
#1176
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
11b7f40

Using canonical name


linzhp Apr 20, 2023
3acceff

fixing remainining usage of repo_name


linzhp Apr 20, 2023
8d04e17

add repo_name to pip_repository_bzlmod


linzhp Apr 20, 2023
bb83f6c

fix docs and style


linzhp Apr 20, 2023
70c7d47

adding tests


linzhp Apr 26, 2023
be8c6ac

buildifier


linzhp Apr 26, 2023
8b0ab48

manually fixed load order


linzhp Apr 26, 2023
1866bbc

buildifier 6.1.0


linzhp Apr 26, 2023
2428e70

Merge branch 'main' into canonical


linzhp Apr 30, 2023
8e3b8cf

Merge remote-tracking branch 'upstream/main' into canonical


linzhp May 3, 2023
2873178

Merge branch 'main' into canonical


linzhp May 7, 2023
d0b1a9f

use macro_tmpl


linzhp May 7, 2023
fa50dd7

buildifier


linzhp May 7, 2023
f0f9f51

Merge branch 'main' into canonical


linzhp May 17, 2023

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


6 changes: 4 additions & 2 deletions
docs/pip_repository.md

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


13 changes: 12 additions & 1 deletion
examples/bzlmod/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
 main = "test.py",
 deps = [":lib"],
)

build_test(
 name = "all_wheels",
 targets = all_whl_requirements,
)

build_test(
 name = "all_requirements",
 targets = all_requirements,
)

3 changes: 3 additions & 0 deletions
examples/bzlmod/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
 name = "pip",
 # Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
 incompatible_generate_aliases = False,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
Expand Down

1 change: 1 addition & 0 deletions
python/extensions/pip.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
 # this does not create the install_deps() macro.
 pip_repository_bzlmod(
 name = attr.name,
 repo_name = attr.name,
 requirements_lock = attr.requirements_lock,
 incompatible_generate_aliases = attr.incompatible_generate_aliases,
 )
Expand Down

10 changes: 7 additions & 3 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

 bzl_packages = sorted([name for name, _ in packages])

 repo_name = rctx.attr.name.split("~")[-1]
 repo_name = rctx.attr.repo_name

 build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
 default = False,
 doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
 ),
 "repo_name": attr.string(
 mandatory = True,
Comment thread
linzhp marked this conversation as resolved.

 doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
 ),
 "requirements_darwin": attr.label(
 allow_single_file = True,
 doc = "Override the requirements_lock attribute when the host platform is Mac OS",
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: Using canonical name in requirements.bzl#1176

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

chrislovecnm
merged 14 commits into

from

May 17, 2023
 Merged


fix: Using canonical name in requirements.bzl
#1176
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
11b7f40

Using canonical name


linzhp Apr 20, 2023
3acceff

fixing remainining usage of repo_name


linzhp Apr 20, 2023
8d04e17

add repo_name to pip_repository_bzlmod


linzhp Apr 20, 2023
bb83f6c

fix docs and style


linzhp Apr 20, 2023
70c7d47

adding tests


linzhp Apr 26, 2023
be8c6ac

buildifier


linzhp Apr 26, 2023
8b0ab48

manually fixed load order


linzhp Apr 26, 2023
1866bbc

buildifier 6.1.0


linzhp Apr 26, 2023
2428e70

Merge branch 'main' into canonical


linzhp Apr 30, 2023
8e3b8cf

Merge remote-tracking branch 'upstream/main' into canonical


linzhp May 3, 2023
2873178

Merge branch 'main' into canonical


linzhp May 7, 2023
d0b1a9f

use macro_tmpl


linzhp May 7, 2023
fa50dd7

buildifier


linzhp May 7, 2023
f0f9f51

Merge branch 'main' into canonical


linzhp May 17, 2023

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


6 changes: 4 additions & 2 deletions
docs/pip_repository.md

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


13 changes: 12 additions & 1 deletion
examples/bzlmod/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
 main = "test.py",
 deps = [":lib"],
)

build_test(
 name = "all_wheels",
 targets = all_whl_requirements,
)

build_test(
 name = "all_requirements",
 targets = all_requirements,
)

3 changes: 3 additions & 0 deletions
examples/bzlmod/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
 name = "pip",
 # Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
 incompatible_generate_aliases = False,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
Expand Down

1 change: 1 addition & 0 deletions
python/extensions/pip.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
 # this does not create the install_deps() macro.
 pip_repository_bzlmod(
 name = attr.name,
 repo_name = attr.name,
 requirements_lock = attr.requirements_lock,
 incompatible_generate_aliases = attr.incompatible_generate_aliases,
 )
Expand Down

10 changes: 7 additions & 3 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

 bzl_packages = sorted([name for name, _ in packages])

 repo_name = rctx.attr.name.split("~")[-1]
 repo_name = rctx.attr.repo_name

 build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
 default = False,
 doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
 ),
 "repo_name": attr.string(
 mandatory = True,
Comment thread
linzhp marked this conversation as resolved.

 doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
 ),
 "requirements_darwin": attr.label(
 allow_single_file = True,
 doc = "Override the requirements_lock attribute when the host platform is Mac OS",
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: Using canonical name in requirements.bzl#1176

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

chrislovecnm
merged 14 commits into

from

May 17, 2023
 Merged


fix: Using canonical name in requirements.bzl
#1176
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
11b7f40

Using canonical name


linzhp Apr 20, 2023
3acceff

fixing remainining usage of repo_name


linzhp Apr 20, 2023
8d04e17

add repo_name to pip_repository_bzlmod


linzhp Apr 20, 2023
bb83f6c

fix docs and style


linzhp Apr 20, 2023
70c7d47

adding tests


linzhp Apr 26, 2023
be8c6ac

buildifier


linzhp Apr 26, 2023
8b0ab48

manually fixed load order


linzhp Apr 26, 2023
1866bbc

buildifier 6.1.0


linzhp Apr 26, 2023
2428e70

Merge branch 'main' into canonical


linzhp Apr 30, 2023
8e3b8cf

Merge remote-tracking branch 'upstream/main' into canonical


linzhp May 3, 2023
2873178

Merge branch 'main' into canonical


linzhp May 7, 2023
d0b1a9f

use macro_tmpl


linzhp May 7, 2023
fa50dd7

buildifier


linzhp May 7, 2023
f0f9f51

Merge branch 'main' into canonical


linzhp May 17, 2023

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


6 changes: 4 additions & 2 deletions
docs/pip_repository.md

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


13 changes: 12 additions & 1 deletion
examples/bzlmod/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
 main = "test.py",
 deps = [":lib"],
)

build_test(
 name = "all_wheels",
 targets = all_whl_requirements,
)

build_test(
 name = "all_requirements",
 targets = all_requirements,
)

3 changes: 3 additions & 0 deletions
examples/bzlmod/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
 name = "pip",
 # Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
 incompatible_generate_aliases = False,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
Expand Down

1 change: 1 addition & 0 deletions
python/extensions/pip.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
 # this does not create the install_deps() macro.
 pip_repository_bzlmod(
 name = attr.name,
 repo_name = attr.name,
 requirements_lock = attr.requirements_lock,
 incompatible_generate_aliases = attr.incompatible_generate_aliases,
 )
Expand Down

10 changes: 7 additions & 3 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

 bzl_packages = sorted([name for name, _ in packages])

 repo_name = rctx.attr.name.split("~")[-1]
 repo_name = rctx.attr.repo_name

 build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
 default = False,
 doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
 ),
 "repo_name": attr.string(
 mandatory = True,
Comment thread
linzhp marked this conversation as resolved.

 doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
 ),
 "requirements_darwin": attr.label(
 allow_single_file = True,
 doc = "Override the requirements_lock attribute when the host platform is Mac OS",
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: Using canonical name in requirements.bzl#1176

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

chrislovecnm
merged 14 commits into

from

May 17, 2023
 Merged


fix: Using canonical name in requirements.bzl
#1176
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
11b7f40

Using canonical name


linzhp Apr 20, 2023
3acceff

fixing remainining usage of repo_name


linzhp Apr 20, 2023
8d04e17

add repo_name to pip_repository_bzlmod


linzhp Apr 20, 2023
bb83f6c

fix docs and style


linzhp Apr 20, 2023
70c7d47

adding tests


linzhp Apr 26, 2023
be8c6ac

buildifier


linzhp Apr 26, 2023
8b0ab48

manually fixed load order


linzhp Apr 26, 2023
1866bbc

buildifier 6.1.0


linzhp Apr 26, 2023
2428e70

Merge branch 'main' into canonical


linzhp Apr 30, 2023
8e3b8cf

Merge remote-tracking branch 'upstream/main' into canonical


linzhp May 3, 2023
2873178

Merge branch 'main' into canonical


linzhp May 7, 2023
d0b1a9f

use macro_tmpl


linzhp May 7, 2023
fa50dd7

buildifier


linzhp May 7, 2023
f0f9f51

Merge branch 'main' into canonical


linzhp May 17, 2023

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


6 changes: 4 additions & 2 deletions
docs/pip_repository.md

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


13 changes: 12 additions & 1 deletion
examples/bzlmod/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
 main = "test.py",
 deps = [":lib"],
)

build_test(
 name = "all_wheels",
 targets = all_whl_requirements,
)

build_test(
 name = "all_requirements",
 targets = all_requirements,
)

3 changes: 3 additions & 0 deletions
examples/bzlmod/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
 name = "pip",
 # Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
 incompatible_generate_aliases = False,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
Expand Down

1 change: 1 addition & 0 deletions
python/extensions/pip.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
 # this does not create the install_deps() macro.
 pip_repository_bzlmod(
 name = attr.name,
 repo_name = attr.name,
 requirements_lock = attr.requirements_lock,
 incompatible_generate_aliases = attr.incompatible_generate_aliases,
 )
Expand Down

10 changes: 7 additions & 3 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

 bzl_packages = sorted([name for name, _ in packages])

 repo_name = rctx.attr.name.split("~")[-1]
 repo_name = rctx.attr.repo_name

 build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
 default = False,
 doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
 ),
 "repo_name": attr.string(
 mandatory = True,
Comment thread
linzhp marked this conversation as resolved.

 doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
 ),
 "requirements_darwin": attr.label(
 allow_single_file = True,
 doc = "Override the requirements_lock attribute when the host platform is Mac OS",
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: Using canonical name in requirements.bzl#1176

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

chrislovecnm
merged 14 commits into

from

May 17, 2023
 Merged


fix: Using canonical name in requirements.bzl
#1176
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
11b7f40

Using canonical name


linzhp Apr 20, 2023
3acceff

fixing remainining usage of repo_name


linzhp Apr 20, 2023
8d04e17

add repo_name to pip_repository_bzlmod


linzhp Apr 20, 2023
bb83f6c

fix docs and style


linzhp Apr 20, 2023
70c7d47

adding tests


linzhp Apr 26, 2023
be8c6ac

buildifier


linzhp Apr 26, 2023
8b0ab48

manually fixed load order


linzhp Apr 26, 2023
1866bbc

buildifier 6.1.0


linzhp Apr 26, 2023
2428e70

Merge branch 'main' into canonical


linzhp Apr 30, 2023
8e3b8cf

Merge remote-tracking branch 'upstream/main' into canonical


linzhp May 3, 2023
2873178

Merge branch 'main' into canonical


linzhp May 7, 2023
d0b1a9f

use macro_tmpl


linzhp May 7, 2023
fa50dd7

buildifier


linzhp May 7, 2023
f0f9f51

Merge branch 'main' into canonical


linzhp May 17, 2023

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


6 changes: 4 additions & 2 deletions
docs/pip_repository.md

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


13 changes: 12 additions & 1 deletion
examples/bzlmod/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
load("@pip//:requirements.bzl", "requirement")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pip//:requirements.bzl", "all_requirements", "all_whl_requirements", "requirement")
load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
Expand DownExpand Up@@ -43,3 +44,13 @@ py_test_with_transition(
 main = "test.py",
 deps = [":lib"],
)

build_test(
 name = "all_wheels",
 targets = all_whl_requirements,
)

build_test(
 name = "all_requirements",
 targets = all_requirements,
)

3 changes: 3 additions & 0 deletions
examples/bzlmod/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ module(
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
Expand All@@ -26,6 +27,8 @@ register_toolchains(
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
 name = "pip",
 # Intentionally set it false because the "true" case is already covered by examples/bzlmod_build_file_generation
 incompatible_generate_aliases = False,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
Expand Down

1 change: 1 addition & 0 deletions
python/extensions/pip.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ def _pip_impl(module_ctx):
 # this does not create the install_deps() macro.
 pip_repository_bzlmod(
 name = attr.name,
 repo_name = attr.name,
 requirements_lock = attr.requirements_lock,
 incompatible_generate_aliases = attr.incompatible_generate_aliases,
 )
Expand Down

10 changes: 7 additions & 3 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -358,7 +358,7 @@ def _pip_repository_bzlmod_impl(rctx):

 bzl_packages = sorted([name for name, _ in packages])

 repo_name = rctx.attr.name.split("~")[-1]
 repo_name = rctx.attr.repo_name

 build_contents = _BUILD_FILE_CONTENTS

Expand All@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, p) if rctx.attr.incompatible_generate_aliases else macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand All@@ -395,6 +395,10 @@ pip_repository_bzlmod_attrs = {
 default = False,
 doc = "Allow generating aliases in '@pip//:<pkg>' -> '@pip_<pkg>//:pkg'. This replaces the aliases generated by the `bzlmod` tooling.",
 ),
 "repo_name": attr.string(
 mandatory = True,
Comment thread
linzhp marked this conversation as resolved.

 doc = "The apparent name of the repo. This is needed because in bzlmod, the name attribute becomes the canonical name",
 ),
 "requirements_darwin": attr.label(
 allow_single_file = True,
 doc = "Override the requirements_lock attribute when the host platform is Mac OS",
Expand Down