Skip to content

Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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
groodt merged 6 commits into from
Aug 27, 2022
Merged

Revert "pip_compile: remove external/workspace_name prefix from gener… #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
248d7a2
Revert "pip_compile: remove external/workspace_name prefix from gener…
alexeagle Aug 17, 2022
c000948
Merge branch 'main' into revert_690
groodt Aug 27, 2022
5fd468b
Merge branch 'main' into revert_690
groodt Aug 27, 2022
cf931e3
Fixes
groodt Aug 27, 2022
74b9098
Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …
groodt Aug 27, 2022
7b7b0cc
Fixes
groodt Aug 27, 2022
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
1 change: 0 additions & 1 deletion .bazelci/presubmit.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
- "-//gazelle/..."
# The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
- "-//tests:pip_repository_entry_points_example"
- "-//tests:pip_deps_example"
test_flags:
- "--test_tag_filters=-fix-windows"
8 changes: 4 additions & 4 deletions examples/pip_install/requirements.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
--hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
--hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
# via -r requirements.in
# via -r ./requirements.in
botocore==1.17.63 \
--hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
--hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
--hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
--hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
# via -r requirements.in
# via -r ./requirements.in
s3transfer==0.3.7 \
--hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
--hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
--hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
--hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
# via -r requirements.in
# via -r ./requirements.in
urllib3==1.25.11 \
--hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
--hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
# via botocore
yamllint==1.26.3 \
--hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
# via -r requirements.in
# via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down
6 changes: 3 additions & 3 deletions examples/pip_install/requirements_windows.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
--hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
--hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
# via -r requirements.in
# via -r ./requirements.in
botocore==1.17.63 \
--hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
--hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
--hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
--hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
# via -r requirements.in
# via -r ./requirements.in
s3transfer==0.3.7 \
--hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
--hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
# via botocore
yamllint==1.26.3 \
--hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
# via -r requirements.in
# via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down
6 changes: 3 additions & 3 deletions examples/pip_parse/requirements_lock.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
--hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
--hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
# via -r requirements.in
# via -r ./requirements.in
s3cmd==2.1.0 \
--hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
--hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
# via -r requirements.in
# via -r ./requirements.in
six==1.16.0 \
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
# via requests
yamllint==1.26.3 \
--hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
# via -r requirements.in
# via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down
2 changes: 1 addition & 1 deletion examples/pip_parse_vendored/requirements.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
--hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
--hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
# via -r requirements.in
# via -r ./requirements.in
urllib3==1.26.9 \
--hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
--hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down
2 changes: 1 addition & 1 deletion examples/pip_repository_annotations/requirements.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
--hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
--hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
# via -r requirements.in
# via -r ./requirements.in
17 changes: 3 additions & 14 deletions python/pip_install/pip_compile.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

parse_str_none = lambda s: None if s == "None" else s

requirements_in = os.path.relpath(sys.argv.pop(1))
requirements_txt = os.path.relpath(sys.argv.pop(1))
requirements_in = sys.argv.pop(1)
requirements_txt = sys.argv.pop(1)
requirements_linux = parse_str_none(sys.argv.pop(1))
requirements_darwin = parse_str_none(sys.argv.pop(1))
requirements_windows = parse_str_none(sys.argv.pop(1))
parts = requirements_in.split(os.path.sep, 2)
if parts[0] == "external":
requirements_in = parts[2]
requirements_txt = (
requirements_txt
if "BUILD_WORKSPACE_DIRECTORY" in os.environ
else os.path.join("..", "..", requirements_txt)
)
os.chdir(os.path.join(parts[0], parts[1]))
update_target_label = sys.argv.pop(1)

# Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
#
# Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
# from different directories within the WORKSPACE.
requirements_txt = os.path.join(
os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
)
os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
else:
err_msg = (
"Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down
5 changes: 0 additions & 5 deletions tests/BUILD
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
name = "pip_repository_entry_points_example",
timeout = "long",
)

