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.

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

Graduate Docker backend from experimental status. #14310

Merged
merged 2 commits into from Jan 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-support/bin/_generate_all_lockfiles_helper.py
Expand Up @@ -109,7 +109,7 @@ def jvm(cls, tool: type[JvmToolBase], *, backend: str | None = None) -> DefaultT
DefaultTool.python(PyTest),
DefaultTool.python(CoverageSubsystem),
DefaultTool.python(TerraformHcl2Parser, backend="pants.backend.experimental.terraform"),
DefaultTool.python(DockerfileParser, backend="pants.backend.experimental.docker"),
DefaultTool.python(DockerfileParser, backend="pants.backend.docker"),
DefaultTool.python(TwineSubsystem),
# JVM
DefaultTool.jvm(JUnit),
Expand Down
2 changes: 1 addition & 1 deletion build-support/bin/generate_docs.py
Expand Up @@ -203,8 +203,8 @@ def run_pants_help_all() -> dict[str, Any]:
backends = [
"pants.backend.awslambda.python",
"pants.backend.codegen.protobuf.python",
"pants.backend.docker",
"pants.backend.experimental.codegen.thrift.apache.python",
"pants.backend.experimental.docker",
"pants.backend.experimental.docker.lint.hadolint",
"pants.backend.experimental.go",
"pants.backend.experimental.java",
Expand Down
2 changes: 1 addition & 1 deletion pants.toml
Expand Up @@ -15,7 +15,7 @@ backend_packages.add = [
"pants.backend.shell",
"pants.backend.shell.lint.shellcheck",
"pants.backend.shell.lint.shfmt",
"pants.backend.experimental.docker",
"pants.backend.docker",
"pants.backend.experimental.docker.lint.hadolint",
"pants.backend.experimental.go",
"pants.backend.experimental.java",
Expand Down
Expand Up @@ -12,7 +12,7 @@ def run_pants_with_sources(sources: dict[str, str], *args: str) -> PantsResult:
with setup_tmpdir(sources) as tmpdir:
return run_pants(
[
"--backend-packages=pants.backend.experimental.docker",
"--backend-packages=pants.backend.docker",
"--pants-ignore=__pycache__",
]
+ [arg.format(tmpdir=tmpdir) for arg in args]
Expand Down
21 changes: 21 additions & 0 deletions src/python/pants/backend/docker/register.py
@@ -0,0 +1,21 @@
# Copyright 2022 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).

from pants.backend.codegen import export_codegen_goal
from pants.backend.docker.goals.tailor import rules as tailor_rules
from pants.backend.docker.rules import rules as docker_rules
from pants.backend.docker.target_types import DockerImageTarget
from pants.backend.python.util_rules.pex import rules as pex_rules


def rules():
return (
*docker_rules(),
*export_codegen_goal.rules(),
*pex_rules(),
*tailor_rules(),
)


def target_types():
return (DockerImageTarget,)
20 changes: 8 additions & 12 deletions src/python/pants/backend/experimental/docker/register.py
@@ -1,21 +1,17 @@
# Copyright 2021 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).

from pants.backend.codegen import export_codegen_goal
from pants.backend.docker.goals.tailor import rules as tailor_rules
from pants.backend.docker.rules import rules as docker_rules
from pants.backend.docker.target_types import DockerImageTarget
from pants.backend.python.util_rules.pex import rules as pex_rules
from pants.backend.docker import register
from pants.base.deprecated import deprecated


@deprecated(
"2.11.0.dev0",
"The `pants.backend.experimental.docker` backend has graduated. Use `pants.backend.docker` instead.",
)
def rules():
return (
*docker_rules(),
*export_codegen_goal.rules(),
*pex_rules(),
*tailor_rules(),
)
return register.rules()


def target_types():
return (DockerImageTarget,)
return register.target_types()
1 change: 1 addition & 0 deletions src/python/pants/init/BUILD
Expand Up @@ -9,6 +9,7 @@ target(
dependencies=[
"src/python/pants/backend/awslambda/python",
"src/python/pants/backend/codegen/protobuf/python",
"src/python/pants/backend/docker",
"src/python/pants/backend/experimental/codegen/avro/java",
"src/python/pants/backend/experimental/codegen/protobuf/java",
"src/python/pants/backend/experimental/codegen/protobuf/scala",
Expand Down