Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(pypi): skip index lookups when all package overrides are specified by aignas · Pull Request #3710 · bazel-contrib/rules_python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(pypi): skip index lookups when all package overrides are specified by aignas · Pull Request #3710 · bazel-contrib/rules_python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(pypi): skip index lookups when all package overrides are specified by aignas · Pull Request #3710 · bazel-contrib/rules_python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(pypi): skip index lookups when all package overrides are specified by aignas · Pull Request #3710 · bazel-contrib/rules_python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(pypi): skip index lookups when all package overrides are specified by aignas · Pull Request #3710 · bazel-contrib/rules_python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(pypi): skip index lookups when all package overrides are specified by aignas · Pull Request #3710 · bazel-contrib/rules_python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(pypi): skip index lookups when all package overrides are specified by aignas · Pull Request #3710 · bazel-contrib/rules_python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,8 @@ Other changes:
we will from now on fetch the lists of available packages on each index. The
used package mappings will be written as facts to the `MODULE.bazel.lock` file
on supported bazel versions and it should be done at most once. As a result,
per-package {obj}`experimental_index_url_overrides` is no longer needed . What
per-package {obj}`experimental_index_url_overrides` is no longer needed, but
if specified, it needs to be provided for all packages not on the default index. What
Comment thread
aignas marked this conversation as resolved.
is more, the flags for `--index_url` and `--extra-index-url` now behave in the
same way as in `uv` or `pip`, i.e. we default to `--index-url` if the package
is not found in `--extra-index-url`. Fixes
Expand Down
23 changes: 12 additions & 11 deletions python/private/pypi/simpleapi_download.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ def simpleapi_download(
attr: Contains the parameters for the download. They are grouped into a
struct for better clarity. It must have attributes:
* index_url: str, the index, or if `extra_index_urls` are passed, the default index.
* index_url_overrides: dict[str, str], the index overrides for
separate packages.
* index_url_overrides: dict[str, str], the index overrides for separate packages.
* extra_index_urls: Will be looked at in the order they are defined and the first match
wins. This is similar to what uv does, see
https://docs.astral.sh/uv/concepts/indexes/#searching-across-multiple-indexes.
Expand DownExpand Up@@ -132,16 +131,22 @@ def simpleapi_download(
return contents

def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sources, read_simpleapi, attr, block, _fail = fail, **kwargs):
if index_url_overrides:
# Let's not call the index at all and just assume that all of the overrides have been
# specified.
return {
pkg: _normalize_url("{}/{}/".format(
index_url_overrides.get(pkg, default_index),
pkg.replace("_", "-"), # Use the official normalization for URLs
))
for pkg in sources
}
Comment thread
aignas marked this conversation as resolved.

downloads = {}
results = {}

# Ensure the value is not frozen
index_urls = [] + (index_urls or [])
for extra in index_url_overrides.values():
if extra not in index_urls:
index_urls.append(extra)

index_urls = index_urls or []
if default_index not in index_urls:
index_urls.append(default_index)

Expand DownExpand Up@@ -174,10 +179,6 @@ def _get_dist_urls(ctx, *, default_index, index_urls, index_url_overrides, sourc
# and in the outer function process merging of the results.
continue

if index_url_overrides.get(pkg, index_url) != index_url:
# we should not use this index for the package
continue

found = result.output.get(pkg)
if not found:
continue
Expand Down
45 changes: 45 additions & 0 deletions tests/pypi/simpleapi_download/simpleapi_download_tests.bzl
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,51 @@ def _test_download_url_parallel(env):

_tests.append(_test_download_url_parallel)

def _test_download_url_parallel_with_overrides(env):
downloads = {}
reads = [
"",
"",
"",
]

def download(url, output, **kwargs):
_ = kwargs # buildifier: disable=unused-variable
downloads[url[0]] = output
return struct(wait = lambda: struct(success = True))

simpleapi_download(
ctx = struct(
getenv = {}.get,
download = download,
report_progress = lambda _: None,
# We will first add a download to the list, so this is a poor man's `next(foo)`
# implementation. We use 2 because we will enqueue 2 downloads in parallel.
read = lambda i: reads[len(downloads) - 2],
path = lambda i: "path/for/" + i,
),
attr = struct(
index_url_overrides = {
"bar": "https://example.com/extra/simple/",
},
index_url = "https://example.com/default/simple/",
extra_index_urls = [],
sources = {"bar": None, "baz": None, "foo": None},
envsubst = [],
),
cache = pypi_cache(),
parallel_download = True,
get_auth = lambda ctx, urls, ctx_attr: struct(),
)

env.expect.that_dict(downloads).contains_exactly({
"https://example.com/default/simple/baz/": "path/for/https___example_com_default_simple_baz.html",
"https://example.com/default/simple/foo/": "path/for/https___example_com_default_simple_foo.html",
"https://example.com/extra/simple/bar/": "path/for/https___example_com_extra_simple_bar.html",
})

_tests.append(_test_download_url_parallel_with_overrides)

def _test_download_envsubst_url(env):
downloads = {}
reads = [
Expand Down