bazel_integration_test(
name = "pip_deps_example",
timeout = "long",
)
19 changes: 0 additions & 19 deletions tests/pip_deps/BUILD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/pip_deps/README.md
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions tests/pip_deps/WORKSPACE
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions tests/pip_deps/pip_deps.bzl
View file
Open in desktop

This file was deleted.

136 changes: 0 additions & 136 deletions tests/pip_deps/requirements.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions tests/pip_deps/test.sh
View file
Open in desktop

This file was deleted.

Loading
, '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" + '
Revert "pip_compile: remove external/workspace_name prefix from gener… by alexeagle · Pull Request #794 · bazel-contrib/rules_python · GitHub
Skip to content
Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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

groodt
merged 6 commits into

from

Aug 27, 2022
 Merged


Revert "pip_compile: remove external/workspace_name prefix from gener…
#794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
248d7a2

Revert "pip_compile: remove external/workspace_name prefix from gener…


alexeagle Aug 17, 2022
c000948

Merge branch 'main' into revert_690


groodt Aug 27, 2022
5fd468b

Merge branch 'main' into revert_690


groodt Aug 27, 2022
cf931e3

Fixes


groodt Aug 27, 2022
74b9098

Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …


groodt Aug 27, 2022
7b7b0cc

Fixes


groodt Aug 27, 2022

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


1 change: 0 additions & 1 deletion
.bazelci/presubmit.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
 - "-//gazelle/..."
 # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
 - "-//tests:pip_repository_entry_points_example"
 - "-//tests:pip_deps_example"
 test_flags:
 - "--test_tag_filters=-fix-windows"

8 changes: 4 additions & 4 deletions
examples/pip_install/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
 --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
 --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.25.11 \
 --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
 --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_install/requirements_windows.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_parse/requirements_lock.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
 --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
 --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
 # via -r requirements.in
 # via -r ./requirements.in
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
six==1.16.0 \
 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
 # via requests
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse_vendored/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
 --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
 --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.26.9 \
 --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
 --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_repository_annotations/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
 --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
 # via -r requirements.in
 # via -r ./requirements.in

17 changes: 3 additions & 14 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

 parse_str_none = lambda s: None if s == "None" else s

 requirements_in = os.path.relpath(sys.argv.pop(1))
 requirements_txt = os.path.relpath(sys.argv.pop(1))
 requirements_in = sys.argv.pop(1)
 requirements_txt = sys.argv.pop(1)
 requirements_linux = parse_str_none(sys.argv.pop(1))
 requirements_darwin = parse_str_none(sys.argv.pop(1))
 requirements_windows = parse_str_none(sys.argv.pop(1))
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

 # Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

5 changes: 0 additions & 5 deletions
tests/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
 name = "pip_repository_entry_points_example",
 timeout = "long",
)

bazel_integration_test(
 name = "pip_deps_example",
 timeout = "long",
)

19 changes: 0 additions & 19 deletions
tests/pip_deps/BUILD

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
tests/pip_deps/README.md

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
tests/pip_deps/WORKSPACE

View file


Open in desktop


This file was deleted.


55 changes: 0 additions & 55 deletions
tests/pip_deps/pip_deps.bzl

View file


Open in desktop


This file was deleted.


136 changes: 0 additions & 136 deletions
tests/pip_deps/requirements.txt

View file


Open in desktop


This file was deleted.


4 changes: 0 additions & 4 deletions
tests/pip_deps/test.sh

View file


Open in desktop


This file was deleted.

Loading

, '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('^' + ".*" + '
Revert "pip_compile: remove external/workspace_name prefix from gener… by alexeagle · Pull Request #794 · bazel-contrib/rules_python · GitHub
Skip to content
Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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

groodt
merged 6 commits into

from

Aug 27, 2022
 Merged


Revert "pip_compile: remove external/workspace_name prefix from gener…
#794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
248d7a2

Revert "pip_compile: remove external/workspace_name prefix from gener…


alexeagle Aug 17, 2022
c000948

