Skip to content
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

Jump to bottom

Significantly reduce the dependencies of RuleRunner #15631

Merged
merged 2 commits into from
May 24, 2022
Merged

Significantly reduce the dependencies of RuleRunner #15631

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b30592
Move plugins dependency to the pants binary.
stuhood May 24, 2022
dbc3999
Comment fix.
stuhood May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 63 additions & 1 deletion src/python/pants/bin/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,69 @@

python_sources(sources=["*.py", "!pants_loader.py"])

python_sources(name="pants_loader", sources=["pants_loader.py"])
python_sources(
name="pants_loader",
sources=["pants_loader.py"],
dependencies=[":plugins"],
)

# NOTE: When adding a new backend, add it to `generate_docs.py` too! (If stable enough for docs)
target(
name="plugins",
dependencies=[
"src/python/pants/backend/awslambda/python",
"src/python/pants/backend/codegen/protobuf/lint/buf",
"src/python/pants/backend/codegen/protobuf/python",
"src/python/pants/backend/codegen/thrift/apache/python",
"src/python/pants/backend/docker",
"src/python/pants/backend/docker/lint/hadolint",
"src/python/pants/backend/experimental/cc",
"src/python/pants/backend/experimental/cc/lint/clangformat",
"src/python/pants/backend/experimental/codegen/avro/java",
"src/python/pants/backend/experimental/codegen/protobuf/go",
"src/python/pants/backend/experimental/codegen/protobuf/java",
"src/python/pants/backend/experimental/codegen/protobuf/scala",
"src/python/pants/backend/experimental/codegen/thrift/apache/java",
"src/python/pants/backend/experimental/codegen/thrift/scrooge/java",
"src/python/pants/backend/experimental/codegen/thrift/scrooge/scala",
"src/python/pants/backend/experimental/debian",
"src/python/pants/backend/experimental/go",
"src/python/pants/backend/experimental/go/lint/vet",
"src/python/pants/backend/experimental/helm",
"src/python/pants/backend/experimental/java",
"src/python/pants/backend/experimental/java/debug_goals",
"src/python/pants/backend/experimental/java/lint/google_java_format",
"src/python/pants/backend/experimental/kotlin",
"src/python/pants/backend/experimental/kotlin/debug_goals",
"src/python/pants/backend/experimental/kotlin/lint/ktlint",
"src/python/pants/backend/experimental/python",
"src/python/pants/backend/experimental/python/docs/sphinx",
"src/python/pants/backend/experimental/python/lint/autoflake",
"src/python/pants/backend/experimental/python/lint/pyupgrade",
"src/python/pants/backend/experimental/python/packaging/pyoxidizer",
"src/python/pants/backend/experimental/scala",
"src/python/pants/backend/experimental/scala/debug_goals",
"src/python/pants/backend/experimental/scala/lint/scalafmt",
"src/python/pants/backend/experimental/terraform",
"src/python/pants/backend/google_cloud_function/python",
"src/python/pants/backend/plugin_development",
"src/python/pants/backend/project_info",
"src/python/pants/backend/python",
"src/python/pants/backend/python/lint/bandit",
"src/python/pants/backend/python/lint/black",
"src/python/pants/backend/python/lint/docformatter",
"src/python/pants/backend/python/lint/flake8",
"src/python/pants/backend/python/lint/isort",
"src/python/pants/backend/python/lint/pylint",
"src/python/pants/backend/python/lint/yapf",
"src/python/pants/backend/python/mixed_interpreter_constraints",
"src/python/pants/backend/python/typecheck/mypy",
"src/python/pants/backend/shell",
"src/python/pants/backend/shell/lint/shellcheck",
"src/python/pants/backend/shell/lint/shfmt",
"src/python/pants/core",
],
)

# This binary's entry_point is used by the pantsbuild.pants sdist to setup a binary for
# pip installers, ie: it is why this works to get `pants` on your PATH:
Expand Down
69 changes: 11 additions & 58 deletions src/python/pants/init/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,17 @@
# Copyright 2017 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).

python_sources(dependencies=[":plugins"])

