Skip to content

feat: Support specifying multiple download URLs in tool_versions.#1145

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
rickeylev merged 2 commits into from
Apr 11, 2023
Merged

feat: Support specifying multiple download URLs in tool_versions. #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1049d9
Support urls alongside url.
quval Apr 2, 2023
042a7ab
Address lint warning
quval Apr 2, 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
14 changes: 9 additions & 5 deletions python/repositories.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
if rctx.attr.distutils and rctx.attr.distutils_content:
fail("Only one of (distutils, distutils_content) should be set.")
if bool(rctx.attr.url) == bool(rctx.attr.urls):
fail("Exactly one of (url, urls) must be set.")

platform = rctx.attr.platform
python_version = rctx.attr.python_version
python_short_version = python_version.rpartition(".")[0]
release_filename = rctx.attr.release_filename
url = rctx.attr.url
url = rctx.attr.urls or [rctx.attr.url]

if release_filename.endswith(".zst"):
rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
doc = "A directory prefix to strip from the extracted files.",
),
"url": attr.string(
doc = "The URL of the interpreter to download",
mandatory = True,
doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
),
"urls": attr.string_list(
doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
),
"zstd_sha256": attr.string(
default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
if not sha256:
continue

(release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
(release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

# allow passing in a tool version
coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
platform = platform,
python_version = python_version,
release_filename = release_filename,
url = url,
urls = urls,
distutils = distutils,
distutils_content = distutils_content,
strip_prefix = strip_prefix,
Expand Down
36 changes: 24 additions & 12 deletions python/versions.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
"3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
if type(url) == type({}):
url = url[platform]

if type(url) != type([]):
url = [url]

strip_prefix = tool_versions[python_version].get("strip_prefix", None)
if type(strip_prefix) == type({}):
strip_prefix = strip_prefix[platform]

release_filename = url.format(
platform = platform,
python_version = python_version,
build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
)
if "://" in release_filename: # is absolute url?
url = release_filename
else:
url = "/".join([base_url, release_filename])
release_filename = None
rendered_urls = []
for u in url:
release_filename = u.format(
platform = platform,
python_version = python_version,
build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
)
if "://" in release_filename: # is absolute url?
rendered_urls.append(release_filename)
else:
rendered_urls.append("/".join([base_url, release_filename]))

if release_filename == None:
fail("release_filename should be set by now; were any download URLs given?")

patches = tool_versions[python_version].get("patches", [])
if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
else:
patches = []

return (release_filename, url, strip_prefix, patches)
return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
"echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
python_version = python_version,
platform = platform,
release_url = get_release_info(platform, python_version)[1],
release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
release_url = release_url,
release_url_sha256 = release_url + ".sha256",
)
for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
for release_url in get_release_info(platform, python_version)[1]
])

def gen_python_config_settings(name = ""):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: Support specifying multiple download URLs in tool_versions. by quval · Pull Request #1145 · bazel-contrib/rules_python · GitHub
Skip to content
feat: Support specifying multiple download URLs in tool_versions.#1145

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

rickeylev
merged 2 commits into

from

Apr 11, 2023
 Merged


feat: Support specifying multiple download URLs in tool_versions.
#1145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c1049d9

Support urls alongside url.


quval Apr 2, 2023
042a7ab

Address lint warning


quval Apr 2, 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