Merge branch 'main' into revert_690


groodt Aug 27, 2022
5fd468b

Merge branch 'main' into revert_690


groodt Aug 27, 2022
cf931e3

Fixes


groodt Aug 27, 2022
74b9098

Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …


groodt Aug 27, 2022
7b7b0cc

Fixes


groodt Aug 27, 2022

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


1 change: 0 additions & 1 deletion
.bazelci/presubmit.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
 - "-//gazelle/..."
 # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
 - "-//tests:pip_repository_entry_points_example"
 - "-//tests:pip_deps_example"
 test_flags:
 - "--test_tag_filters=-fix-windows"

8 changes: 4 additions & 4 deletions
examples/pip_install/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
 --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
 --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.25.11 \
 --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
 --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_install/requirements_windows.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_parse/requirements_lock.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
 --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
 --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
 # via -r requirements.in
 # via -r ./requirements.in
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
six==1.16.0 \
 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
 # via requests
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse_vendored/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
 --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
 --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.26.9 \
 --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
 --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_repository_annotations/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
 --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
 # via -r requirements.in
 # via -r ./requirements.in

17 changes: 3 additions & 14 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

 parse_str_none = lambda s: None if s == "None" else s

 requirements_in = os.path.relpath(sys.argv.pop(1))
 requirements_txt = os.path.relpath(sys.argv.pop(1))
 requirements_in = sys.argv.pop(1)
 requirements_txt = sys.argv.pop(1)
 requirements_linux = parse_str_none(sys.argv.pop(1))
 requirements_darwin = parse_str_none(sys.argv.pop(1))
 requirements_windows = parse_str_none(sys.argv.pop(1))
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

 # Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

5 changes: 0 additions & 5 deletions
tests/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
 name = "pip_repository_entry_points_example",
 timeout = "long",
)

bazel_integration_test(
 name = "pip_deps_example",
 timeout = "long",
)

19 changes: 0 additions & 19 deletions
tests/pip_deps/BUILD

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
tests/pip_deps/README.md

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
tests/pip_deps/WORKSPACE

View file


Open in desktop


This file was deleted.


55 changes: 0 additions & 55 deletions
tests/pip_deps/pip_deps.bzl

View file


Open in desktop


This file was deleted.


136 changes: 0 additions & 136 deletions
tests/pip_deps/requirements.txt

View file


Open in desktop


This file was deleted.


4 changes: 0 additions & 4 deletions
tests/pip_deps/test.sh

View file


Open in desktop


This file was deleted.

Loading

, '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('^' + ".*" + '
Revert "pip_compile: remove external/workspace_name prefix from gener… by alexeagle · Pull Request #794 · bazel-contrib/rules_python · GitHub
Skip to content
Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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

groodt
merged 6 commits into

from

Aug 27, 2022
 Merged


Revert "pip_compile: remove external/workspace_name prefix from gener…
#794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
248d7a2

Revert "pip_compile: remove external/workspace_name prefix from gener…


alexeagle Aug 17, 2022
c000948

Merge branch 'main' into revert_690


groodt Aug 27, 2022
5fd468b

Merge branch 'main' into revert_690


groodt Aug 27, 2022
cf931e3

Fixes


groodt Aug 27, 2022
74b9098

Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …


groodt Aug 27, 2022
7b7b0cc

Fixes


groodt Aug 27, 2022

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


1 change: 0 additions & 1 deletion
.bazelci/presubmit.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
 - "-//gazelle/..."
 # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
 - "-//tests:pip_repository_entry_points_example"
 - "-//tests:pip_deps_example"
 test_flags:
 - "--test_tag_filters=-fix-windows"

8 changes: 4 additions & 4 deletions
examples/pip_install/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
 --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
 --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.25.11 \
 --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
 --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_install/requirements_windows.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_parse/requirements_lock.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
 --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
 --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
 # via -r requirements.in
 # via -r ./requirements.in
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
six==1.16.0 \
 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
 # via requests
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse_vendored/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
 --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
 --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.26.9 \
 --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
 --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_repository_annotations/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
 --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
 # via -r requirements.in
 # via -r ./requirements.in

