Switch to new lockfile generation script. (pantsbuild#18754)

- Delete the old one.
- Delete the unnecessary wrapper script.
- Add a new wrapper script for the special case of pex changes,
  merely as a convenience so we don't forget to update Lambdex.

This enforces the full separation between generating the Pants
default-python lockfile, which you now do with a direct Pants
generate-lockfiles invocation like any other repo,
vs generating the built-in lockfiles that we ship with Pants.

3rdparty/python/flake8.lock

@@ -1,6 +1,6 @@
 // This lockfile was autogenerated by Pants. To regenerate, run:
 //
-//    build-support/bin/generate_all_lockfiles.sh
+//    ./pants generate-lockfiles --resolve=flake8
 //
 // --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 // {

3rdparty/python/mypy.lock

@@ -1,6 +1,6 @@
 // This lockfile was autogenerated by Pants. To regenerate, run:
 //
-//    build-support/bin/generate_all_lockfiles.sh
+//    ./pants generate-lockfiles --resolve=mypy
 //
 // --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 // {

3rdparty/python/pytest.lock

@@ -1,6 +1,6 @@
 // This lockfile was autogenerated by Pants. To regenerate, run:
 //
-//    build-support/bin/generate_all_lockfiles.sh
+//    ./pants generate-lockfiles --resolve=pytest
 //
 // --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 // {

3rdparty/python/user_reqs.lock

@@ -1,6 +1,6 @@
 // This lockfile was autogenerated by Pants. To regenerate, run:
 //
-//    build-support/bin/generate_all_lockfiles.sh
+//    ./pants generate-lockfiles --resolve=python-default
 //
 // --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 // {

build-support/bin/generate_builtin_lockfiles.py

@@ -53,6 +53,7 @@
 from pants.backend.tools.yamllint.subsystem import Yamllint
 from pants.base.build_environment import get_buildroot
 from pants.jvm.resolve.jvm_tool import JvmToolBase
+from pants.jvm.shading.jarjar import JarJar
 from pants.util.contextutil import temporary_dir
 from pants.util.dirutil import touch
 
@@ -141,9 +142,10 @@ class JvmTool(Tool[JvmToolBase]):
                 GoogleJavaFormatSubsystem, "pants.backend.experimental.java.lint.google_java_format"
             ),
             JvmTool(JUnit, "pants.backend.experimental.java"),
+            JvmTool(JarJar, "pants.backend.experimental.java"),
+            JvmTool(JavaProtobufGrpcSubsystem, "pants.backend.experimental.codegen.protobuf.java"),
             JvmTool(KtlintSubsystem, "pants.backend.experimental.kotlin.lint.ktlint"),
             JvmTool(ScalaPBSubsystem, "pants.backend.experimental.codegen.protobuf.scala"),
-            JvmTool(JavaProtobufGrpcSubsystem, "pants.backend.experimental.codegen.protobuf.java"),
             JvmTool(ScalafmtSubsystem, "pants.backend.experimental.scala.lint.scalafmt"),
             JvmTool(Scalatest, "pants.backend.experimental.scala"),
             JvmTool(ScroogeSubsystem, "pants.backend.experimental.codegen.thrift.scrooge.scala"),
@@ -226,9 +228,6 @@ def req_file(_tool: PythonTool) -> str:
             "--backend-packages=pants.backend.python",
             "--python-pip-version=23.0.1",
             f"--python-interpreter-constraints=['{default_python_interpreter_constraints}']",
-            # `generate_all_lockfiles.sh` will have overridden this option to solve the chicken
-            # and egg problem from https://github.com/pantsbuild/pants/issues/12457. We must
-            # restore it here so that the lockfile gets generated properly.
             "--python-enable-resolves",
             # Unset any existing resolve names in the Pants repo, and set to just our temporary ones.
             f"--python-resolves={resolves}",

build-support/bin/generate_pex_lockfiles.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Copyright 2023 Pants project contributors (see CONTRIBUTORS.md).
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+set -euo pipefail
+
+# A convenience script so we don't forget to update Lambdex when we update Pex.
+
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+cd "$REPO_ROOT" || exit 1
+
+# shellcheck source=build-support/common.sh
+source "${REPO_ROOT}/build-support/common.sh"
+
+./pants generate-lockfiles --resolve=python-default
+./pants run build-support/bin/generate_builtin_lockfiles.py -- lambdex

pants.toml

@@ -136,7 +136,7 @@ venv_use_symlinks = true
 
 [python]
 # N.B.: When adjusting this to support new Python versions, you must update the Pants
-# `python_distrobution` targets, currently:
+# `python_distribution` targets, currently:
 # + src/python/pants:pants-packaged
 # + src/python/pants/testutil:testutil_wheel
 # And update the PythonBuildStandalone version/URL:
@@ -225,7 +225,6 @@ interpreter_constraints = [">=3.7,<3.10"]
 template_by_globs = "@build-support/preambles/config.yaml"
 
 [generate-lockfiles]
-custom_command = "build-support/bin/generate_all_lockfiles.sh"
 diff = true
 
 [jvm]

src/python/pants/backend/cc/lint/clangformat/clangformat.lock

@@ -1,6 +1,6 @@
 // This lockfile was autogenerated by Pants. To regenerate, run:
 //
-//    build-support/bin/generate_all_lockfiles.sh
+//    ./pants run build-support/bin/generate_builtin_lockfiles.py"
 //
 // --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 // {

src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt

@@ -1,6 +1,6 @@
 # This lockfile was autogenerated by Pants. To regenerate, run:
 #
-#    ./pants generate-lockfiles
+#    ./pants run build-support/bin/generate_builtin_lockfiles.py
 #
 # --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 # {

src/python/pants/backend/codegen/protobuf/java/grpc-java.default.lockfile.txt

@@ -1,6 +1,6 @@
 # This lockfile was autogenerated by Pants. To regenerate, run:
 #
-#    ./pants generate-lockfiles
+#    ./pants run build-support/bin/generate_builtin_lockfiles.py
 #
 # --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
 # {