Skip to content

test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

Closed
aignas wants to merge 4 commits into from
Closed

test(pip_parse): add integration tests for macros in requirements.bzl #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
def3f2a
test(bzlmod): explicitly enable bzlmod in the test harness
aignas May 4, 2023
1af3809
test(pip_parse): add integration tests for macros in requirements.bzl
aignas May 4, 2023
8e50128
feat: add bzlmod and use macro_tmpl for expansion in pip_repository
aignas May 5, 2023
521486d
Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…
aignas May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .bazelrc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down
5 changes: 4 additions & 1 deletion python/pip_install/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
name = "distribution",
srcs = glob(["*.bzl"]) + [
srcs = glob([
"*.bzl",
"*.bzl.tmpl",
]) + [
"BUILD.bazel",
"//python/pip_install/private:distribution",
"//python/pip_install/tools/dependency_resolver:distribution",
Expand Down
4 changes: 2 additions & 2 deletions python/pip_install/pip_repository.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
rctx.file("BUILD.bazel", build_contents)
rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
"%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
for p in bzl_packages
]),
"%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
for p in bzl_packages
]),
"%%MACRO_TMPL%%": macro_tmpl,
Expand Down
6 changes: 6 additions & 0 deletions tests/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
tags = ["fix-windows"],
)

bazel_integration_test(
name = "pip_parse_test",
timeout = "long",
dirname = "pip_parse",
)

build_test(
name = "bzl_libraries_build_test",
targets = [
Expand Down
7 changes: 7 additions & 0 deletions tests/pip_parse/.bazelrc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc
4 changes: 4 additions & 0 deletions tests/pip_parse/.gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc
12 changes: 12 additions & 0 deletions tests/pip_parse/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
name = "requirements",
extra_args = [
"--allow-unsafe",
"--resolver=backtracking",
],
requirements_in = "requirements.in",
requirements_txt = "requirements_lock.txt",
requirements_windows = "requirements_windows.txt",
)
45 changes: 45 additions & 0 deletions tests/pip_parse/MODULE.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
name = "example_bzlmod",
version = "0.0.0",
compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
module_name = "rules_python",
path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
name = "python3_9",
configure_coverage_tool = True,
python_version = "3.9",
)
use_repo(
python,
"python3_9",
"python3_9_host_interpreter",
"python3_9_toolchains",
)

register_toolchains(
"@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
name = "pypi",
python_interpreter_target = "@python3_9_host_interpreter//:python",
requirements_lock = "//:requirements_lock.txt",
requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
name = "pypi_aliases",
incompatible_generate_aliases = True,
python_interpreter_target = "@python3_9_host_interpreter//:python",
requirements_lock = "//:requirements_lock.txt",
requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")
8 changes: 8 additions & 0 deletions tests/pip_parse/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.
43 changes: 43 additions & 0 deletions tests/pip_parse/WORKSPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
name = "rules_python",
path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
name = "python3_9",
python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
name = "pypi",
incompatible_generate_aliases = False,
python_interpreter_target = interpreter,
requirements_lock = "//:requirements_lock.txt",
requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
name = "pypi_aliases",
incompatible_generate_aliases = True,
python_interpreter_target = interpreter,
requirements = "//:requirements_lock.txt",
requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod
View file
Open in desktop
Empty file.
41 changes: 41 additions & 0 deletions tests/pip_parse/aliases/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
"requests",
"s3cmd",
"yamllint",
"tabulate",
"pylint",
"python-dateutil",
]

build_test(
name = "build_pkgs",
targets = [requirement(p) for p in _PACKAGES],
)

build_test(
name = "build_whls",
targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
name = "build_data",
targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
name = "build_dist_info",
targets = [dist_info_requirement(p) for p in _PACKAGES],
)
41 changes: 41 additions & 0 deletions tests/pip_parse/regular/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
"requests",
"s3cmd",
"yamllint",
"tabulate",
"pylint",
"python-dateutil",
]

build_test(
name = "build_pkgs",
targets = [requirement(p) for p in _PACKAGES],
)