17 changes: 3 additions & 14 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

 parse_str_none = lambda s: None if s == "None" else s

 requirements_in = os.path.relpath(sys.argv.pop(1))
 requirements_txt = os.path.relpath(sys.argv.pop(1))
 requirements_in = sys.argv.pop(1)
 requirements_txt = sys.argv.pop(1)
 requirements_linux = parse_str_none(sys.argv.pop(1))
 requirements_darwin = parse_str_none(sys.argv.pop(1))
 requirements_windows = parse_str_none(sys.argv.pop(1))
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

 # Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

5 changes: 0 additions & 5 deletions
tests/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
 name = "pip_repository_entry_points_example",
 timeout = "long",
)

bazel_integration_test(
 name = "pip_deps_example",
 timeout = "long",
)

19 changes: 0 additions & 19 deletions
tests/pip_deps/BUILD

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
tests/pip_deps/README.md

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
tests/pip_deps/WORKSPACE

View file


Open in desktop


This file was deleted.


55 changes: 0 additions & 55 deletions
tests/pip_deps/pip_deps.bzl

View file


Open in desktop


This file was deleted.


136 changes: 0 additions & 136 deletions
tests/pip_deps/requirements.txt

View file


Open in desktop


This file was deleted.


4 changes: 0 additions & 4 deletions
tests/pip_deps/test.sh

View file


Open in desktop


This file was deleted.

Loading

, '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" + '
Revert "pip_compile: remove external/workspace_name prefix from gener… by alexeagle · Pull Request #794 · bazel-contrib/rules_python · GitHub
Skip to content
Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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

groodt
merged 6 commits into

from

Aug 27, 2022
 Merged


Revert "pip_compile: remove external/workspace_name prefix from gener…
#794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
248d7a2

Revert "pip_compile: remove external/workspace_name prefix from gener…


alexeagle Aug 17, 2022
c000948

Merge branch 'main' into revert_690


groodt Aug 27, 2022
5fd468b

Merge branch 'main' into revert_690


groodt Aug 27, 2022
cf931e3

Fixes


groodt Aug 27, 2022
74b9098

Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …


groodt Aug 27, 2022
7b7b0cc

Fixes


groodt Aug 27, 2022

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


1 change: 0 additions & 1 deletion
.bazelci/presubmit.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
 - "-//gazelle/..."
 # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
 - "-//tests:pip_repository_entry_points_example"
 - "-//tests:pip_deps_example"
 test_flags:
 - "--test_tag_filters=-fix-windows"

8 changes: 4 additions & 4 deletions
examples/pip_install/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
 --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
 --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.25.11 \
 --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
 --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_install/requirements_windows.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_parse/requirements_lock.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
 --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
 --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
 # via -r requirements.in
 # via -r ./requirements.in
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
six==1.16.0 \
 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
 # via requests
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse_vendored/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
 --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
 --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.26.9 \
 --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
 --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_repository_annotations/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
 --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
 # via -r requirements.in
 # via -r ./requirements.in

17 changes: 3 additions & 14 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

 parse_str_none = lambda s: None if s == "None" else s

 requirements_in = os.path.relpath(sys.argv.pop(1))
 requirements_txt = os.path.relpath(sys.argv.pop(1))
 requirements_in = sys.argv.pop(1)
 requirements_txt = sys.argv.pop(1)
 requirements_linux = parse_str_none(sys.argv.pop(1))
 requirements_darwin = parse_str_none(sys.argv.pop(1))
 requirements_windows = parse_str_none(sys.argv.pop(1))
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

 # Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

5 changes: 0 additions & 5 deletions
tests/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
 name = "pip_repository_entry_points_example",
 timeout = "long",
)

bazel_integration_test(
 name = "pip_deps_example",
 timeout = "long",
)

