Upgrade Pex to 2.1.137. (pantsbuild#19003)

This brings in a fix for an exotic lock creation error case. The change logs are here: + https://github.com/pantsbuild/pex/releases/tag/v2.1.137 + https://github.com/pantsbuild/pex/releases/tag/v2.1.136
pp-gborodin · May 14, 2023 · 71119ed · 71119ed
1 parent 8211cde
commit 71119ed
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
@@ -11,7 +11,7 @@ freezegun==1.2.1
 importlib_resources==5.0.*
 ijson==3.1.4
 packaging==21.3
-pex==2.1.135
+pex==2.1.137
 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
@@ -22,7 +22,7 @@
 //     "mypy-typing-asserts==0.1.1",
 //     "node-semver==0.9.0",
 //     "packaging==21.3",
-//     "pex==2.1.135",
+//     "pex==2.1.137",
 //     "psutil==5.9.0",
 //     "pydevd-pycharm==203.5419.8",
 //     "pytest<7.1.0,>=6.2.4",
@@ -1056,21 +1056,21 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "bd3a8c500d11b439d0a42b3b117413a1e133d0ee1b6b2c61ec6e44e86b53fe6f",
-              "url": "https://files.pythonhosted.org/packages/40/90/b260cbedb249fd24e733d524f7d6f85052b45f07c5e6cf0c7bc28058c4e4/pex-2.1.135-py2.py3-none-any.whl"
+              "hash": "5031c3b283d63470faeaf82d0fc1344e6f71b3ad4ac4ca34572a42bae6dfc4b8",
+              "url": "https://files.pythonhosted.org/packages/e8/6e/eadca769b580a93d10caeca29d17397565672cf8b675991ccbf959c75476/pex-2.1.137-py2.py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "87a9eff7522423eebe70b1d2f026309bdb5d75b8e238e5ac764d7ed7b3eeb6f5",
-              "url": "https://files.pythonhosted.org/packages/35/ee/af772c967c288e3175a9b37e226543778c7215dc06da2c920b9c5b91123b/pex-2.1.135.tar.gz"
+              "hash": "cb0ce6cf64757dd5ba4f34c4607ab485f7909e6c24cd479ca28ce52205f0edeb",
+              "url": "https://files.pythonhosted.org/packages/a8/06/26c731fbf11fad3b1dff7b1d535636c65d8d630eabc981ca025d2e7b5cfb/pex-2.1.137.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.135"
+          "version": "2.1.137"
         },
         {
           "artifacts": [
@@ -2096,19 +2096,19 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "3ba3d3a8ee46e0d5512c6bd0594da4f10b2584b47a470f8422044a2ab462f1df",
-              "url": "https://files.pythonhosted.org/packages/18/1a/a69209af0bbc268613e103597fd6559d1d1804f1a8a4d97004434c0608f4/types_urllib3-1.26.25.12-py3-none-any.whl"
+              "hash": "5dbd1d2bef14efee43f5318b5d36d805a489f6600252bb53626d4bfafd95e27c",
+              "url": "https://files.pythonhosted.org/packages/08/6d/98b51f9776747e1e270919aa02298ce6a7d2d4d78a3349b47666deb61c4c/types_urllib3-1.26.25.13-py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "a1557355ce8d350a555d142589f3001903757d2d36c18a66f588d9659bbc917d",
-              "url": "https://files.pythonhosted.org/packages/54/4d/3a522d870d2e41067bea9faedb338b028eb7a1f3e1f894e6b6c35e350dbd/types-urllib3-1.26.25.12.tar.gz"
+              "hash": "3300538c9dc11dad32eae4827ac313f5d986b8b21494801f1bf97a1ac6c03ae5",
+              "url": "https://files.pythonhosted.org/packages/27/2a/cb418a2a03a31b8e0daea5e13edcc4ef1408ebb457f2cc833f1c3f30a0fa/types-urllib3-1.26.25.13.tar.gz"
             }
           ],
           "project_name": "types-urllib3",
           "requires_dists": [],
           "requires_python": null,
-          "version": "1.26.25.12"
+          "version": "1.26.25.13"
         },
         {
           "artifacts": [
@@ -2759,7 +2759,7 @@
     }
   ],
   "path_mappings": {},