# NOTE: When adding a new backend, add it to `generate_docs.py` too! (If stable enough for docs)
target(
name="plugins",
dependencies=[
"src/python/pants/backend/awslambda/python",
"src/python/pants/backend/codegen/protobuf/lint/buf",
"src/python/pants/backend/codegen/protobuf/python",
"src/python/pants/backend/codegen/thrift/apache/python",
"src/python/pants/backend/docker",
"src/python/pants/backend/docker/lint/hadolint",
"src/python/pants/backend/experimental/cc",
"src/python/pants/backend/experimental/cc/lint/clangformat",
"src/python/pants/backend/experimental/codegen/avro/java",
"src/python/pants/backend/experimental/codegen/protobuf/go",
"src/python/pants/backend/experimental/codegen/protobuf/java",
"src/python/pants/backend/experimental/codegen/protobuf/scala",
"src/python/pants/backend/experimental/codegen/thrift/apache/java",
"src/python/pants/backend/experimental/codegen/thrift/scrooge/java",
"src/python/pants/backend/experimental/codegen/thrift/scrooge/scala",
"src/python/pants/backend/experimental/debian",
"src/python/pants/backend/experimental/go",
"src/python/pants/backend/experimental/go/lint/vet",
"src/python/pants/backend/experimental/helm",
"src/python/pants/backend/experimental/java",
"src/python/pants/backend/experimental/java/debug_goals",
"src/python/pants/backend/experimental/java/lint/google_java_format",
"src/python/pants/backend/experimental/kotlin",
"src/python/pants/backend/experimental/kotlin/debug_goals",
"src/python/pants/backend/experimental/kotlin/lint/ktlint",
"src/python/pants/backend/experimental/python",
"src/python/pants/backend/experimental/python/docs/sphinx",
"src/python/pants/backend/experimental/python/lint/autoflake",
"src/python/pants/backend/experimental/python/lint/pyupgrade",
"src/python/pants/backend/experimental/python/packaging/pyoxidizer",
"src/python/pants/backend/experimental/scala",
"src/python/pants/backend/experimental/scala/debug_goals",
"src/python/pants/backend/experimental/scala/lint/scalafmt",
"src/python/pants/backend/experimental/terraform",
"src/python/pants/backend/google_cloud_function/python",
"src/python/pants/backend/plugin_development",
"src/python/pants/backend/project_info",
"src/python/pants/backend/python",
"src/python/pants/backend/python/lint/bandit",
"src/python/pants/backend/python/lint/black",
"src/python/pants/backend/python/lint/docformatter",
"src/python/pants/backend/python/lint/flake8",
"src/python/pants/backend/python/lint/isort",
"src/python/pants/backend/python/lint/pylint",
"src/python/pants/backend/python/lint/yapf",
"src/python/pants/backend/python/mixed_interpreter_constraints",
"src/python/pants/backend/python/typecheck/mypy",
"src/python/pants/backend/shell",
"src/python/pants/backend/shell/lint/shellcheck",
"src/python/pants/backend/shell/lint/shfmt",
"src/python/pants/core",
],
python_sources(
overrides={
"extension_loader.py": {
"dependencies": [
# NB: These are explicitly loaded by default by the extension loader: see
# the corresponding note.
"src/python/pants/core",
"src/python/pants/backend/project_info",
]
}
},
)

python_tests(
Expand Down
1 change: 1 addition & 0 deletions src/python/pants/init/extension_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def load_build_configuration_from_source(
:raises: :class:``pants.base.exceptions.BuildConfigurationError`` if there is a problem loading
the build configuration.
"""
# NB: Backends added here must be explicit dependencies of this module.
backend_packages = FrozenOrderedSet(["pants.core", "pants.backend.project_info", *backends])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would string import inference work here? 🤔

Copy link
Member Author

@stuhood stuhood May 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not out of the box I don't think... the actual underlying modules are pants.core.register and pants.backend.project_info.register.

for backend_package in backend_packages:
load_backend(build_configuration, backend_package)
Expand Down
9 changes: 8 additions & 1 deletion src/python/pants/option/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@ python_tests(
overrides={
(
"config_test.py",
"global_options_test.py",
"options_test.py",
"options_bootstrapper_test.py",
"subsystem_test.py",
): {
"dependencies": ["//BUILD_ROOT:files", "//pants.toml:files"],
},
"global_options_test.py": {
"dependencies": [
"//BUILD_ROOT:files",
"//pants.toml:files",
# This test loads `pants.toml`, which references many of these plugins.
"src/python/pants/bin:plugins",
],
},
"options_integration_test.py": {"timeout": 150},
},
)
13 changes: 9 additions & 4 deletions tests/python/pants_test/init/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
python_tests(
name="tests",
timeout=360,
dependencies=[
# Used by `test_options_initializer`.
"//BUILD_ROOT:files"
],
overrides={
("test_options_initializer.py", "test_plugin_resolver.py"): {
"dependencies": [
"//BUILD_ROOT:files",
# This tests load `pants.toml`, which references many of these plugins.
"src/python/pants/bin:plugins",
],
}
},
)

python_sources()
17 changes: 16 additions & 1 deletion tests/python/pants_test/pantsd/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
# Copyright 2020 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).

python_tests(sources=["test_*.py"], dependencies=["//BUILD_ROOT:files"])
python_tests(
sources=["test_*.py"],
overrides={
"test_process_manager.py": {
"dependencies": [
"//BUILD_ROOT:files",
],
},
"test_pants_daemon_core.py": {
"dependencies": [
"//BUILD_ROOT:files",
"src/python/pants/bin:plugins",
]
},
},
)

python_sources(
name="pantsd_integration_test_base",
Expand Down