19 changes: 0 additions & 19 deletions
tests/pip_deps/BUILD

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
tests/pip_deps/README.md

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
tests/pip_deps/WORKSPACE

View file


Open in desktop


This file was deleted.


55 changes: 0 additions & 55 deletions
tests/pip_deps/pip_deps.bzl

View file


Open in desktop


This file was deleted.


136 changes: 0 additions & 136 deletions
tests/pip_deps/requirements.txt

View file


Open in desktop


This file was deleted.


4 changes: 0 additions & 4 deletions
tests/pip_deps/test.sh

View file


Open in desktop


This file was deleted.

Loading

, '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('^' + ".*" + '
Revert "pip_compile: remove external/workspace_name prefix from gener… by alexeagle · Pull Request #794 · bazel-contrib/rules_python · GitHub
Skip to content
Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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

groodt
merged 6 commits into

from

Aug 27, 2022
 Merged


Revert "pip_compile: remove external/workspace_name prefix from gener…
#794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
248d7a2

Revert "pip_compile: remove external/workspace_name prefix from gener…


alexeagle Aug 17, 2022
c000948

Merge branch 'main' into revert_690


groodt Aug 27, 2022
5fd468b

Merge branch 'main' into revert_690


groodt Aug 27, 2022
cf931e3

Fixes


groodt Aug 27, 2022
74b9098

Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …


groodt Aug 27, 2022
7b7b0cc

Fixes


groodt Aug 27, 2022

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


1 change: 0 additions & 1 deletion
.bazelci/presubmit.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
 - "-//gazelle/..."
 # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
 - "-//tests:pip_repository_entry_points_example"
 - "-//tests:pip_deps_example"
 test_flags:
 - "--test_tag_filters=-fix-windows"

8 changes: 4 additions & 4 deletions
examples/pip_install/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
 --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
 --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.25.11 \
 --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
 --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_install/requirements_windows.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_parse/requirements_lock.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
 --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
 --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
 # via -r requirements.in
 # via -r ./requirements.in
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
six==1.16.0 \
 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
 # via requests
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse_vendored/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
 --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
 --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.26.9 \
 --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
 --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_repository_annotations/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
 --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
 # via -r requirements.in
 # via -r ./requirements.in

17 changes: 3 additions & 14 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

 parse_str_none = lambda s: None if s == "None" else s

 requirements_in = os.path.relpath(sys.argv.pop(1))
 requirements_txt = os.path.relpath(sys.argv.pop(1))
 requirements_in = sys.argv.pop(1)
 requirements_txt = sys.argv.pop(1)
 requirements_linux = parse_str_none(sys.argv.pop(1))
 requirements_darwin = parse_str_none(sys.argv.pop(1))
 requirements_windows = parse_str_none(sys.argv.pop(1))
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

 # Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

5 changes: 0 additions & 5 deletions
tests/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
 name = "pip_repository_entry_points_example",
 timeout = "long",
)

bazel_integration_test(
 name = "pip_deps_example",
 timeout = "long",
)

19 changes: 0 additions & 19 deletions
tests/pip_deps/BUILD

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
tests/pip_deps/README.md

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
tests/pip_deps/WORKSPACE

View file


Open in desktop


This file was deleted.


55 changes: 0 additions & 55 deletions
tests/pip_deps/pip_deps.bzl

View file


Open in desktop


This file was deleted.


136 changes: 0 additions & 136 deletions
tests/pip_deps/requirements.txt

View file


Open in desktop


This file was deleted.


4 changes: 0 additions & 4 deletions
tests/pip_deps/test.sh

View file


Open in desktop


This file was deleted.

Loading

, '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('^' + ".*" + '
Revert "pip_compile: remove external/workspace_name prefix from gener… by alexeagle · Pull Request #794 · bazel-contrib/rules_python · GitHub
Skip to content
Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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

groodt
merged 6 commits into

from

Aug 27, 2022
 Merged


Revert "pip_compile: remove external/workspace_name prefix from gener…
#794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
248d7a2