-  "pex_version": "2.1.135",
+  "pex_version": "2.1.137",
   "pip_version": "23.1.2",
   "prefer_older_binary": false,
   "requirements": [
@@ -2776,7 +2776,7 @@
     "mypy-typing-asserts==0.1.1",
     "node-semver==0.9.0",
     "packaging==21.3",
-    "pex==2.1.135",
+    "pex==2.1.137",
     "psutil==5.9.0",
     "pydevd-pycharm==203.5419.8",
     "pytest<7.1.0,>=6.2.4",

diff --git a/build-support/bin/generate_builtin_lockfiles.py b/build-support/bin/generate_builtin_lockfiles.py
@@ -226,7 +226,7 @@ def req_file(_tool: PythonTool) -> str:
             # Regardless of the backend the tool is defined in, we need the Python backend
             # for the Python resolves mechanism to work.
             "--backend-packages=pants.backend.python",
-            "--python-pip-version=23.0.1",
+            "--python-pip-version=latest",
             f"--python-interpreter-constraints=['{default_python_interpreter_constraints}']",
             "--python-enable-resolves",
             # Unset any existing resolve names in the Pants repo, and set to just our temporary ones.
@@ -259,7 +259,7 @@ def generate_jvm_tool_lockfiles(tools: Sequence[JvmTool], dry_run: bool) -> None
 
 def generate(buildroot: str, tools: Sequence[Tool], args: Sequence[str], dry_run: bool) -> None:
     pants_repo_root = get_buildroot()
-    touch(os.path.join(buildroot, "BUILDROOT"))
+    touch(os.path.join(buildroot, "pants.toml"))
     backends = sorted({tool.backend for tool in tools})
     custom_cmd = "./pants run build-support/bin/generate_builtin_lockfiles.py"
     args = [

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": "bd3a8c500d11b439d0a42b3b117413a1e133d0ee1b6b2c61ec6e44e86b53fe6f",
-              "url": "https://files.pythonhosted.org/packages/40/90/b260cbedb249fd24e733d524f7d6f85052b45f07c5e6cf0c7bc28058c4e4/pex-2.1.135-py2.py3-none-any.whl"
+              "hash": "5031c3b283d63470faeaf82d0fc1344e6f71b3ad4ac4ca34572a42bae6dfc4b8",
+              "url": "https://files.pythonhosted.org/packages/e8/6e/eadca769b580a93d10caeca29d17397565672cf8b675991ccbf959c75476/pex-2.1.137-py2.py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "87a9eff7522423eebe70b1d2f026309bdb5d75b8e238e5ac764d7ed7b3eeb6f5",
-              "url": "https://files.pythonhosted.org/packages/35/ee/af772c967c288e3175a9b37e226543778c7215dc06da2c920b9c5b91123b/pex-2.1.135.tar.gz"
+              "hash": "cb0ce6cf64757dd5ba4f34c4607ab485f7909e6c24cd479ca28ce52205f0edeb",
+              "url": "https://files.pythonhosted.org/packages/a8/06/26c731fbf11fad3b1dff7b1d535636c65d8d630eabc981ca025d2e7b5cfb/pex-2.1.137.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.135"
+          "version": "2.1.137"
         }
       ],
       "platform_tag": null
     }
   ],
   "path_mappings": {},
-  "pex_version": "2.1.135",
-  "pip_version": "23.0.1",
+  "pex_version": "2.1.137",
+  "pip_version": "23.1.2",
   "prefer_older_binary": false,
   "requirements": [
     "lambdex>=0.1.9"

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,7 +35,7 @@ class PexCli(TemplatedExternalTool):
     name = "pex"
     help = "The PEX (Python EXecutable) tool (https://github.com/pantsbuild/pex)."
 
-    default_version = "v2.1.135"
+    default_version = "v2.1.137"
     default_url_template = "https://github.com/pantsbuild/pex/releases/download/{version}/pex"
     version_constraints = ">=2.1.135,<3.0"
 
@@ -46,8 +46,8 @@ def default_known_versions(cls):
                 (
                     cls.default_version,
                     plat,
-                    "53948bf34646d8274932ad51b8cb8c5f1c9a8f829c95054529117cce927d0a5c",
-                    "4098060",
+                    "faad51a6a108fba9d40b2a10e82a2646fccbaf8c3d9be47818f4bffae02d94b8",
+                    "4098329",
                 )
             )
             for plat in ["macos_arm64", "macos_x86_64", "linux_x86_64", "linux_arm64"]