From dc5999b078e28c8cfd8576cee162ef0a79c9cb04 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Thu, 18 Feb 2021 05:43:13 -0800
Subject: [PATCH] Fix up pytest and docformatter entrypoints. (#11571)

The prior entrypoints do not sys.exit, they just return an int.
Although PEX sys.exits if an entrypoint function returns a value
of any type, The `pex` venv script does not. The venv script behavior
is almost certainly correct and the circa 2011 PEX behavior is almost
certainly incorrect, but this works around Pex coming to a decision
on that.

Fixing the pytest entrypoint revealed a prior masked failing test that
is disabled for the time being.
---
 src/python/pants/backend/python/goals/pytest_runner.py        | 2 +-
 .../pants/backend/python/lint/docformatter/subsystem.py       | 2 +-
 src/python/pants/backend/python/util_rules/pex_test.py        | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/python/pants/backend/python/goals/pytest_runner.py b/src/python/pants/backend/python/goals/pytest_runner.py
index 39b170045ec..a09c951abb1 100644
--- a/src/python/pants/backend/python/goals/pytest_runner.py
+++ b/src/python/pants/backend/python/goals/pytest_runner.py
@@ -172,7 +172,7 @@ async def setup_pytest_for_target(
         PexRequest(
             output_filename="pytest_runner.pex",
             interpreter_constraints=interpreter_constraints,
-            entry_point="pytest:main",
+            entry_point="pytest",
             internal_only=True,
             pex_path=[pytest_pex, requirements_pex],
         ),
diff --git a/src/python/pants/backend/python/lint/docformatter/subsystem.py b/src/python/pants/backend/python/lint/docformatter/subsystem.py
index 1b349a3e961..d70b93e50c7 100644
--- a/src/python/pants/backend/python/lint/docformatter/subsystem.py
+++ b/src/python/pants/backend/python/lint/docformatter/subsystem.py
@@ -12,7 +12,7 @@ class Docformatter(PythonToolBase):
     help = "The Python docformatter tool (https://github.com/myint/docformatter)."
 
     default_version = "docformatter>=1.3.1,<1.4"
-    default_entry_point = "docformatter:main"
+    default_entry_point = "docformatter"
     register_interpreter_constraints = True
     default_interpreter_constraints = ["CPython==2.7.*", "CPython>=3.4,<3.9"]
 
diff --git a/src/python/pants/backend/python/util_rules/pex_test.py b/src/python/pants/backend/python/util_rules/pex_test.py
index c17b7ceae3d..1d35a8baa8a 100644
--- a/src/python/pants/backend/python/util_rules/pex_test.py
+++ b/src/python/pants/backend/python/util_rules/pex_test.py
@@ -432,7 +432,9 @@ def test_pex_execution(rule_runner: RuleRunner) -> None:
     assert result.stdout == b"from main\n"
 
 
-@pytest.mark.parametrize("pex_type", (Pex, VenvPex))
+# TODO(John Sirois): Add VenvPex to the pex_type parameter list once Pants is upgraded to Pex with
+#  a fix for: https://github.com/pantsbuild/pex/issues/1239
+@pytest.mark.parametrize("pex_type", [Pex])
 def test_pex_environment(rule_runner: RuleRunner, pex_type: type[Pex | VenvPex]) -> None:
     sources = rule_runner.request(
         Digest,