Revert "pip_compile: remove external/workspace_name prefix from gener…


alexeagle Aug 17, 2022
c000948

Merge branch 'main' into revert_690


groodt Aug 27, 2022
5fd468b

Merge branch 'main' into revert_690


groodt Aug 27, 2022
cf931e3

Fixes


groodt Aug 27, 2022
74b9098

Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …


groodt Aug 27, 2022
7b7b0cc

Fixes


groodt Aug 27, 2022

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


1 change: 0 additions & 1 deletion
.bazelci/presubmit.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
 - "-//gazelle/..."
 # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
 - "-//tests:pip_repository_entry_points_example"
 - "-//tests:pip_deps_example"
 test_flags:
 - "--test_tag_filters=-fix-windows"

8 changes: 4 additions & 4 deletions
examples/pip_install/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
 --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
 --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.25.11 \
 --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
 --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_install/requirements_windows.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_parse/requirements_lock.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
 --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
 --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
 # via -r requirements.in
 # via -r ./requirements.in
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
six==1.16.0 \
 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
 # via requests
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse_vendored/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
 --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
 --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.26.9 \
 --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
 --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_repository_annotations/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
 --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
 # via -r requirements.in
 # via -r ./requirements.in

17 changes: 3 additions & 14 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

 parse_str_none = lambda s: None if s == "None" else s

 requirements_in = os.path.relpath(sys.argv.pop(1))
 requirements_txt = os.path.relpath(sys.argv.pop(1))
 requirements_in = sys.argv.pop(1)
 requirements_txt = sys.argv.pop(1)
 requirements_linux = parse_str_none(sys.argv.pop(1))
 requirements_darwin = parse_str_none(sys.argv.pop(1))
 requirements_windows = parse_str_none(sys.argv.pop(1))
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

 # Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

5 changes: 0 additions & 5 deletions
tests/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
 name = "pip_repository_entry_points_example",
 timeout = "long",
)

bazel_integration_test(
 name = "pip_deps_example",
 timeout = "long",
)

19 changes: 0 additions & 19 deletions
tests/pip_deps/BUILD

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
tests/pip_deps/README.md

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
tests/pip_deps/WORKSPACE

View file


Open in desktop


This file was deleted.


55 changes: 0 additions & 55 deletions
tests/pip_deps/pip_deps.bzl

View file


Open in desktop


This file was deleted.


136 changes: 0 additions & 136 deletions
tests/pip_deps/requirements.txt

View file


Open in desktop


This file was deleted.


4 changes: 0 additions & 4 deletions
tests/pip_deps/test.sh

View file


Open in desktop


This file was deleted.

Loading

, '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); }
})();
})();
Revert "pip_compile: remove external/workspace_name prefix from gener… by alexeagle · Pull Request #794 · bazel-contrib/rules_python · GitHub
Skip to content
Revert "pip_compile: remove external/workspace_name prefix from gener…#794

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

groodt
merged 6 commits into

from

Aug 27, 2022
 Merged


Revert "pip_compile: remove external/workspace_name prefix from gener…
#794
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
248d7a2

Revert "pip_compile: remove external/workspace_name prefix from gener…


alexeagle Aug 17, 2022
c000948

Merge branch 'main' into revert_690


groodt Aug 27, 2022
5fd468b

Merge branch 'main' into revert_690


groodt Aug 27, 2022
cf931e3

Fixes


groodt Aug 27, 2022
74b9098

Merge branch 'revert_690' of github.com:bazelbuild/rules_python into …


groodt Aug 27, 2022
7b7b0cc

Fixes


groodt Aug 27, 2022

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


1 change: 0 additions & 1 deletion
.bazelci/presubmit.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,5 @@ platforms:
 - "-//gazelle/..."
 # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
 - "-//tests:pip_repository_entry_points_example"
 - "-//tests:pip_deps_example"
 test_flags:
 - "--test_tag_filters=-fix-windows"

