Skip to content

Commit

Permalink
Upgrade Pex to 2.1.107. (Cherry-pick of #17081) (#17121)
Browse files Browse the repository at this point in the history
This pulls in a fix for lock creation when git+ssh authenticated VCS
URLs are amongst the requirements amongst other fixes for issue
reported outside of Pants. Although this brings support for
`--pip-version 22.2.2`, the option is not plumbed yet.

See the changelogs here:
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.107
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.106
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.105
+ https://github.com/pantsbuild/pex/releases/tag/v2.1.104

Fixes #15410

(cherry picked from commit 54b4a39)
  • Loading branch information
jsirois authored Oct 5, 2022
1 parent 2ce1c4f commit e821e92
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ humbug==0.2.7

ijson==3.1.4
packaging==21.3
pex==2.1.103
pex==2.1.107
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
Expand Down
17 changes: 9 additions & 8 deletions 3rdparty/python/user_reqs.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// "ijson==3.1.4",
// "mypy-typing-asserts==0.1.1",
// "packaging==21.3",
// "pex==2.1.103",
// "pex==2.1.107",
// "psutil==5.9.0",
// "pydevd-pycharm==203.5419.8",
// "pytest<7.1.0,>=6.2.4",
Expand Down Expand Up @@ -782,21 +782,21 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "b91b8e67647331a5b6bcfe15090ec764fcf06f7293b415c3d3f739563ce8c779",
"url": "https://files.pythonhosted.org/packages/fd/10/ada3b3de63355f007606307a934e1d762cda2a5e9766abdc543f2cc291b2/pex-2.1.103-py2.py3-none-any.whl"
"hash": "f2b8a523bf62d27445691a569cbb99ae1c5196351a25fafcf01b9045f7c1f011",
"url": "https://files.pythonhosted.org/packages/30/89/6e2681b36e9f6aabc4a91cc43525e45a6dddded5793001fa52fa0d0fc39a/pex-2.1.107-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "07bcd633626b7fd6d18eb0d6303acfd0a4fbcb31692e737b15794626da896bf0",
"url": "https://files.pythonhosted.org/packages/f2/9e/55f2e396dfad923a60e4fa2dcca4ef235bdf73739c2bb0569d23e145c568/pex-2.1.103.tar.gz"
"hash": "d2a35b93daab737d172225eb35fd381761b3c6834865a597c18d56360e56ed66",
"url": "https://files.pythonhosted.org/packages/ae/53/aeb79df2d7b0fdec0627dff2657df78bd33815198f40890c9a6dc6865f8d/pex-2.1.107.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.103"
"version": "2.1.107"
},
{
"artifacts": [
Expand Down Expand Up @@ -2238,7 +2238,8 @@
}
],
"path_mappings": {},
"pex_version": "2.1.103",
"pex_version": "2.1.107",
"pip_version": "20.3.4-patched",
"prefer_older_binary": false,
"requirements": [
"PyYAML<7.0,>=6.0",
Expand All @@ -2251,7 +2252,7 @@
"ijson==3.1.4",
"mypy-typing-asserts==0.1.1",
"packaging==21.3",
"pex==2.1.103",
"pex==2.1.107",
"psutil==5.9.0",
"pydevd-pycharm==203.5419.8",
"pytest<7.1.0,>=6.2.4",
Expand Down
13 changes: 7 additions & 6 deletions src/python/pants/backend/python/subsystems/lambdex.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,29 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "b91b8e67647331a5b6bcfe15090ec764fcf06f7293b415c3d3f739563ce8c779",
"url": "https://files.pythonhosted.org/packages/fd/10/ada3b3de63355f007606307a934e1d762cda2a5e9766abdc543f2cc291b2/pex-2.1.103-py2.py3-none-any.whl"
"hash": "f2b8a523bf62d27445691a569cbb99ae1c5196351a25fafcf01b9045f7c1f011",
"url": "https://files.pythonhosted.org/packages/30/89/6e2681b36e9f6aabc4a91cc43525e45a6dddded5793001fa52fa0d0fc39a/pex-2.1.107-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "07bcd633626b7fd6d18eb0d6303acfd0a4fbcb31692e737b15794626da896bf0",
"url": "https://files.pythonhosted.org/packages/f2/9e/55f2e396dfad923a60e4fa2dcca4ef235bdf73739c2bb0569d23e145c568/pex-2.1.103.tar.gz"
"hash": "d2a35b93daab737d172225eb35fd381761b3c6834865a597c18d56360e56ed66",
"url": "https://files.pythonhosted.org/packages/ae/53/aeb79df2d7b0fdec0627dff2657df78bd33815198f40890c9a6dc6865f8d/pex-2.1.107.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.103"
"version": "2.1.107"
}
],
"platform_tag": null
}
],
"path_mappings": {},
"pex_version": "2.1.103",
"pex_version": "2.1.107",
"pip_version": "20.3.4-patched",
"prefer_older_binary": false,
"requirements": [
"lambdex==0.1.6"
Expand Down
6 changes: 3 additions & 3 deletions src/python/pants/backend/python/util_rules/pex_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class PexCli(TemplatedExternalTool):
name = "pex"
help = "The PEX (Python EXecutable) tool (https://github.com/pantsbuild/pex)."

default_version = "v2.1.103"
default_version = "v2.1.107"
default_url_template = "https://github.com/pantsbuild/pex/releases/download/{version}/pex"
version_constraints = ">=2.1.103,<3.0"

Expand All @@ -50,8 +50,8 @@ def default_known_versions(cls):
(
cls.default_version,
plat,
"4d45336511484100ae4e2bab24542a8b86b12c8cb89230463593c60d08c4b8d3",
"3814407",
"bfc19b16e0f298742dd933289bd8057dd503f9ad0678310412d382800d48b3ae",
"3840814",
)
)
for plat in ["macos_arm64", "macos_x86_64", "linux_x86_64", "linux_arm64"]
Expand Down

0 comments on commit e821e92

Please sign in to comment.