14 changes: 9 additions & 5 deletions
python/repositories.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
 if rctx.attr.distutils and rctx.attr.distutils_content:
 fail("Only one of (distutils, distutils_content) should be set.")
 if bool(rctx.attr.url) == bool(rctx.attr.urls):
 fail("Exactly one of (url, urls) must be set.")

 platform = rctx.attr.platform
 python_version = rctx.attr.python_version
 python_short_version = python_version.rpartition(".")[0]
 release_filename = rctx.attr.release_filename
 url = rctx.attr.url
 url = rctx.attr.urls or [rctx.attr.url]

 if release_filename.endswith(".zst"):
 rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
 doc = "A directory prefix to strip from the extracted files.",
 ),
 "url": attr.string(
 doc = "The URL of the interpreter to download",
 mandatory = True,
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "urls": attr.string_list(
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "zstd_sha256": attr.string(
 default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
 if not sha256:
 continue

 (release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
 (release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

 # allow passing in a tool version
 coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
 platform = platform,
 python_version = python_version,
 release_filename = release_filename,
url = url,
urls = urls,
 distutils = distutils,
 distutils_content = distutils_content,
 strip_prefix = strip_prefix,
Expand Down

36 changes: 24 additions & 12 deletions
python/versions.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
 "3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 if type(url) == type({}):
 url = url[platform]

 if type(url) != type([]):
 url = [url]

 strip_prefix = tool_versions[python_version].get("strip_prefix", None)
 if type(strip_prefix) == type({}):
 strip_prefix = strip_prefix[platform]

 release_filename = url.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 url = release_filename
 else:
 url = "/".join([base_url, release_filename])
 release_filename = None
 rendered_urls = []
 for u in url:
 release_filename = u.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 rendered_urls.append(release_filename)
 else:
 rendered_urls.append("/".join([base_url, release_filename]))

 if release_filename == None:
 fail("release_filename should be set by now; were any download URLs given?")

 patches = tool_versions[python_version].get("patches", [])
 if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 else:
 patches = []

 return (release_filename, url, strip_prefix, patches)
 return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
 native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
 "echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
 python_version = python_version,
 platform = platform,
 release_url = get_release_info(platform, python_version)[1],
 release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
 release_url = release_url,
 release_url_sha256 = release_url + ".sha256",
 )
 for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
 for release_url in get_release_info(platform, python_version)[1]
 ])

def gen_python_config_settings(name = ""):
Expand Down

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

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

rickeylev
merged 2 commits into

from

Apr 11, 2023
 Merged


feat: Support specifying multiple download URLs in tool_versions.
#1145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c1049d9

Support urls alongside url.


quval Apr 2, 2023
042a7ab

Address lint warning


quval Apr 2, 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


14 changes: 9 additions & 5 deletions
python/repositories.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
 if rctx.attr.distutils and rctx.attr.distutils_content:
 fail("Only one of (distutils, distutils_content) should be set.")
 if bool(rctx.attr.url) == bool(rctx.attr.urls):
 fail("Exactly one of (url, urls) must be set.")

 platform = rctx.attr.platform
 python_version = rctx.attr.python_version
 python_short_version = python_version.rpartition(".")[0]
 release_filename = rctx.attr.release_filename
 url = rctx.attr.url
 url = rctx.attr.urls or [rctx.attr.url]

 if release_filename.endswith(".zst"):
 rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
 doc = "A directory prefix to strip from the extracted files.",
 ),
 "url": attr.string(
 doc = "The URL of the interpreter to download",
 mandatory = True,
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "urls": attr.string_list(
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "zstd_sha256": attr.string(
 default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
 if not sha256:
 continue

 (release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
 (release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

 # allow passing in a tool version
 coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
 platform = platform,
 python_version = python_version,
 release_filename = release_filename,
url = url,
urls = urls,
 distutils = distutils,
 distutils_content = distutils_content,
 strip_prefix = strip_prefix,
Expand Down

36 changes: 24 additions & 12 deletions
python/versions.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
 "3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 if type(url) == type({}):
 url = url[platform]

 if type(url) != type([]):
 url = [url]

 strip_prefix = tool_versions[python_version].get("strip_prefix", None)
 if type(strip_prefix) == type({}):
 strip_prefix = strip_prefix[platform]

 release_filename = url.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 url = release_filename
 else:
 url = "/".join([base_url, release_filename])
 release_filename = None
 rendered_urls = []
 for u in url:
 release_filename = u.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 rendered_urls.append(release_filename)
 else:
 rendered_urls.append("/".join([base_url, release_filename]))

 if release_filename == None:
 fail("release_filename should be set by now; were any download URLs given?")

 patches = tool_versions[python_version].get("patches", [])
 if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 else:
 patches = []

 return (release_filename, url, strip_prefix, patches)
 return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
 native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
 "echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
 python_version = python_version,
 platform = platform,
 release_url = get_release_info(platform, python_version)[1],
 release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
 release_url = release_url,
 release_url_sha256 = release_url + ".sha256",
 )
 for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
 for release_url in get_release_info(platform, python_version)[1]
 ])

def gen_python_config_settings(name = ""):
Expand Down

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

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

rickeylev
merged 2 commits into

from

Apr 11, 2023
 Merged


feat: Support specifying multiple download URLs in tool_versions.
#1145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c1049d9

Support urls alongside url.


quval Apr 2, 2023
042a7ab

Address lint warning


quval Apr 2, 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


14 changes: 9 additions & 5 deletions
python/repositories.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
 if rctx.attr.distutils and rctx.attr.distutils_content:
 fail("Only one of (distutils, distutils_content) should be set.")
 if bool(rctx.attr.url) == bool(rctx.attr.urls):
 fail("Exactly one of (url, urls) must be set.")

 platform = rctx.attr.platform
 python_version = rctx.attr.python_version
 python_short_version = python_version.rpartition(".")[0]
 release_filename = rctx.attr.release_filename
 url = rctx.attr.url
 url = rctx.attr.urls or [rctx.attr.url]

 if release_filename.endswith(".zst"):
 rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
 doc = "A directory prefix to strip from the extracted files.",
 ),
 "url": attr.string(
 doc = "The URL of the interpreter to download",
 mandatory = True,
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "urls": attr.string_list(
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "zstd_sha256": attr.string(
 default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
 if not sha256:
 continue

 (release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
 (release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

 # allow passing in a tool version
 coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
 platform = platform,
 python_version = python_version,
 release_filename = release_filename,
url = url,
urls = urls,
 distutils = distutils,
 distutils_content = distutils_content,
 strip_prefix = strip_prefix,
Expand Down

36 changes: 24 additions & 12 deletions
python/versions.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
 "3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 if type(url) == type({}):
 url = url[platform]

 if type(url) != type([]):
 url = [url]

 strip_prefix = tool_versions[python_version].get("strip_prefix", None)
 if type(strip_prefix) == type({}):
 strip_prefix = strip_prefix[platform]

 release_filename = url.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 url = release_filename
 else:
 url = "/".join([base_url, release_filename])
 release_filename = None
 rendered_urls = []
 for u in url:
 release_filename = u.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 rendered_urls.append(release_filename)
 else:
 rendered_urls.append("/".join([base_url, release_filename]))

 if release_filename == None:
 fail("release_filename should be set by now; were any download URLs given?")

 patches = tool_versions[python_version].get("patches", [])
 if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 else:
 patches = []

 return (release_filename, url, strip_prefix, patches)
 return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
 native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
 "echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
 python_version = python_version,
 platform = platform,
 release_url = get_release_info(platform, python_version)[1],
 release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
 release_url = release_url,
 release_url_sha256 = release_url + ".sha256",
 )
 for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
 for release_url in get_release_info(platform, python_version)[1]
 ])

def gen_python_config_settings(name = ""):
Expand Down

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

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

rickeylev
merged 2 commits into

from

Apr 11, 2023
 Merged


feat: Support specifying multiple download URLs in tool_versions.
#1145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c1049d9

Support urls alongside url.


quval Apr 2, 2023
042a7ab

Address lint warning


quval Apr 2, 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


14 changes: 9 additions & 5 deletions
python/repositories.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
 if rctx.attr.distutils and rctx.attr.distutils_content:
 fail("Only one of (distutils, distutils_content) should be set.")
 if bool(rctx.attr.url) == bool(rctx.attr.urls):
 fail("Exactly one of (url, urls) must be set.")

 platform = rctx.attr.platform
 python_version = rctx.attr.python_version
 python_short_version = python_version.rpartition(".")[0]
 release_filename = rctx.attr.release_filename
 url = rctx.attr.url
 url = rctx.attr.urls or [rctx.attr.url]

 if release_filename.endswith(".zst"):
 rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
 doc = "A directory prefix to strip from the extracted files.",
 ),
 "url": attr.string(
 doc = "The URL of the interpreter to download",
 mandatory = True,
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "urls": attr.string_list(
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "zstd_sha256": attr.string(
 default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
 if not sha256:
 continue

 (release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
 (release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

 # allow passing in a tool version
 coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
 platform = platform,
 python_version = python_version,
 release_filename = release_filename,
url = url,
urls = urls,
 distutils = distutils,
 distutils_content = distutils_content,
 strip_prefix = strip_prefix,
Expand Down

36 changes: 24 additions & 12 deletions
python/versions.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
 "3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 if type(url) == type({}):
 url = url[platform]

 if type(url) != type([]):
 url = [url]

 strip_prefix = tool_versions[python_version].get("strip_prefix", None)
 if type(strip_prefix) == type({}):
 strip_prefix = strip_prefix[platform]

 release_filename = url.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 url = release_filename
 else:
 url = "/".join([base_url, release_filename])
 release_filename = None
 rendered_urls = []
 for u in url:
 release_filename = u.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 rendered_urls.append(release_filename)
 else:
 rendered_urls.append("/".join([base_url, release_filename]))

 if release_filename == None:
 fail("release_filename should be set by now; were any download URLs given?")

 patches = tool_versions[python_version].get("patches", [])
 if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 else:
 patches = []

 return (release_filename, url, strip_prefix, patches)
 return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
 native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
 "echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
 python_version = python_version,
 platform = platform,
 release_url = get_release_info(platform, python_version)[1],
 release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
 release_url = release_url,
 release_url_sha256 = release_url + ".sha256",
 )
 for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
 for release_url in get_release_info(platform, python_version)[1]
 ])

def gen_python_config_settings(name = ""):
Expand Down

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

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

rickeylev
merged 2 commits into

from

Apr 11, 2023
 Merged


feat: Support specifying multiple download URLs in tool_versions.
#1145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c1049d9

Support urls alongside url.


quval Apr 2, 2023
042a7ab

Address lint warning


quval Apr 2, 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


14 changes: 9 additions & 5 deletions
python/repositories.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
 if rctx.attr.distutils and rctx.attr.distutils_content:
 fail("Only one of (distutils, distutils_content) should be set.")
 if bool(rctx.attr.url) == bool(rctx.attr.urls):
 fail("Exactly one of (url, urls) must be set.")

 platform = rctx.attr.platform
 python_version = rctx.attr.python_version
 python_short_version = python_version.rpartition(".")[0]
 release_filename = rctx.attr.release_filename
 url = rctx.attr.url
 url = rctx.attr.urls or [rctx.attr.url]

 if release_filename.endswith(".zst"):
 rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
 doc = "A directory prefix to strip from the extracted files.",
 ),
 "url": attr.string(
 doc = "The URL of the interpreter to download",
 mandatory = True,
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "urls": attr.string_list(
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "zstd_sha256": attr.string(
 default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
 if not sha256:
 continue

 (release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
 (release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

 # allow passing in a tool version
 coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
 platform = platform,
 python_version = python_version,
 release_filename = release_filename,
url = url,
urls = urls,
 distutils = distutils,
 distutils_content = distutils_content,
 strip_prefix = strip_prefix,
Expand Down

36 changes: 24 additions & 12 deletions
python/versions.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
 "3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 if type(url) == type({}):
 url = url[platform]

 if type(url) != type([]):
 url = [url]

 strip_prefix = tool_versions[python_version].get("strip_prefix", None)
 if type(strip_prefix) == type({}):
 strip_prefix = strip_prefix[platform]

 release_filename = url.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 url = release_filename
 else:
 url = "/".join([base_url, release_filename])
 release_filename = None
 rendered_urls = []
 for u in url:
 release_filename = u.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 rendered_urls.append(release_filename)
 else:
 rendered_urls.append("/".join([base_url, release_filename]))

 if release_filename == None:
 fail("release_filename should be set by now; were any download URLs given?")

 patches = tool_versions[python_version].get("patches", [])
 if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 else:
 patches = []

 return (release_filename, url, strip_prefix, patches)
 return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
 native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
 "echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
 python_version = python_version,
 platform = platform,
 release_url = get_release_info(platform, python_version)[1],
 release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
 release_url = release_url,
 release_url_sha256 = release_url + ".sha256",
 )
 for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
 for release_url in get_release_info(platform, python_version)[1]
 ])

def gen_python_config_settings(name = ""):
Expand Down

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

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

rickeylev
merged 2 commits into

from

Apr 11, 2023
 Merged


feat: Support specifying multiple download URLs in tool_versions.
#1145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c1049d9

Support urls alongside url.


quval Apr 2, 2023
042a7ab

Address lint warning


quval Apr 2, 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


14 changes: 9 additions & 5 deletions
python/repositories.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
 if rctx.attr.distutils and rctx.attr.distutils_content:
 fail("Only one of (distutils, distutils_content) should be set.")
 if bool(rctx.attr.url) == bool(rctx.attr.urls):
 fail("Exactly one of (url, urls) must be set.")

 platform = rctx.attr.platform
 python_version = rctx.attr.python_version
 python_short_version = python_version.rpartition(".")[0]
 release_filename = rctx.attr.release_filename
 url = rctx.attr.url
 url = rctx.attr.urls or [rctx.attr.url]

 if release_filename.endswith(".zst"):
 rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
 doc = "A directory prefix to strip from the extracted files.",
 ),
 "url": attr.string(
 doc = "The URL of the interpreter to download",
 mandatory = True,
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "urls": attr.string_list(
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "zstd_sha256": attr.string(
 default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
 if not sha256:
 continue

 (release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
 (release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

 # allow passing in a tool version
 coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
 platform = platform,
 python_version = python_version,
 release_filename = release_filename,
url = url,
urls = urls,
 distutils = distutils,
 distutils_content = distutils_content,
 strip_prefix = strip_prefix,
Expand Down

36 changes: 24 additions & 12 deletions
python/versions.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
 "3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 if type(url) == type({}):
 url = url[platform]

 if type(url) != type([]):
 url = [url]

 strip_prefix = tool_versions[python_version].get("strip_prefix", None)
 if type(strip_prefix) == type({}):
 strip_prefix = strip_prefix[platform]

 release_filename = url.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 url = release_filename
 else:
 url = "/".join([base_url, release_filename])
 release_filename = None
 rendered_urls = []
 for u in url:
 release_filename = u.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 rendered_urls.append(release_filename)
 else:
 rendered_urls.append("/".join([base_url, release_filename]))

 if release_filename == None:
 fail("release_filename should be set by now; were any download URLs given?")

 patches = tool_versions[python_version].get("patches", [])
 if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 else:
 patches = []

 return (release_filename, url, strip_prefix, patches)
 return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
 native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
 "echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
 python_version = python_version,
 platform = platform,
 release_url = get_release_info(platform, python_version)[1],
 release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
 release_url = release_url,
 release_url_sha256 = release_url + ".sha256",
 )
 for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
 for release_url in get_release_info(platform, python_version)[1]
 ])

def gen_python_config_settings(name = ""):
Expand Down

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

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

rickeylev
merged 2 commits into

from

Apr 11, 2023
 Merged


feat: Support specifying multiple download URLs in tool_versions.
#1145
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c1049d9

Support urls alongside url.


quval Apr 2, 2023
042a7ab

Address lint warning


quval Apr 2, 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


14 changes: 9 additions & 5 deletions
python/repositories.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,12 +99,14 @@ def is_standalone_interpreter(rctx, python_interpreter_target):
def _python_repository_impl(rctx):
 if rctx.attr.distutils and rctx.attr.distutils_content:
 fail("Only one of (distutils, distutils_content) should be set.")
 if bool(rctx.attr.url) == bool(rctx.attr.urls):
 fail("Exactly one of (url, urls) must be set.")

 platform = rctx.attr.platform
 python_version = rctx.attr.python_version
 python_short_version = python_version.rpartition(".")[0]
 release_filename = rctx.attr.release_filename
 url = rctx.attr.url
 url = rctx.attr.urls or [rctx.attr.url]

 if release_filename.endswith(".zst"):
 rctx.download(
Expand DownExpand Up@@ -428,8 +430,10 @@ For more information see the official bazel docs
 doc = "A directory prefix to strip from the extracted files.",
 ),
 "url": attr.string(
 doc = "The URL of the interpreter to download",
 mandatory = True,
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "urls": attr.string_list(
 doc = "The URL of the interpreter to download. Exactly one of url and urls must be set.",
 ),
 "zstd_sha256": attr.string(
 default = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0",
Expand DownExpand Up@@ -506,7 +510,7 @@ def python_register_toolchains(
 if not sha256:
 continue

 (release_filename, url, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)
 (release_filename, urls, strip_prefix, patches) = get_release_info(platform, python_version, base_url, tool_versions)

 # allow passing in a tool version
 coverage_tool = None
Expand DownExpand Up@@ -536,7 +540,7 @@ def python_register_toolchains(
 platform = platform,
 python_version = python_version,
 release_filename = release_filename,
url = url,
urls = urls,
 distutils = distutils,
 distutils_content = distutils_content,
 strip_prefix = strip_prefix,
Expand Down

36 changes: 24 additions & 12 deletions
python/versions.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,8 @@ DEFAULT_RELEASE_BASE_URL = "https://github.com/indygreg/python-build-standalone/
# "strip_prefix": "python",
# },
#
# It is possible to provide lists in "url".
#
# buildifier: disable=unsorted-dict-items
TOOL_VERSIONS = {
 "3.8.10": {
Expand DownExpand Up@@ -281,19 +283,28 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 if type(url) == type({}):
 url = url[platform]

 if type(url) != type([]):
 url = [url]

 strip_prefix = tool_versions[python_version].get("strip_prefix", None)
 if type(strip_prefix) == type({}):
 strip_prefix = strip_prefix[platform]

 release_filename = url.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 url = release_filename
 else:
 url = "/".join([base_url, release_filename])
 release_filename = None
 rendered_urls = []
 for u in url:
 release_filename = u.format(
 platform = platform,
 python_version = python_version,
 build = "shared-install_only" if (WINDOWS_NAME in platform) else "install_only",
 )
 if "://" in release_filename: # is absolute url?
 rendered_urls.append(release_filename)
 else:
 rendered_urls.append("/".join([base_url, release_filename]))

 if release_filename == None:
 fail("release_filename should be set by now; were any download URLs given?")

 patches = tool_versions[python_version].get("patches", [])
 if type(patches) == type({}):
Expand All@@ -302,7 +313,7 @@ def get_release_info(platform, python_version, base_url = DEFAULT_RELEASE_BASE_U
 else:
 patches = []

 return (release_filename, url, strip_prefix, patches)
 return (release_filename, rendered_urls, strip_prefix, patches)

def print_toolchains_checksums(name):
 native.genrule(
Expand DownExpand Up@@ -333,10 +344,11 @@ def _commands_for_version(python_version):
 "echo \"{python_version}: {platform}: $$(curl --location --fail {release_url_sha256} 2>/dev/null || curl --location --fail {release_url} 2>/dev/null | shasum -a 256 | awk '{{ print $$1 }}')\"".format(
 python_version = python_version,
 platform = platform,
 release_url = get_release_info(platform, python_version)[1],
 release_url_sha256 = get_release_info(platform, python_version)[1] + ".sha256",
 release_url = release_url,
 release_url_sha256 = release_url + ".sha256",
 )
 for platform in TOOL_VERSIONS[python_version]["sha256"].keys()
 for release_url in get_release_info(platform, python_version)[1]
 ])

def gen_python_config_settings(name = ""):
Expand Down