diff --git a/build-support/bin/_generate_all_lockfiles_helper.py b/build-support/bin/_generate_all_lockfiles_helper.py index 199f3a724496..cdc9d46a4286 100644 --- a/build-support/bin/_generate_all_lockfiles_helper.py +++ b/build-support/bin/_generate_all_lockfiles_helper.py @@ -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), diff --git a/build-support/bin/generate_docs.py b/build-support/bin/generate_docs.py index fe80a1a28bf9..4b5d0a21af15 100644 --- a/build-support/bin/generate_docs.py +++ b/build-support/bin/generate_docs.py @@ -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", diff --git a/pants.toml b/pants.toml index bab0009b9466..5a928bfea25d 100644 --- a/pants.toml +++ b/pants.toml @@ -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", diff --git a/src/python/pants/backend/docker/goals/run_image_integration_test.py b/src/python/pants/backend/docker/goals/run_image_integration_test.py index b39925fd71df..614d62306d9b 100644 --- a/src/python/pants/backend/docker/goals/run_image_integration_test.py +++ b/src/python/pants/backend/docker/goals/run_image_integration_test.py @@ -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] diff --git a/src/python/pants/backend/experimental/docker/register.py b/src/python/pants/backend/docker/register.py similarity index 90% rename from src/python/pants/backend/experimental/docker/register.py rename to src/python/pants/backend/docker/register.py index f7220b6826ac..9926e02d13e7 100644 --- a/src/python/pants/backend/experimental/docker/register.py +++ b/src/python/pants/backend/docker/register.py @@ -1,4 +1,4 @@ -# Copyright 2021 Pants project contributors (see CONTRIBUTORS.md). +# 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 diff --git a/src/python/pants/backend/experimental/docker/BUILD b/src/python/pants/backend/experimental/docker/BUILD deleted file mode 100644 index 760486c9dd3b..000000000000 --- a/src/python/pants/backend/experimental/docker/BUILD +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2021 Pants project contributors (see CONTRIBUTORS.md). -# Licensed under the Apache License, Version 2.0 (see LICENSE). - -python_sources() diff --git a/src/python/pants/init/BUILD b/src/python/pants/init/BUILD index 7020aae1dc6e..f94bb27f63e2 100644 --- a/src/python/pants/init/BUILD +++ b/src/python/pants/init/BUILD @@ -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", @@ -17,7 +18,6 @@ target( "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/docker", "src/python/pants/backend/experimental/docker/lint/hadolint", "src/python/pants/backend/experimental/go", "src/python/pants/backend/experimental/go/lint/vet",