Upgrade to Pex 2.1.18. (pantsbuild#10938)

This brings several fixes including a new --tmpdir option we use to fix relative TMPDIR use. Fixes pantsbuild#10936
carbon-re · Oct 9, 2020 · f678abf · f678abf
1 parent a1521c3
commit f678abf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/3rdparty/python/constraints.txt b/3rdparty/python/constraints.txt
@@ -18,7 +18,7 @@ mypy==0.782
 mypy-extensions==0.4.3
 packaging==20.4
 pathspec==0.8.0
-pex==2.1.17
+pex==2.1.18
 pip==18.1
 pluggy==0.13.1
 psutil==5.7.0

diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
@@ -18,7 +18,7 @@ mypy==0.782
 
 packaging==20.4
 pathspec==0.8.0
-pex==2.1.17
+pex==2.1.18
 psutil==5.7.0
 pystache==0.5.4
 # This should be kept in sync with `pytest.py`.

diff --git a/src/python/pants/backend/python/util_rules/pex_cli.py b/src/python/pants/backend/python/util_rules/pex_cli.py
@@ -32,7 +32,7 @@ class PexBinary(ExternalTool):
 
     options_scope = "download-pex-bin"
     name = "pex"
-    default_version = "v2.1.17"
+    default_version = "v2.1.18"
 
     @classproperty
     def default_known_versions(cls):
@@ -41,8 +41,8 @@ def default_known_versions(cls):
                 (
                     cls.default_version,
                     plat,
-                    "df836ddd102d8fc9fb390cc4c7fc478caf5afa1600cbdeb7753b185e27a6a8b0",
-                    "2673293",
+                    "3a47dcbcf49294c06439fdda50675546edc9ea09a116c4c57ee5a8e337a63509",
+                    "2678219",
                 )
             )
             for plat in ["darwin", "linux"]
@@ -133,17 +133,20 @@ async def setup_pex_cli_process(
         *cert_args,
         "--pex-root",
         pex_root_path,
-        python=request.python,
-    )
-    env = {
         # Ensure Pex and its subprocesses create temporary files in the the process execution
         # sandbox. It may make sense to do this generally for Processes, but in the short term we
         # have known use cases where /tmp is too small to hold large wheel downloads Pex is asked to
         # perform. Making the TMPDIR local to the sandbox allows control via
         # --local-execution-root-dir for the local case and should work well with remote cases where
         # a remoting implementation has to allow for processes producing large binaries in a
-        # sandbox to support reasonable workloads.
-        "TMPDIR": tmpdir,
+        # sandbox to support reasonable workloads. Communicating TMPDIR via --tmpdir instead of via
+        # environment variable allows Pex to absolutize the path ensuring subprocesses that change
+        # CWD can find the TMPDIR.
+        "--tmpdir",
+        tmpdir,
+        python=request.python,
+    )
+    env = {
         **pex_env.environment_dict(python_configured=request.python is not None),
         **python_native_code.environment_dict,
         **(request.extra_env or {}),