build_test(
name = "build_whls",
targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
name = "build_data",
targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
name = "build_dist_info",
targets = [dist_info_requirement(p) for p in _PACKAGES],
)
6 changes: 6 additions & 0 deletions tests/pip_parse/requirements.in
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
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" + '
test(pip_parse): add integration tests for macros in requirements.bzl by aignas · Pull Request #1205 · bazel-contrib/rules_python · GitHub
Skip to content
test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

 Closed

aignas
wants to merge
4
commits into

from

 Closed


test(pip_parse): add integration tests for macros in requirements.bzl
#1205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
def3f2a

test(bzlmod): explicitly enable bzlmod in the test harness


aignas May 4, 2023
1af3809

test(pip_parse): add integration tests for macros in requirements.bzl


aignas May 4, 2023
8e50128

feat: add bzlmod and use macro_tmpl for expansion in pip_repository


aignas May 5, 2023
521486d

Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…


aignas May 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down

5 changes: 4 additions & 1 deletion
python/pip_install/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
 name = "distribution",
 srcs = glob(["*.bzl"]) + [
 srcs = glob([
 "*.bzl",
 "*.bzl.tmpl",
 ]) + [
 "BUILD.bazel",
 "//python/pip_install/private:distribution",
 "//python/pip_install/tools/dependency_resolver:distribution",
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand Down

6 changes: 6 additions & 0 deletions
tests/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
 tags = ["fix-windows"],
)

bazel_integration_test(
 name = "pip_parse_test",
 timeout = "long",
 dirname = "pip_parse",
)

build_test(
 name = "bzl_libraries_build_test",
 targets = [
Expand Down

7 changes: 7 additions & 0 deletions
tests/pip_parse/.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

4 changes: 4 additions & 0 deletions
tests/pip_parse/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc

12 changes: 12 additions & 0 deletions
tests/pip_parse/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
 name = "requirements",
 extra_args = [
 "--allow-unsafe",
 "--resolver=backtracking",
 ],
 requirements_in = "requirements.in",
 requirements_txt = "requirements_lock.txt",
 requirements_windows = "requirements_windows.txt",
)

45 changes: 45 additions & 0 deletions
tests/pip_parse/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
 name = "example_bzlmod",
 version = "0.0.0",
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
 path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
 name = "python3_9",
 configure_coverage_tool = True,
 python_version = "3.9",
)
use_repo(
 python,
 "python3_9",
 "python3_9_host_interpreter",
 "python3_9_toolchains",
)

register_toolchains(
 "@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
 name = "pypi",
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")

8 changes: 8 additions & 0 deletions
tests/pip_parse/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.

43 changes: 43 additions & 0 deletions
tests/pip_parse/WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
 name = "rules_python",
 path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
 name = "python3_9",
 python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
 name = "pypi",
 incompatible_generate_aliases = False,
 python_interpreter_target = interpreter,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = interpreter,
 requirements = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod

View file


Open in desktop


Empty file.


41 changes: 41 additions & 0 deletions
tests/pip_parse/aliases/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

41 changes: 41 additions & 0 deletions
tests/pip_parse/regular/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

6 changes: 6 additions & 0 deletions
tests/pip_parse/requirements.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
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('^' + ".*" + '
test(pip_parse): add integration tests for macros in requirements.bzl by aignas · Pull Request #1205 · bazel-contrib/rules_python · GitHub
Skip to content
test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

 Closed

aignas
wants to merge
4
commits into

from

 Closed


test(pip_parse): add integration tests for macros in requirements.bzl
#1205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
def3f2a

test(bzlmod): explicitly enable bzlmod in the test harness


aignas May 4, 2023
1af3809

test(pip_parse): add integration tests for macros in requirements.bzl


aignas May 4, 2023
8e50128

feat: add bzlmod and use macro_tmpl for expansion in pip_repository


aignas May 5, 2023
521486d

Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…


aignas May 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down

5 changes: 4 additions & 1 deletion
python/pip_install/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
 name = "distribution",
 srcs = glob(["*.bzl"]) + [
 srcs = glob([
 "*.bzl",
 "*.bzl.tmpl",
 ]) + [
 "BUILD.bazel",
 "//python/pip_install/private:distribution",
 "//python/pip_install/tools/dependency_resolver:distribution",
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand Down

6 changes: 6 additions & 0 deletions
tests/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
 tags = ["fix-windows"],
)

bazel_integration_test(
 name = "pip_parse_test",
 timeout = "long",
 dirname = "pip_parse",
)

build_test(
 name = "bzl_libraries_build_test",
 targets = [
Expand Down

7 changes: 7 additions & 0 deletions
tests/pip_parse/.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

4 changes: 4 additions & 0 deletions
tests/pip_parse/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc

12 changes: 12 additions & 0 deletions
tests/pip_parse/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
 name = "requirements",
 extra_args = [
 "--allow-unsafe",
 "--resolver=backtracking",
 ],
 requirements_in = "requirements.in",
 requirements_txt = "requirements_lock.txt",
 requirements_windows = "requirements_windows.txt",
)

45 changes: 45 additions & 0 deletions
tests/pip_parse/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
 name = "example_bzlmod",
 version = "0.0.0",
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
 path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
 name = "python3_9",
 configure_coverage_tool = True,
 python_version = "3.9",
)
use_repo(
 python,
 "python3_9",
 "python3_9_host_interpreter",
 "python3_9_toolchains",
)

register_toolchains(
 "@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
 name = "pypi",
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")

8 changes: 8 additions & 0 deletions
tests/pip_parse/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.

43 changes: 43 additions & 0 deletions
tests/pip_parse/WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
 name = "rules_python",
 path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
 name = "python3_9",
 python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
 name = "pypi",
 incompatible_generate_aliases = False,
 python_interpreter_target = interpreter,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = interpreter,
 requirements = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod

View file


Open in desktop


Empty file.


41 changes: 41 additions & 0 deletions
tests/pip_parse/aliases/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

41 changes: 41 additions & 0 deletions
tests/pip_parse/regular/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

6 changes: 6 additions & 0 deletions
tests/pip_parse/requirements.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
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('^' + ".*" + '
test(pip_parse): add integration tests for macros in requirements.bzl by aignas · Pull Request #1205 · bazel-contrib/rules_python · GitHub
Skip to content
test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

 Closed

aignas
wants to merge
4
commits into

from

 Closed


test(pip_parse): add integration tests for macros in requirements.bzl
#1205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
def3f2a

test(bzlmod): explicitly enable bzlmod in the test harness


aignas May 4, 2023
1af3809

test(pip_parse): add integration tests for macros in requirements.bzl


aignas May 4, 2023
8e50128

feat: add bzlmod and use macro_tmpl for expansion in pip_repository


aignas May 5, 2023
521486d

Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…


aignas May 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down

5 changes: 4 additions & 1 deletion
python/pip_install/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
 name = "distribution",
 srcs = glob(["*.bzl"]) + [
 srcs = glob([
 "*.bzl",
 "*.bzl.tmpl",
 ]) + [
 "BUILD.bazel",
 "//python/pip_install/private:distribution",
 "//python/pip_install/tools/dependency_resolver:distribution",
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand Down

6 changes: 6 additions & 0 deletions
tests/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
 tags = ["fix-windows"],
)

bazel_integration_test(
 name = "pip_parse_test",
 timeout = "long",
 dirname = "pip_parse",
)

build_test(
 name = "bzl_libraries_build_test",
 targets = [
Expand Down

7 changes: 7 additions & 0 deletions
tests/pip_parse/.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

4 changes: 4 additions & 0 deletions
tests/pip_parse/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc

12 changes: 12 additions & 0 deletions
tests/pip_parse/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
 name = "requirements",
 extra_args = [
 "--allow-unsafe",
 "--resolver=backtracking",
 ],
 requirements_in = "requirements.in",
 requirements_txt = "requirements_lock.txt",
 requirements_windows = "requirements_windows.txt",
)

45 changes: 45 additions & 0 deletions
tests/pip_parse/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
 name = "example_bzlmod",
 version = "0.0.0",
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
 path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
 name = "python3_9",
 configure_coverage_tool = True,
 python_version = "3.9",
)
use_repo(
 python,
 "python3_9",
 "python3_9_host_interpreter",
 "python3_9_toolchains",
)

register_toolchains(
 "@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
 name = "pypi",
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")

8 changes: 8 additions & 0 deletions
tests/pip_parse/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.

43 changes: 43 additions & 0 deletions
tests/pip_parse/WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
 name = "rules_python",
 path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
 name = "python3_9",
 python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
 name = "pypi",
 incompatible_generate_aliases = False,
 python_interpreter_target = interpreter,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = interpreter,
 requirements = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod

View file


Open in desktop


Empty file.


41 changes: 41 additions & 0 deletions
tests/pip_parse/aliases/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

41 changes: 41 additions & 0 deletions
tests/pip_parse/regular/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

6 changes: 6 additions & 0 deletions
tests/pip_parse/requirements.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
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" + '
test(pip_parse): add integration tests for macros in requirements.bzl by aignas · Pull Request #1205 · bazel-contrib/rules_python · GitHub
Skip to content
test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

 Closed

aignas
wants to merge
4
commits into

from

 Closed


test(pip_parse): add integration tests for macros in requirements.bzl
#1205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
def3f2a

test(bzlmod): explicitly enable bzlmod in the test harness


aignas May 4, 2023
1af3809

test(pip_parse): add integration tests for macros in requirements.bzl


aignas May 4, 2023
8e50128

feat: add bzlmod and use macro_tmpl for expansion in pip_repository


aignas May 5, 2023
521486d

Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…


aignas May 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down

5 changes: 4 additions & 1 deletion
python/pip_install/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
 name = "distribution",
 srcs = glob(["*.bzl"]) + [
 srcs = glob([
 "*.bzl",
 "*.bzl.tmpl",
 ]) + [
 "BUILD.bazel",
 "//python/pip_install/private:distribution",
 "//python/pip_install/tools/dependency_resolver:distribution",
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand Down

6 changes: 6 additions & 0 deletions
tests/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
 tags = ["fix-windows"],
)

bazel_integration_test(
 name = "pip_parse_test",
 timeout = "long",
 dirname = "pip_parse",
)

build_test(
 name = "bzl_libraries_build_test",
 targets = [
Expand Down

7 changes: 7 additions & 0 deletions
tests/pip_parse/.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

4 changes: 4 additions & 0 deletions
tests/pip_parse/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc

12 changes: 12 additions & 0 deletions
tests/pip_parse/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
 name = "requirements",
 extra_args = [
 "--allow-unsafe",
 "--resolver=backtracking",
 ],
 requirements_in = "requirements.in",
 requirements_txt = "requirements_lock.txt",
 requirements_windows = "requirements_windows.txt",
)

45 changes: 45 additions & 0 deletions
tests/pip_parse/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
 name = "example_bzlmod",
 version = "0.0.0",
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
 path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
 name = "python3_9",
 configure_coverage_tool = True,
 python_version = "3.9",
)
use_repo(
 python,
 "python3_9",
 "python3_9_host_interpreter",
 "python3_9_toolchains",
)

register_toolchains(
 "@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
 name = "pypi",
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")

8 changes: 8 additions & 0 deletions
tests/pip_parse/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.

43 changes: 43 additions & 0 deletions
tests/pip_parse/WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
 name = "rules_python",
 path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
 name = "python3_9",
 python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
 name = "pypi",
 incompatible_generate_aliases = False,
 python_interpreter_target = interpreter,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = interpreter,
 requirements = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod

View file


Open in desktop


Empty file.


41 changes: 41 additions & 0 deletions
tests/pip_parse/aliases/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

41 changes: 41 additions & 0 deletions
tests/pip_parse/regular/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

6 changes: 6 additions & 0 deletions
tests/pip_parse/requirements.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
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('^' + ".*" + '
test(pip_parse): add integration tests for macros in requirements.bzl by aignas · Pull Request #1205 · bazel-contrib/rules_python · GitHub
Skip to content
test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

 Closed

aignas
wants to merge
4
commits into

from

 Closed


test(pip_parse): add integration tests for macros in requirements.bzl
#1205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
def3f2a

test(bzlmod): explicitly enable bzlmod in the test harness


aignas May 4, 2023
1af3809

test(pip_parse): add integration tests for macros in requirements.bzl


aignas May 4, 2023
8e50128

feat: add bzlmod and use macro_tmpl for expansion in pip_repository


aignas May 5, 2023
521486d

Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…


aignas May 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down

5 changes: 4 additions & 1 deletion
python/pip_install/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
 name = "distribution",
 srcs = glob(["*.bzl"]) + [
 srcs = glob([
 "*.bzl",
 "*.bzl.tmpl",
 ]) + [
 "BUILD.bazel",
 "//python/pip_install/private:distribution",
 "//python/pip_install/tools/dependency_resolver:distribution",
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand Down

6 changes: 6 additions & 0 deletions
tests/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
 tags = ["fix-windows"],
)

bazel_integration_test(
 name = "pip_parse_test",
 timeout = "long",
 dirname = "pip_parse",
)

build_test(
 name = "bzl_libraries_build_test",
 targets = [
Expand Down

7 changes: 7 additions & 0 deletions
tests/pip_parse/.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

4 changes: 4 additions & 0 deletions
tests/pip_parse/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc

12 changes: 12 additions & 0 deletions
tests/pip_parse/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
 name = "requirements",
 extra_args = [
 "--allow-unsafe",
 "--resolver=backtracking",
 ],
 requirements_in = "requirements.in",
 requirements_txt = "requirements_lock.txt",
 requirements_windows = "requirements_windows.txt",
)

45 changes: 45 additions & 0 deletions
tests/pip_parse/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
 name = "example_bzlmod",
 version = "0.0.0",
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
 path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
 name = "python3_9",
 configure_coverage_tool = True,
 python_version = "3.9",
)
use_repo(
 python,
 "python3_9",
 "python3_9_host_interpreter",
 "python3_9_toolchains",
)

register_toolchains(
 "@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
 name = "pypi",
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")

8 changes: 8 additions & 0 deletions
tests/pip_parse/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.

43 changes: 43 additions & 0 deletions
tests/pip_parse/WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
 name = "rules_python",
 path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
 name = "python3_9",
 python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
 name = "pypi",
 incompatible_generate_aliases = False,
 python_interpreter_target = interpreter,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = interpreter,
 requirements = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod

View file


Open in desktop


Empty file.


41 changes: 41 additions & 0 deletions
tests/pip_parse/aliases/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

41 changes: 41 additions & 0 deletions
tests/pip_parse/regular/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

6 changes: 6 additions & 0 deletions
tests/pip_parse/requirements.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
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('^' + ".*" + '
test(pip_parse): add integration tests for macros in requirements.bzl by aignas · Pull Request #1205 · bazel-contrib/rules_python · GitHub
Skip to content
test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

 Closed

aignas
wants to merge
4
commits into

from

 Closed


test(pip_parse): add integration tests for macros in requirements.bzl
#1205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
def3f2a

test(bzlmod): explicitly enable bzlmod in the test harness


aignas May 4, 2023
1af3809

test(pip_parse): add integration tests for macros in requirements.bzl


aignas May 4, 2023
8e50128

feat: add bzlmod and use macro_tmpl for expansion in pip_repository


aignas May 5, 2023
521486d

Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…


aignas May 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down

5 changes: 4 additions & 1 deletion
python/pip_install/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
 name = "distribution",
 srcs = glob(["*.bzl"]) + [
 srcs = glob([
 "*.bzl",
 "*.bzl.tmpl",
 ]) + [
 "BUILD.bazel",
 "//python/pip_install/private:distribution",
 "//python/pip_install/tools/dependency_resolver:distribution",
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand Down

6 changes: 6 additions & 0 deletions
tests/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
 tags = ["fix-windows"],
)

bazel_integration_test(
 name = "pip_parse_test",
 timeout = "long",
 dirname = "pip_parse",
)

build_test(
 name = "bzl_libraries_build_test",
 targets = [
Expand Down

7 changes: 7 additions & 0 deletions
tests/pip_parse/.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

4 changes: 4 additions & 0 deletions
tests/pip_parse/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc

12 changes: 12 additions & 0 deletions
tests/pip_parse/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
 name = "requirements",
 extra_args = [
 "--allow-unsafe",
 "--resolver=backtracking",
 ],
 requirements_in = "requirements.in",
 requirements_txt = "requirements_lock.txt",
 requirements_windows = "requirements_windows.txt",
)

45 changes: 45 additions & 0 deletions
tests/pip_parse/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
 name = "example_bzlmod",
 version = "0.0.0",
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
 path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
 name = "python3_9",
 configure_coverage_tool = True,
 python_version = "3.9",
)
use_repo(
 python,
 "python3_9",
 "python3_9_host_interpreter",
 "python3_9_toolchains",
)

register_toolchains(
 "@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
 name = "pypi",
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")

8 changes: 8 additions & 0 deletions
tests/pip_parse/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.

43 changes: 43 additions & 0 deletions
tests/pip_parse/WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
 name = "rules_python",
 path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
 name = "python3_9",
 python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
 name = "pypi",
 incompatible_generate_aliases = False,
 python_interpreter_target = interpreter,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = interpreter,
 requirements = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod

View file


Open in desktop


Empty file.


41 changes: 41 additions & 0 deletions
tests/pip_parse/aliases/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

41 changes: 41 additions & 0 deletions
tests/pip_parse/regular/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

6 changes: 6 additions & 0 deletions
tests/pip_parse/requirements.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
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); }
})();
})();
test(pip_parse): add integration tests for macros in requirements.bzl by aignas · Pull Request #1205 · bazel-contrib/rules_python · GitHub
Skip to content
test(pip_parse): add integration tests for macros in requirements.bzl#1205

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

 Closed

aignas
wants to merge
4
commits into

from

 Closed


test(pip_parse): add integration tests for macros in requirements.bzl
#1205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
def3f2a

test(bzlmod): explicitly enable bzlmod in the test harness


aignas May 4, 2023
1af3809

test(pip_parse): add integration tests for macros in requirements.bzl


aignas May 4, 2023
8e50128

feat: add bzlmod and use macro_tmpl for expansion in pip_repository


aignas May 5, 2023
521486d

Merge branch 'fix/integration-tests-correctly-enable-bzlmod' into tes…


aignas May 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@
# This lets us glob() up all the files inside the examples to make them inputs to tests
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/get_url,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/py_proto_library,examples/relative_requirements,tests/compile_pip_requirements,tests/pip_repository_entry_points,tests/pip_deps
build --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points
query --deleted_packages=examples/build_file_generation,examples/build_file_generation/random_number_generator,examples/bzlmod,examples/bzlmod_build_file_generation,examples/bzlmod_build_file_generation/other_module/other_module/pkg,examples/bzlmod_build_file_generation/runfiles,examples/bzlmod/other_module/other_module/pkg,examples/bzlmod/runfiles,examples/multi_python_versions/libs/my_lib,examples/multi_python_versions/requirements,examples/multi_python_versions/tests,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_proto_library,tests/compile_pip_requirements,tests/compile_pip_requirements_test_from_external_workspace,tests/ignore_root_user_error,tests/pip_parse,tests/pip_parse/aliases,tests/pip_parse/regular,tests/pip_repository_entry_points

test --test_output=errors

Expand Down

5 changes: 4 additions & 1 deletion
python/pip_install/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
filegroup(
 name = "distribution",
 srcs = glob(["*.bzl"]) + [
 srcs = glob([
 "*.bzl",
 "*.bzl.tmpl",
 ]) + [
 "BUILD.bazel",
 "//python/pip_install/private:distribution",
 "//python/pip_install/tools/dependency_resolver:distribution",
Expand Down

4 changes: 2 additions & 2 deletions
python/pip_install/pip_repository.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,11 +379,11 @@ def _pip_repository_bzlmod_impl(rctx):
 rctx.file("BUILD.bazel", build_contents)
 rctx.template("requirements.bzl", rctx.attr._template, substitutions = {
 "%%ALL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:pkg".format(rctx.attr.name, p)
macro_tmpl.format(p, "pkg")
 for p in bzl_packages
 ]),
 "%%ALL_WHL_REQUIREMENTS%%": _format_repr_list([
"@{}//{}:whl".format(repo_name, p) if rctx.attr.incompatible_generate_aliases else "@{}_{}//:whl".format(rctx.attr.name, p)
macro_tmpl.format(p, "whl")
 for p in bzl_packages
 ]),
 "%%MACRO_TMPL%%": macro_tmpl,
Expand Down

6 changes: 6 additions & 0 deletions
tests/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,12 @@ bazel_integration_test(
 tags = ["fix-windows"],
)

bazel_integration_test(
 name = "pip_parse_test",
 timeout = "long",
 dirname = "pip_parse",
)

build_test(
 name = "bzl_libraries_build_test",
 targets = [
Expand Down

7 changes: 7 additions & 0 deletions
tests/pip_parse/.bazelrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
# Bazel configuration flags

build --enable_runfiles
startup --windows_enable_symlinks

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

4 changes: 4 additions & 0 deletions
tests/pip_parse/.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
# git ignore patterns

/bazel-*
user.bazelrc

12 changes: 12 additions & 0 deletions
tests/pip_parse/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
load("@rules_python//python:pip.bzl", "compile_pip_requirements")

compile_pip_requirements(
 name = "requirements",
 extra_args = [
 "--allow-unsafe",
 "--resolver=backtracking",
 ],
 requirements_in = "requirements.in",
 requirements_txt = "requirements_lock.txt",
 requirements_windows = "requirements_windows.txt",
)

45 changes: 45 additions & 0 deletions
tests/pip_parse/MODULE.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
module(
 name = "example_bzlmod",
 version = "0.0.0",
 compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "rules_python", version = "0.0.0")
local_path_override(
 module_name = "rules_python",
 path = "../..",
)

python = use_extension("@rules_python//python:extensions.bzl", "python")
python.toolchain(
 name = "python3_9",
 configure_coverage_tool = True,
 python_version = "3.9",
)
use_repo(
 python,
 "python3_9",
 "python3_9_host_interpreter",
 "python3_9_toolchains",
)

register_toolchains(
 "@python3_9_toolchains//:all",
)

pip = use_extension("@rules_python//python:extensions.bzl", "pip")
pip.parse(
 name = "pypi",
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
pip.parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = "@python3_9_host_interpreter//:python",
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)
use_repo(pip, "pypi", "pypi_aliases")

8 changes: 8 additions & 0 deletions
tests/pip_parse/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
# pip_parse integration tests

This directory contains tests for both, the `pip_parse` repository rules and
the extensions in order to ensure that the resultant contents of the
`@<name>//:requirements.bzl` work as intended.

For now we only try to build the targets that we can access via the macros or
the label lists.

43 changes: 43 additions & 0 deletions
tests/pip_parse/WORKSPACE

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
workspace(name = "pip_parse_tests")

local_repository(
 name = "rules_python",
 path = "../..",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

py_repositories()

python_register_toolchains(
 name = "python3_9",
 python_version = "3.9",
)

load("@python3_9//:defs.bzl", "interpreter")
load("@rules_python//python:pip.bzl", "pip_parse")

# For a more thorough example of `pip_parse`. See `@rules_python//examples/pip_parse`
pip_parse(
 name = "pypi",
 incompatible_generate_aliases = False,
 python_interpreter_target = interpreter,
 requirements_lock = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi//:requirements.bzl", install_regular_deps = "install_deps")

install_regular_deps()

pip_parse(
 name = "pypi_aliases",
 incompatible_generate_aliases = True,
 python_interpreter_target = interpreter,
 requirements = "//:requirements_lock.txt",
 requirements_windows = "//:requirements_windows.txt",
)

load("@pypi_aliases//:requirements.bzl", install_alias_deps = "install_deps")

install_alias_deps()
Empty file addedtests/pip_parse/WORKSPACE.bzlmod

View file


Open in desktop


Empty file.


41 changes: 41 additions & 0 deletions
tests/pip_parse/aliases/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi_aliases//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

41 changes: 41 additions & 0 deletions
tests/pip_parse/regular/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@pypi//:requirements.bzl", "all_requirements", "all_whl_requirements", "data_requirement", "dist_info_requirement", "requirement", "whl_requirement")

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

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

_PACKAGES = [
 "requests",
 "s3cmd",
 "yamllint",
 "tabulate",
 "pylint",
 "python-dateutil",
]

build_test(
 name = "build_pkgs",
 targets = [requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_whls",
 targets = [whl_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_data",
 targets = [data_requirement(p) for p in _PACKAGES],
)

build_test(
 name = "build_dist_info",
 targets = [dist_info_requirement(p) for p in _PACKAGES],
)

6 changes: 6 additions & 0 deletions
tests/pip_parse/requirements.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
requests~=2.25.1
s3cmd~=2.1.0
yamllint>=1.28.0
tabulate~=0.9.0
pylint~=2.15.5
python-dateutil>=2.8.2
Loading