From 7f8f1157d1e275d40cb475956ad06e02c9041623 Mon Sep 17 00:00:00 2001
From: Joshua Cannon <joshdcannon@gmail.com>
Date: Fri, 1 Jul 2022 10:02:30 -0500
Subject: [PATCH 1/2] Bring main up to date with recent run changes

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]
---
 build-support/bin/BUILD | 17 -----------------
 pants.toml              |  3 +++
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/build-support/bin/BUILD b/build-support/bin/BUILD
index 55544172258..0448f6d29ac 100644
--- a/build-support/bin/BUILD
+++ b/build-support/bin/BUILD
@@ -15,20 +15,3 @@ python_sources(
 )
 
 python_tests(name="py_tests", overrides={"reversion_test.py": {"timeout": 90}})
-
-pex_binaries(
-    entry_points=[
-        "cache_comparison.py",
-        "changelog.py",
-        "check_banned_imports.py",
-        "check_inits.py",
-        "contributors.py",
-        "deploy_to_s3.py",
-        "_generate_all_lockfiles_helper.py",
-        "generate_docs.py",
-        "generate_github_workflows.py",
-        "generate_user_list.py",
-        "_release_helper.py",
-        "reversion.py",
-    ],
-)
diff --git a/pants.toml b/pants.toml
index 771df95c1c7..f54f0d519c1 100644
--- a/pants.toml
+++ b/pants.toml
@@ -72,6 +72,8 @@ remote_auth_plugin = "toolchain.pants.auth.plugin:toolchain_auth_plugin"
 # See https://github.com/pantsbuild/pants/issues/11331.
 remote_cache_eager_fetch = false
 
+use_deprecated_pex_binary_run_semantics = false
+
 [anonymous-telemetry]
 enabled = true
 repo_id = "7775F8D5-FC58-4DBC-9302-D00AE4A1505F"
@@ -124,6 +126,7 @@ macos_big_sur_compatibility = true
 resolves = { python-default = "3rdparty/python/user_reqs.lock" }
 enable_resolves = true
 lockfile_generator = "pex"
+tailor_pex_binary_targets = false
 
 [python-infer]
 assets = true

From 1d9ade2e7da686d51dacdbb750c767d913253266 Mon Sep 17 00:00:00 2001
From: Joshua Cannon <joshdcannon@gmail.com>
Date: Sat, 2 Jul 2022 12:23:03 -0500
Subject: [PATCH 2/2] Update pants.toml

---
 pants.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pants.toml b/pants.toml
index f54f0d519c1..771df95c1c7 100644
--- a/pants.toml
+++ b/pants.toml
@@ -72,8 +72,6 @@ remote_auth_plugin = "toolchain.pants.auth.plugin:toolchain_auth_plugin"
 # See https://github.com/pantsbuild/pants/issues/11331.
 remote_cache_eager_fetch = false
 
-use_deprecated_pex_binary_run_semantics = false
-
 [anonymous-telemetry]
 enabled = true
 repo_id = "7775F8D5-FC58-4DBC-9302-D00AE4A1505F"
@@ -126,7 +124,6 @@ macos_big_sur_compatibility = true
 resolves = { python-default = "3rdparty/python/user_reqs.lock" }
 enable_resolves = true
 lockfile_generator = "pex"
-tailor_pex_binary_targets = false
 
 [python-infer]
 assets = true