8 changes: 4 additions & 4 deletions
examples/pip_install/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -89,14 +89,14 @@ six==1.16.0 \
tree-sitter==0.20.0 ; sys_platform != "win32" \
 --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
 --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.25.11 \
 --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
 --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_install/requirements_windows.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
boto3==1.14.51 \
 --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
 --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
 # via -r requirements.in
 # via -r ./requirements.in
botocore==1.17.63 \
 --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
 --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
Expand DownExpand Up@@ -77,7 +77,7 @@ pyyaml==6.0 \
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
s3transfer==0.3.7 \
 --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
 --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
Expand All@@ -92,7 +92,7 @@ urllib3==1.25.11 \
 # via botocore
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

6 changes: 3 additions & 3 deletions
examples/pip_parse/requirements_lock.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,11 +66,11 @@ pyyaml==6.0 \
requests==2.25.1 \
 --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
 --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
 # via -r requirements.in
 # via -r ./requirements.in
s3cmd==2.1.0 \
 --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
 --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
 # via -r requirements.in
 # via -r ./requirements.in
six==1.16.0 \
 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand All@@ -81,7 +81,7 @@ urllib3==1.26.7 \
 # via requests
yamllint==1.26.3 \
 --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
 # via -r requirements.in
 # via -r ./requirements.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==59.6.0 \
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_parse_vendored/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ idna==3.3 \
requests==2.27.1 \
 --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
 --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
 # via -r requirements.in
 # via -r ./requirements.in
urllib3==1.26.9 \
 --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
 --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
Expand Down

2 changes: 1 addition & 1 deletion
examples/pip_repository_annotations/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,4 @@
wheel==0.37.1 \
 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
 --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
 # via -r requirements.in
 # via -r ./requirements.in

17 changes: 3 additions & 14 deletions
python/pip_install/pip_compile.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,20 +35,11 @@ def _select_golden_requirements_file(

 parse_str_none = lambda s: None if s == "None" else s

 requirements_in = os.path.relpath(sys.argv.pop(1))
 requirements_txt = os.path.relpath(sys.argv.pop(1))
 requirements_in = sys.argv.pop(1)
 requirements_txt = sys.argv.pop(1)
 requirements_linux = parse_str_none(sys.argv.pop(1))
 requirements_darwin = parse_str_none(sys.argv.pop(1))
 requirements_windows = parse_str_none(sys.argv.pop(1))
 parts = requirements_in.split(os.path.sep, 2)
 if parts[0] == "external":
 requirements_in = parts[2]
 requirements_txt = (
 requirements_txt
 if "BUILD_WORKSPACE_DIRECTORY" in os.environ
 else os.path.join("..", "..", requirements_txt)
 )
 os.chdir(os.path.join(parts[0], parts[1]))
 update_target_label = sys.argv.pop(1)

 # Before loading click, set the locale for its parser.
Expand DownExpand Up@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
 #
 # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
 # from different directories within the WORKSPACE.
 requirements_txt = os.path.join(
 os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
 )
 os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
 else:
 err_msg = (
 "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "
Expand Down

5 changes: 0 additions & 5 deletions
tests/BUILD

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,3 @@ bazel_integration_test(
 name = "pip_repository_entry_points_example",
 timeout = "long",
)

bazel_integration_test(
 name = "pip_deps_example",
 timeout = "long",
)

19 changes: 0 additions & 19 deletions
tests/pip_deps/BUILD

View file


Open in desktop


This file was deleted.


1 change: 0 additions & 1 deletion
tests/pip_deps/README.md

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
tests/pip_deps/WORKSPACE

View file


Open in desktop


This file was deleted.


55 changes: 0 additions & 55 deletions
tests/pip_deps/pip_deps.bzl

View file


Open in desktop


This file was deleted.


136 changes: 0 additions & 136 deletions
tests/pip_deps/requirements.txt

View file


Open in desktop


This file was deleted.


4 changes: 0 additions & 4 deletions
tests/pip_deps/test.sh

View file


Open in desktop


This file was deleted.

Loading