Upgrade Pex to 2.1.132. (pantsbuild#18753)

This pulls in support for Pip 23.1. See the changelog here: https://github.com/pantsbuild/pex/releases/tag/v2.1.132
benjyw · Apr 17, 2023 · fa8c1ce · fa8c1ce
1 parent e43ba8c
commit fa8c1ce
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 134 deletions.
diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
@@ -16,7 +16,7 @@ humbug==0.2.7
 importlib_resources==5.0.*
 ijson==3.1.4
 packaging==21.3
-pex==2.1.131
+pex==2.1.132
 psutil==5.9.0
 # This should be compatible with pytest.py, although it can be looser so that we don't
 # over-constrain pantsbuild.pants.testutil

diff --git a/3rdparty/python/user_reqs.lock b/3rdparty/python/user_reqs.lock
diff --git a/pants.toml b/pants.toml
@@ -144,7 +144,7 @@ venv_use_symlinks = true
 interpreter_constraints = [">=3.7,<3.10"]
 macos_big_sur_compatibility = true
 enable_resolves = true
-pip_version = "23.0.1"
+pip_version = "latest"
 
 [python.resolves]
 python-default = "3rdparty/python/user_reqs.lock"

diff --git a/src/python/pants/backend/python/subsystems/lambdex.lock b/src/python/pants/backend/python/subsystems/lambdex.lock
@@ -54,29 +54,29 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "68327d0ce53e1fca18fb624c7e60fafcc8308b1a43190b467e5e13b516e305d1",
-              "url": "https://files.pythonhosted.org/packages/0f/a0/ebfd337bd499a2b77308ccca516b60837ebca352852f423cb270df9e7ed3/pex-2.1.131-py2.py3-none-any.whl"
+              "hash": "8599dc365b2bbf66b750c46fdff6f73e48c5ab3108adb3528a2cefabcc9f802b",
+              "url": "https://files.pythonhosted.org/packages/5e/4d/4ebf6b4e34306a21e823a7e0ed1f2bc8c9ed7a78afdc492eea8cbc43476e/pex-2.1.132-py2.py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "786d6089752e41fc5139ed07f19854d2a75ef0b670457cba602893e78999eaae",
-              "url": "https://files.pythonhosted.org/packages/2c/65/25abd66e153535cb50339b85ae559c2d02faa06251bf6991b84cb409e6bb/pex-2.1.131.tar.gz"
+              "hash": "a88f127a0a158857c6ea2d52b6762cd67529b78636b64f7bc1fecb75e14eb907",
+              "url": "https://files.pythonhosted.org/packages/71/31/0a9f9b0ed0c00eadf92406dfad9cc0cbd4467d2108171de17b7891da007f/pex-2.1.132.tar.gz"
             }
           ],
           "project_name": "pex",
           "requires_dists": [
             "subprocess32>=3.2.7; extra == \"subprocess\" and python_version < \"3\""
           ],
           "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,<3.12,>=2.7",
-          "version": "2.1.131"
+          "version": "2.1.132"
         }
       ],
       "platform_tag": null
     }
   ],
   "path_mappings": {},
-  "pex_version": "2.1.131",
-  "pip_version": "23.0.1",
+  "pex_version": "2.1.132",
+  "pip_version": "23.1",
   "prefer_older_binary": false,
   "requirements": [
     "lambdex>=0.1.9"

diff --git a/src/python/pants/backend/python/subsystems/setup.py b/src/python/pants/backend/python/subsystems/setup.py
@@ -36,6 +36,8 @@ class PipVersion(enum.Enum):
     V22_3_1 = "22.3.1"
     V23_0 = "23.0"
     V23_0_1 = "23.0.1"
+    V23_1 = "23.1"
+    LATEST = "latest"
 
 
 @enum.unique
@@ -226,7 +228,14 @@ def interpreter_constraints(self) -> tuple[str, ...]:
     )
     pip_version = EnumOption(
         default=PipVersion.V20_3_4,
-        help="Use this version of Pip for resolving requirements and generating lockfiles.",
+        help=softwrap(
+            """
+            Use this version of Pip for resolving requirements and generating lockfiles.
+
+            N.B.: The `latest` value selects the latest of the listed choices which is not
+            necessarily the latest Pip version released on PyPI.
+            """
+        ),
         advanced=True,
     )
     _resolves_to_interpreter_constraints = DictOption["list[str]"](

diff --git a/src/python/pants/backend/python/util_rules/pex_cli.py b/src/python/pants/backend/python/util_rules/pex_cli.py
@@ -35,9 +35,9 @@ class PexCli(TemplatedExternalTool):
     name = "pex"
     help = "The PEX (Python EXecutable) tool (https://github.com/pantsbuild/pex)."
 
-    default_version = "v2.1.131"
+    default_version = "v2.1.132"
     default_url_template = "https://github.com/pantsbuild/pex/releases/download/{version}/pex"
-    version_constraints = ">=2.1.129,<3.0"
+    version_constraints = ">=2.1.132,<3.0"
 
     @classproperty
     def default_known_versions(cls):
@@ -46,8 +46,8 @@ def default_known_versions(cls):
                 (
                     cls.default_version,
                     plat,
-                    "28b9dfc7e2f5f49f1e189b79eba3dd79ca2186f765009ea02dd6095f5359bf59",
-                    "4084520",
+                    "e2eae0e6cdd0cd2ae58892e4f2d5a95cf50ef4e04dd90994d425c540cfed11a6",
+                    "4084762",
                 )
             )
             for plat in ["macos_arm64", "macos_x86_64", "linux_x86_64", "linux_arm64"]